update 消息记录增加项目通知tab

This commit is contained in:
2026-04-01 14:16:19 +08:00
parent 17036ac491
commit 9f444a65ac
4 changed files with 72 additions and 64 deletions

View File

@@ -22,7 +22,7 @@ export enum MessageCategory {
TASK = 2,
MILESTONE = 3,
ORGANIZATION = 4,
SPDM = 99, // SPDM CODE
SPDM = 99, // SPDM CODE
}
export enum MessageRead {
@@ -176,7 +176,7 @@ export const deleteMessageList = (id: string) => {
};
// 用户消息 /msg/message/list/user/page
export const getMessageUserPage = (params: { size: number; current: number; msgCategory?: string; isRead?: string, userId?: string; }) => {
export const getMessageUserPage = (params: { size: number; current: number; msgCategory?: string; isRead?: string; userId?: string }) => {
return request.get('/msg/message/list/user/page', { params });
};
// 修改消息状态 /msg/message/list/item/isRead
@@ -244,20 +244,25 @@ export const taskAdjust = async (item: any, readType: number = MessageRead.READ)
},
});
}
} else if (item.msgCategory === MessageCategory.SPDM) { // SPDM CODE
if (item.msgTitle === '任务通知') {
router.push({
path: '/spdm/task/execute'
});
} else if (item.msgTitle === '数据通知') {
router.push({
path: '/spdm/system/storage'
});
} else if (item.msgTitle === '作业通知') {
router.push({
path: '/spdm/task/execution'
});
} else if (params?.taskId) {
} else if (item.msgCategory === MessageCategory.SPDM) {
// SPDM CODE
if (item.msgTitle === '任务通知') {
router.push({
path: '/spdm/task/execute',
});
} else if (item.msgTitle === '数据通知') {
router.push({
path: '/spdm/system/storage',
});
} else if (item.msgTitle === '项目通知') {
router.push({
path: '/spdm/project/allProject',
});
} else if (item.msgTitle === '作业通知') {
router.push({
path: '/spdm/task/execution',
});
} else if (params?.taskId) {
queryTask(params.taskId, false).then((res) => {
if (item.msgTitle === '审批通知') {
localStorage.setItem('SPDM_MSG_TASK_TYPE', 'flow');

View File

@@ -2283,18 +2283,19 @@
"components.task-compare-chart.251031-1": "Make statistics on the completion of all tasks",
"components.task-trend-chart.251031-0": "Task trend chart",
"components.task-trend-chart.251031-1": "",
"spdm.message.task": "Task",
"spdm.message.data": "Data",
"spdm.message.work": "Work",
"spdm.message.approve": "Approve",
"spdm.taskMessage.title": "Task Message",
"spdm.taskMessage.des": "Task Message List",
"spdm.taskList.title": "Task List",
"spdm.taskList.des": "List of tasks I perform",
"spdm.todoCalendar.title": "Todo Calendar",
"spdm.todoCalendar.des": "To-do task calendar",
"spdm.tapnav.task.focus": "My Focus",
"spdm.tapnav.task.todayTmrTasks": "Today & Tomorrow",
"spdm.tapnav.task.inProgress": "In Progress",
"spdm.tapnav.task.postponed": "Overdue Tasks"
}
"spdm.message.task": "Task",
"spdm.message.data": "Data",
"spdm.message.work": "Work",
"spdm.message.approve": "Approve",
"spdm.message.project": "Project",
"spdm.taskMessage.title": "Task Message",
"spdm.taskMessage.des": "Task Message List",
"spdm.taskList.title": "Task List",
"spdm.taskList.des": "List of tasks I perform",
"spdm.todoCalendar.title": "Todo Calendar",
"spdm.todoCalendar.des": "To-do task calendar",
"spdm.tapnav.task.focus": "My Focus",
"spdm.tapnav.task.todayTmrTasks": "Today & Tomorrow",
"spdm.tapnav.task.inProgress": "In Progress",
"spdm.tapnav.task.postponed": "Overdue Tasks"
}

View File

@@ -2287,6 +2287,7 @@
"spdm.message.data": "数据",
"spdm.message.work": "作业",
"spdm.message.approve": "审批",
"spdm.message.project": "项目",
"spdm.taskMessage.title": "任务消息",
"spdm.taskMessage.des": "任务消息列表",
"spdm.taskList.title": "任务列表",

View File

@@ -8,11 +8,12 @@
<!-- <el-tab-pane :label="$t('components.tabDanger.09112132-6')" name="2"> </el-tab-pane>
<el-tab-pane :label="$t('project.project_list.09111107-0')" name="1"> </el-tab-pane> -->
<el-tab-pane :label="$t('message.records.0910440-4')" name="4"> </el-tab-pane>
<!-- SPDM CODE -->
<el-tab-pane :label="$t('spdm.message.task')" name="任务通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.data')" name="数据通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.work')" name="作业通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.approve')" name="审批通知"></el-tab-pane>
<!-- SPDM CODE -->
<el-tab-pane :label="$t('spdm.message.task')" name="任务通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.data')" name="数据通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.work')" name="作业通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.approve')" name="审批通知"></el-tab-pane>
<el-tab-pane :label="$t('spdm.message.project')" name="项目通知"></el-tab-pane>
</el-tabs>
<el-empty v-if="messageList.length === 0" class="mt-20" :image-size="100" :description="$t('FormTable.index.7634616-2')" />
<ul v-else v-infinite-scroll="allLoadMore" class="infinite-list">
@@ -25,8 +26,8 @@
</div>
</template>
<script lang="ts" name="MessageConfig" setup>
import {getMessageUserPage, editMessageUserIsRead, isReadAll, MessageUserVo, taskAdjust, MessageRead} from '/@/api/message';
import {useMsg} from '/@/stores/msg';
import { getMessageUserPage, editMessageUserIsRead, isReadAll, MessageUserVo, taskAdjust, MessageRead } from '/@/api/message';
import { useMsg } from '/@/stores/msg';
import RecordItem from './components/RecordItem.vue';
import { useRoute } from 'vue-router';
import Cookies from 'js-cookie';
@@ -41,13 +42,13 @@ const spdmMsgType = ref<boolean>(false); // SPDM CODE
const route = useRoute();
onMounted(() => {
// SPDM CODE
const type = localStorage.getItem('SPDM_JUMP_TYPE');
if (type ==='task') {
activeName.value = '任务通知';
spdmMsgType.value = true
localStorage.removeItem('SPDM_JUMP_TYPE');
}
// SPDM CODE
const type = localStorage.getItem('SPDM_JUMP_TYPE');
if (type === 'task') {
activeName.value = '任务通知';
spdmMsgType.value = true;
localStorage.removeItem('SPDM_JUMP_TYPE');
}
getUserMessage();
});
@@ -55,12 +56,12 @@ const handleClick = (tab: any, event: any) => {
messageList.value = [];
current.value = 1;
isEnd.value = false;
// SPDM CODE
if (['任务通知', '数据通知', '作业通知', '审批通知'].includes(activeName.value)) {
spdmMsgType.value = true;
} else {
spdmMsgType.value = false;
}
// SPDM CODE
if (['任务通知', '数据通知', '作业通知', '审批通知', '项目通知'].includes(activeName.value)) {
spdmMsgType.value = true;
} else {
spdmMsgType.value = false;
}
getUserMessage();
};
@@ -70,18 +71,18 @@ const getUserMessage = async () => {
}
// 防止重复请求
isEnd.value = true;
const params: any = {
size: pageSize.value,
current: current.value,
msgCategory: activeName.value,
isRead: '',
userId: Cookies.get('cid_user_id'),
};
// SPDM CODE
if (spdmMsgType.value) {
params.msgCategory = '99';
params.msgTitle = activeName.value;
}
const params: any = {
size: pageSize.value,
current: current.value,
msgCategory: activeName.value,
isRead: '',
userId: Cookies.get('cid_user_id'),
};
// SPDM CODE
if (spdmMsgType.value) {
params.msgCategory = '99';
params.msgTitle = activeName.value;
}
const res = await getMessageUserPage(params);
messageList.value.push(...res.data.records);
if (res.data.total === messageList.value.length) {
@@ -95,7 +96,7 @@ const getUserMessage = async () => {
const viewMessage = (item: MessageUserVo, readType: number, index: number) => {
// 未读
if (item.isRead === MessageRead.UNREAD) {
editMessageUserIsRead({id: item.id, isRead: readType});
editMessageUserIsRead({ id: item.id, isRead: readType });
useMsg().setUnreadNum(-1);
messageList.value[index].isRead = readType;
}