diff --git a/src/api/message/index.ts b/src/api/message/index.ts index 5ef71f5..e1f722f 100644 --- a/src/api/message/index.ts +++ b/src/api/message/index.ts @@ -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'); diff --git a/src/i18n/temp/en.json b/src/i18n/temp/en.json index 9ac26a7..bb5dba3 100644 --- a/src/i18n/temp/en.json +++ b/src/i18n/temp/en.json @@ -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" -} \ No newline at end of file + "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" +} diff --git a/src/i18n/temp/zh-cn.json b/src/i18n/temp/zh-cn.json index 87ba009..0ba4e2c 100644 --- a/src/i18n/temp/zh-cn.json +++ b/src/i18n/temp/zh-cn.json @@ -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": "任务列表", diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue index 3c02762..fbff7e7 100644 --- a/src/layout/navBars/breadcrumb/user.vue +++ b/src/layout/navBars/breadcrumb/user.vue @@ -286,7 +286,12 @@ const onHandleCommandClick = (path: string) => { } }; const gotoApprove = () => { - router.push('/task/pending'); + // 如果当前地址已经在待办任务页，则刷新页面 + if (window.location.href.includes('/task/pending')) { + mittBus.emit('updatePendingTask'); + } else { + router.push('/task/pending'); + } }; // 菜单搜索点击 const onSearchClick = () => { diff --git a/src/spdm/views/home/components/ToDoCalendar.vue b/src/spdm/views/home/components/ToDoCalendar.vue index d6847da..9819b11 100644 --- a/src/spdm/views/home/components/ToDoCalendar.vue +++ b/src/spdm/views/home/components/ToDoCalendar.vue @@ -140,9 +140,14 @@ const changeSwitch = async (id: string) => { const getCurrentWeekDates = () => { const now = new Date(); const dayOfWeek = now.getDay(); // 获取今天是星期几，0表示星期日，1表示星期一，以此类推 - const diff = now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1); // 计算本周第一天是星期几 - const startDate = new Date(now.setDate(diff)); - const endDate = new Date(now.setDate(diff + 6)); + + // 计算本周第一天的日期（以周一为起始） + const diff = now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1); + const startDate = new Date(now.getFullYear(), now.getMonth(), diff); + + // 计算本周最后一天的日期（以周日为结束） + const endDate = new Date(now.getFullYear(), now.getMonth(), diff + 6); + return { startDate: parseDate(startDate.getTime(), '{y}-{m}-{d}'), endDate: parseDate(endDate.getTime(), '{y}-{m}-{d}'), diff --git a/src/views/flow/task/pendingFlowTask.vue b/src/views/flow/task/pendingFlowTask.vue index f0de506..0b3b365 100644 --- a/src/views/flow/task/pendingFlowTask.vue +++ b/src/views/flow/task/pendingFlowTask.vue @@ -23,7 +23,7 @@ --> - -
-
- -
-
- - - - -
-
+ +
+
+ +
+
+ + + + +
+