diff --git a/src/api/v1/message.ts b/src/api/v1/message.ts index a379207..135aec0 100644 --- a/src/api/v1/message.ts +++ b/src/api/v1/message.ts @@ -6,6 +6,21 @@ export const fetchGetMessageList = (data: any) => { return http.request>('get', `message/getMessageList/${data.currentPage}/${data.pageSize}`, { params: data }); }; +/** 系统消息---获取系统消息列表 */ +export const fetchGetUserMessageList = (data: any) => { + return http.request>('get', `message/noManage/getUserMessageList/${data.currentPage}/${data.pageSize}`, { params: data }); +}; + +/** 系统消息---根据消息id获取接收人信息 */ +export const fetchGetReceivedUserinfoByMessageId = (data: any) => { + return http.request>('get', `messageReceived/noManage/getReceivedUserinfoByMessageId`, { params: data }); +}; + +/** 系统消息---根据消息id查询消息详情 */ +export const fetchGetMessageDetailById = (data: any) => { + return http.request>('get', `message/noManage/getMessageDetailById`, { params: data }); +}; + /** 系统消息---添加系统消息 */ export const fetchAddMessage = (data: any) => { return http.request>('post', 'message/addMessage', { data }); diff --git a/src/enums/baseConstant.ts b/src/enums/baseConstant.ts index 734988f..3fd3904 100644 --- a/src/enums/baseConstant.ts +++ b/src/enums/baseConstant.ts @@ -1,4 +1,5 @@ import { computed } from 'vue'; +import { $t } from '@/plugins/i18n'; /** * * 是否默认 @@ -32,6 +33,12 @@ export const enabledOrNotStatus = [ { value: false, label: '禁用' }, ]; +/** 是否已读 */ +export const isReadStatus = [ + { value: true, label: $t('readAlready') }, + { value: false, label: $t('unread') }, +]; + /** * * 分页默认数组个数 */ diff --git a/src/layout/components/lay-notice/components/NoticeItem.vue b/src/layout/components/lay-notice/components/NoticeItem.vue index 5199c5f..22f4c92 100644 --- a/src/layout/components/lay-notice/components/NoticeItem.vue +++ b/src/layout/components/lay-notice/components/NoticeItem.vue @@ -3,6 +3,7 @@ import { ListItem } from '../data'; import { nextTick, PropType, ref } from 'vue'; import { useNav } from '@/layout/hooks/useNav'; import { deviceDetection } from '@pureadmin/utils'; +import { useRouter } from 'vue-router'; defineProps({ noticeItem: { @@ -17,6 +18,7 @@ const descriptionRef = ref(null); const descriptionTooltip = ref(false); const { tooltipEffect } = useNav(); const isMobile = deviceDetection(); +const router = useRouter(); function hoverTitle() { nextTick(() => { @@ -39,10 +41,14 @@ function hoverDescription(event, description) { // 当文本宽度大于容器宽度两倍时,代表文本显示超过两行 currentWidth > 2 * cellWidth ? (descriptionTooltip.value = true) : (descriptionTooltip.value = false); } + +function goMessageDetail(message: ListItem) { + router.push({ path: `/message-detail/${message.messageType}/${message.messageId}` }); +}