diff --git a/src/api/notice.ts b/src/api/notice.ts index 6ccd44b0..f9ffb366 100644 --- a/src/api/notice.ts +++ b/src/api/notice.ts @@ -132,6 +132,14 @@ class NoticeAPI { method: "PATCH", }); } + + static getMyNoticePage(queryParams?: NoticePageQuery) { + return request>({ + url: `${NOTICE_BASE_URL}/my/page`, + method: "get", + params: queryParams, + }); + } } export default NoticeAPI; diff --git a/src/components/Notice/index.vue b/src/components/Notice/index.vue index aa3d68be..7247e5d4 100644 --- a/src/components/Notice/index.vue +++ b/src/components/Notice/index.vue @@ -70,10 +70,12 @@ import NoticeModal from "@/components/NoticeModal/index.vue"; const activeTab = ref(MessageTypeEnum.MESSAGE); const messages = ref([]); const noticeModalRef = ref(null); -const offset = ref<["number", "number"]>([-15, 15] as ["number", "number"]); +const offset = ref([-15, 15]); const getFilteredMessages = (type: MessageTypeEnum) => { - return messages.value.filter((message) => message.type === type); + return messages.value.filter( + (message: { type: MessageTypeEnum }) => message.type === type + ); }; /**' @@ -91,7 +93,7 @@ function connectWebSocket() { //获取到id let id = content.id; //确认messages里面是否有这个id - let index = messages.value.findIndex((item) => item.id === id); + let index = messages.value.findIndex((item: any) => item.id === id); if (index < 0) { let messageContent = { id: id, @@ -120,7 +122,9 @@ function listNotice() { * @param id */ function readNotice(id: number) { - let index = messages.value.findIndex((item) => item.id === id); + let index = messages.value.findIndex( + (item: { id: number }) => item.id === id + ); if (index >= 0) { messages.value.splice(index, 1); } diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue index a0f7b12a..5957d303 100644 --- a/src/views/notice/index.vue +++ b/src/views/notice/index.vue @@ -10,28 +10,6 @@ @keyup.enter="handleQuery()" /> - - - - - - - - - - @@ -89,7 +67,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 全体 - 指定 - - - - - - - - - - - 未发布 - 已发布 - 已撤回 - - - - - - - - - - - @@ -250,7 +111,7 @@ import NoticeAPI, { } from "@/api/notice"; const queryFormRef = ref(ElForm); -const dataFormRef = ref(ElForm); +const pageData = ref([]); const loading = ref(false); const ids = ref([]); @@ -261,35 +122,10 @@ const queryParams = reactive({ pageSize: 10, }); -// 通知公告表格数据 -const pageData = ref([]); - -// 弹窗 -const dialog = reactive({ - title: "", - visible: false, -}); - -// 通知公告表单数据 -const formData = reactive({ - sendStatus: 0, // 默认状态为未发布 - priority: 0, // 默认优先级为低 - tarType: 0, // 默认目标类型为全体 -}); - -// 通知公告表单校验规则 -const rules = reactive({ - title: [{ required: true, message: "请输入通知标题", trigger: "blur" }], - content: [{ required: true, message: "请输入通知内容", trigger: "blur" }], - // releaseBy: [{ required: true, message: "请输入发布人", trigger: "blur" }], - sendTime: [{ required: true, message: "请输入发布时间", trigger: "blur" }], - recallTime: [{ required: true, message: "请输入撤回时间", trigger: "blur" }], -}); - /** 查询通知公告 */ function handleQuery() { loading.value = true; - NoticeAPI.getPage(queryParams) + NoticeAPI.getMyNoticePage(queryParams) .then((data) => { pageData.value = data.list; total.value = data.total;