diff --git a/src/views/Profile/NotifyMessage.vue b/src/views/Profile/NotifyMessage.vue index 61822c1..a1e99dc 100644 --- a/src/views/Profile/NotifyMessage.vue +++ b/src/views/Profile/NotifyMessage.vue @@ -49,7 +49,7 @@ @row-dblclick="handleDetail" > <el-table-column type="selection" :selectable="selectable" reserve-selection width="60px" /> - <el-table-column label="类型" align="left" prop="messageType" width="200px" /> + <el-table-column label="类型" align="left" prop="messageTypeName" width="200px" /> <el-table-column label="标题" align="left" prop="title" /> <el-table-column label="时间" @@ -120,10 +120,6 @@ const handleQuery = () => { } function handleDetail(row: any) { - if (!row.readStatus) { - handleReadOne(row.id) - } - const url = router.resolve({ path: '/nm-detail', query: { id: row.id } @@ -158,15 +154,6 @@ const handleUpdateList = async () => { await getList() } -/** 标记一条站内信已读 */ -const handleReadOne = async (id: number) => { - await NotifyMessageApi.updateNotifyMessageRead({ - ids: [id], - roleId: userStore.getUser?.currentRole - }) - await getList() -} - /** 当表格选择项发生变化时会触发该事件 */ const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => { selectedIds.value = [] diff --git a/src/views/Profile/NotifyMessageDetail.vue b/src/views/Profile/NotifyMessageDetail.vue index e0dca25..2def516 100644 --- a/src/views/Profile/NotifyMessageDetail.vue +++ b/src/views/Profile/NotifyMessageDetail.vue @@ -17,7 +17,7 @@ </template> <script setup name="NMDetail"> -import { getNotifyMessageDetail } from '@/api/system/notify/message' +import { getNotifyMessageDetail, updateNotifyMessageRead } from '@/api/system/notify/message' import { formatDate } from '@/utils/formatTime' const route = useRoute() @@ -26,9 +26,21 @@ const info = ref({}) function init() { getNotifyMessageDetail(route.query.id).then((data) => { info.value = data + if (!data.readStatus) { + handleReadOne(data.id) + } }) } +/** 标记一条站内信已读 */ +const handleReadOne = async (id) => { + await updateNotifyMessageRead({ + ids: [id] + // roleId: userStore.getUser?.currentRole + }) + await getList() +} + onMounted(() => { init() })