diff --git a/scripts/package/function.mjs b/scripts/package/function.mjs index 8fe6315..50d03fb 100644 --- a/scripts/package/function.mjs +++ b/scripts/package/function.mjs @@ -548,16 +548,16 @@ export const appList = [ // icon: 'fa fa-arrow-circle-right', // }, // }, - // { - // name: 'taskCompleted', - // zhCn: '已完成任务', - // en: 'Completed Task', - // path: '/task/completed', - // component: () => import('/@/views/flow/task/completed.vue'), - // meta: { - // icon: 'fa fa-hand-o-right', - // }, - // }, + { + name: 'taskCompleted', + zhCn: '已完成任务', + en: 'Completed Task', + path: '/task/completed', + component: () => import('/@/views/flow/task/completed.vue'), + meta: { + icon: 'fa fa-hand-o-right', + }, + }, ], }, { diff --git a/scripts/package/i18n/en.ts b/scripts/package/i18n/en.ts index 8de04fe..980d7b9 100644 --- a/scripts/package/i18n/en.ts +++ b/scripts/package/i18n/en.ts @@ -203,6 +203,7 @@ export default { projectDetail: 'Project Detail', projectSet: 'Project Set', taskPending: 'Pending Task', + taskCompleted: 'Completed Task', formTemplateList: 'Form Template List', formTemplateVersion: 'Form Template Version', flowGroup: 'Flow List', diff --git a/scripts/package/i18n/zh-cn.ts b/scripts/package/i18n/zh-cn.ts index e650531..79b08ad 100644 --- a/scripts/package/i18n/zh-cn.ts +++ b/scripts/package/i18n/zh-cn.ts @@ -129,6 +129,7 @@ export default { projectDetail: '项目详情', projectSet: '项目设置', taskPending: '待办任务', + taskCompleted: '已完成任务', formTemplateList: '表单列表', formTemplateVersion: '表单版本', flowGroup: '流程列表', diff --git a/scripts/package/moduleMap.mjs b/scripts/package/moduleMap.mjs index bb76bea..41a70a2 100644 --- a/scripts/package/moduleMap.mjs +++ b/scripts/package/moduleMap.mjs @@ -7,7 +7,7 @@ export const appMap = { spdmCompetenceCenter: {"name":"moduleApps.spdmCompetenceCenter","zhCn":"能力中心","en":"Capability Center","meta":{"icon":"ele-Reading"},"pages":[{"name":"spdmCompetenceCenterCondition","zhCn":"仿真工况库","en":"Condition Library","path":"/spdm/competenceCenter/condition","meta":{"icon":"ele-Suitcase"}},{"name":"spdmCompetenceCenterIndicator","zhCn":"仿真指标库","en":"Indicator Library","path":"/spdm/competenceCenter/indicator","meta":{"icon":"ele-Money"}},{"name":"spdmCompetenceCenterKnowledge","zhCn":"仿真知识库","en":"Knowledge Library","path":"/spdm/competenceCenter/knowledge","meta":{"icon":"ele-Memo"}},{"name":"spdmCompetenceCenterParameter","zhCn":"仿真参数库","en":"Parameter Library","path":"/spdm/competenceCenter/parameter","meta":{"icon":"ele-Tickets"}}]}, spdmSystem: {"name":"moduleApps.spdmSystem","zhCn":"系统管理","en":"System Administration","meta":{"icon":"ele-Monitor"},"pages":[{"name":"spdmSystemStorage","zhCn":"数据存储","en":"Data Storage","path":"/spdm/system/storage","meta":{"icon":"ele-Wallet"}},{"name":"spdmSystemDictionary","zhCn":"数据字典","en":"Data Dictionary","path":"/spdm/system/dictionary","meta":{"icon":"ele-Collection"}},{"name":"spdmSystemLogs","zhCn":"日志管理","en":"Logs","path":"/spdm/system/logs","meta":{"icon":"ele-Link"}},{"name":"spdmSystemDynamicTable","zhCn":"动态表格","en":"Dynamic Table","path":"/spdm/system/dynamicTable","meta":{"icon":"ele-Document"}}]}, project: {"name":"moduleApps.project","zhCn":"项目管理","en":"Project Management","pages":[{"name":"projectList","zhCn":"项目列表","en":"Project List","path":"/project/list","meta":{"icon":"iconfont icon-diannao1"}},{"name":"projectDetail","zhCn":"项目详情","en":"Project Detail","path":"/project/detail","meta":{"isKeepAlive":true,"parentName":"projectList"}},{"name":"projectSet","zhCn":"项目设置","en":"Project Set","path":"/project/set","meta":{"parentName":"projectDetail"}}]}, - task: {"name":"moduleApps.task","zhCn":"任务中心","en":"Task Center","functions":["shutdown"],"pages":[{"name":"taskPending","zhCn":"待办任务","en":"Pending Task","path":"/task/pending","meta":{"icon":"fa fa-flag-checkered"}}]}, + task: {"name":"moduleApps.task","zhCn":"任务中心","en":"Task Center","functions":["shutdown"],"pages":[{"name":"taskPending","zhCn":"待办任务","en":"Pending Task","path":"/task/pending","meta":{"icon":"fa fa-flag-checkered"}},{"name":"taskCompleted","zhCn":"已完成任务","en":"Completed Task","path":"/task/completed","meta":{"icon":"fa fa-hand-o-right"}}]}, form_template: {"name":"moduleApps.form_template","zhCn":"表单管理","en":"Form Management","pages":[{"name":"formTemplateList","zhCn":"表单列表","en":"Form Template List","path":"/form-template/list","meta":{"icon":"iconfont icon-putong"}},{"name":"formTemplateVersion","zhCn":"表单版本","en":"Form Template Version","path":"/form-template/version","meta":{"icon":"iconfont icon-barcode-qr","parentName":"formTemplateList"}}]}, flow_template: {"name":"moduleApps.flow_template","zhCn":"流程模板管理","en":"Flow Template Management","pages":[{"name":"flowGroup","zhCn":"流程列表","en":"Flow List","path":"/flow/group","meta":{"icon":"iconfont icon-gongju"}},{"name":"flowCreate","zhCn":"创建流程","en":"Create Flow Template","path":"/flow/create","meta":{"icon":"fa fa-arrow-circle-right","parentName":"flowGroup"}}]}, flow_initiate: {"name":"moduleApps.flow_initiate","zhCn":"发起流程","en":"Initiate Flow","pages":[{"name":"flowInitiate","zhCn":"发起流程","en":"Initiate Flow","path":"/flow/initiate","meta":{"icon":"fa fa-play"}}]}, @@ -309,6 +309,14 @@ export const pageMap = { "code": "task_view" } }, + "taskCompleted": { + "path": "/task/completed", + "name": "moduleRoutes.taskCompleted", + "meta": { + "icon": "fa fa-hand-o-right", + "code": "task_view" + } + }, "formTemplateList": { "path": "/form-template/list", "name": "moduleRoutes.formTemplateList", diff --git a/src/api/message/index.ts b/src/api/message/index.ts index 59245a5..4d0c709 100644 --- a/src/api/message/index.ts +++ b/src/api/message/index.ts @@ -1,5 +1,6 @@ import request from '/@/utils/request'; import { getObj } from '/@/api/pm/pmTask'; +import { queryTask } from '/@/api/flow/task'; import { useUserInfo } from '/@/stores/userInfo'; import router from '/@/router'; @@ -244,11 +245,13 @@ export const taskAdjust = async (item: any, readType: number = MessageRead.READ) }); } } else if (item.msgCategory === MessageCategory.SPDM) { // SPDM CODE + queryTask(params.taskId, false).then((res) => { localStorage.setItem('SPDM_MSG_TASK_TYPE', 'flow'); localStorage.setItem('SPDM_MSG_TASK_PARAMS', JSON.stringify(params)); router.push({ - path: TaskLink.Pending, + path: res.data.endTime ? TaskLink.Completed : TaskLink.Pending, }); + }); } else { router.push({ path: CategoryRoute[item.msgCategory], diff --git a/src/i18n/pages/route/en.ts b/src/i18n/pages/route/en.ts index 8de04fe..980d7b9 100644 --- a/src/i18n/pages/route/en.ts +++ b/src/i18n/pages/route/en.ts @@ -203,6 +203,7 @@ export default { projectDetail: 'Project Detail', projectSet: 'Project Set', taskPending: 'Pending Task', + taskCompleted: 'Completed Task', formTemplateList: 'Form Template List', formTemplateVersion: 'Form Template Version', flowGroup: 'Flow List', diff --git a/src/i18n/pages/route/zh-cn.ts b/src/i18n/pages/route/zh-cn.ts index e650531..79b08ad 100644 --- a/src/i18n/pages/route/zh-cn.ts +++ b/src/i18n/pages/route/zh-cn.ts @@ -129,6 +129,7 @@ export default { projectDetail: '项目详情', projectSet: '项目设置', taskPending: '待办任务', + taskCompleted: '已完成任务', formTemplateList: '表单列表', formTemplateVersion: '表单版本', flowGroup: '流程列表', diff --git a/src/router/menus.ts b/src/router/menus.ts index 06fa84e..b047792 100644 --- a/src/router/menus.ts +++ b/src/router/menus.ts @@ -421,6 +421,14 @@ export default [ "icon": "fa fa-flag-checkered", "code": "task_view" } + }, + { + "path": "/task/completed", + "name": "moduleRoutes.taskCompleted", + "meta": { + "icon": "fa fa-hand-o-right", + "code": "task_view" + } } ] }, diff --git a/src/router/modules.ts b/src/router/modules.ts index ecf93bd..a0f78e3 100644 --- a/src/router/modules.ts +++ b/src/router/modules.ts @@ -161,6 +161,12 @@ export default [ component: () => import('/@/views/flow/task/pending.vue'), meta: {"icon":"fa fa-flag-checkered","code":"task_view"}, }, + { + path: '/task/completed', + name: 'moduleRoutes.taskCompleted', + component: () => import('/@/views/flow/task/completed.vue'), + meta: {"icon":"fa fa-hand-o-right","code":"task_view"}, + }, { path: '/form-template/list', name: 'moduleRoutes.formTemplateList', diff --git a/src/views/flow/task/completed.vue b/src/views/flow/task/completed.vue index 5ce2ac7..f3d06e8 100644 --- a/src/views/flow/task/completed.vue +++ b/src/views/flow/task/completed.vue @@ -2,10 +2,10 @@
- +