update:利元亨菜单调整

scripts/package/function.mjs

@@ -34,6 +34,26 @@ export const ScopeApp = 'moduleApps';
 export const ScopeRoute = 'moduleRoutes';
 
 export const appList = [
+    {
+    name: 'spdmTaskList',
+    zhCn: '新增待办',
+    en: 'Pending Task',
+    meta: {
+      icon: 'ele-Warning',
+    },
+    pages: [
+      {
+        name: 'spdmTaskSponsor',
+        zhCn: '新增待办',
+        en: 'Pending Task',
+        path: '/spdm/task/sponsor',
+        component: () => import('/@/spdm/views/index.vue'),
+        meta: {
+          icon: 'ele-Warning',
+        },
+      },
+    ]
+  },
   {
     name: 'spdmProject',
     zhCn: '项目管理',
@@ -82,16 +102,6 @@ export const appList = [
       icon: 'ele-Calendar',
     },
     pages: [
-      {
-        name: 'spdmTaskSponsor',
-        zhCn: '新增待办',
-		    en: 'I Initiated',
-        path: '/spdm/task/sponsor',
-        component: () => import('/@/spdm/views/index.vue'),
-        meta: {
-          icon: 'ele-Warning',
-        },
-      },
       {
         name: 'spdmTaskConfirm',
         zhCn: '我确认的',
@@ -1909,6 +1919,9 @@ export const navList = [
 ];
 
 export const menuList = [
+	{
+		appName: 'spdmTaskList',
+	},
 	{
 		appName: 'spdmProject',
 	},

scripts/package/i18n/en.ts

@@ -12,6 +12,7 @@ export default {
 		tokenLogin: 'Token Login',
 	},
 	moduleFuncs: {
+    spdmTaskList: 'Pending Task',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
     spdmData: 'Data Management',
@@ -93,6 +94,7 @@ export default {
     erp_material: 'Material Management',
 	},
   moduleApps: {
+    spdmTaskList: 'Pending Task',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
     spdmData: 'Data Management',
@@ -174,10 +176,10 @@ export default {
     erp_material: 'Material Management',
   },
   moduleRoutes: {
+    spdmTaskSponsor: 'Pending Task',
     spdmProjectProjectList: 'Project List',
     spdmProjectDataStatistics: 'Data Statistics',
     spdmProjectDashboard: 'Simulation Dashboard',
-    spdmTaskSponsor: 'I Initiated',
     spdmTaskConfirm: 'I confirmed',
     spdmTaskExecute: 'I executed',
     spdmTaskAttention: 'I Attention',

scripts/package/i18n/zh-cn.ts

@@ -20,6 +20,7 @@ export default {
     shutdown: '停止',
 	},
   moduleApps: {
+    spdmTaskList: '新增待办',
     spdmProject: '项目管理',
     spdmTask: '任务管理',
     spdmData: '数据管理',
@@ -101,10 +102,10 @@ export default {
     erp_material: '物料管理',
   },
   moduleRoutes: {
+    spdmTaskSponsor: '新增待办',
     spdmProjectProjectList: '项目列表',
     spdmProjectDataStatistics: '数据统计',
     spdmProjectDashboard: '仿真看板',
-    spdmTaskSponsor: '新增待办',
     spdmTaskConfirm: '我确认的',
     spdmTaskExecute: '我执行的',
     spdmTaskAttention: '我关注的',

scripts/package/moduleMap.mjs

@@ -1,6 +1,7 @@
 export const appMap = {
+	spdmTaskList: {"name":"moduleApps.spdmTaskList","zhCn":"新增待办","en":"Pending Task","meta":{"icon":"ele-Warning"},"pages":[{"name":"spdmTaskSponsor","zhCn":"新增待办","en":"Pending Task","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}}]},
 	spdmProject: {"name":"moduleApps.spdmProject","zhCn":"项目管理","en":"Project Management","meta":{"icon":"ele-House"},"pages":[{"name":"spdmProjectProjectList","zhCn":"项目列表","en":"Project List","path":"/spdm/project/projectList","meta":{"icon":"ele-MessageBox"}},{"name":"spdmProjectDataStatistics","zhCn":"数据统计","en":"Data Statistics","path":"/spdm/project/statistics","meta":{"icon":"ele-PieChart"}},{"name":"spdmProjectDashboard","zhCn":"仿真看板","en":"Simulation Dashboard","path":"/spdm/project/dashboard","meta":{"icon":"ele-DataBoard"}}]},
-	spdmTask: {"name":"moduleApps.spdmTask","zhCn":"任务管理","en":"Task Management","meta":{"icon":"ele-Calendar"},"pages":[{"name":"spdmTaskSponsor","zhCn":"新增待办","en":"I Initiated","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}},{"name":"spdmTaskConfirm","zhCn":"我确认的","en":"I confirmed","path":"/spdm/task/confirm","meta":{"icon":"ele-DocumentChecked"}},{"name":"spdmTaskExecute","zhCn":"我执行的","en":"I executed","path":"/spdm/task/execute","meta":{"icon":"ele-SetUp"}},{"name":"spdmTaskAttention","zhCn":"我关注的","en":"I Attention","path":"/spdm/task/attention","meta":{"icon":"ele-Bell"}},{"name":"spdmTaskAll","zhCn":"所有任务","en":"All Tasks","path":"/spdm/task/all","meta":{"icon":"ele-DocumentCopy"}},{"name":"spdmTaskExecution","zhCn":"任务执行","en":"Task execution","path":"/spdm/task/execution","meta":{"icon":"ele-Operation"}}]},
+	spdmTask: {"name":"moduleApps.spdmTask","zhCn":"任务管理","en":"Task Management","meta":{"icon":"ele-Calendar"},"pages":[{"name":"spdmTaskConfirm","zhCn":"我确认的","en":"I confirmed","path":"/spdm/task/confirm","meta":{"icon":"ele-DocumentChecked"}},{"name":"spdmTaskExecute","zhCn":"我执行的","en":"I executed","path":"/spdm/task/execute","meta":{"icon":"ele-SetUp"}},{"name":"spdmTaskAttention","zhCn":"我关注的","en":"I Attention","path":"/spdm/task/attention","meta":{"icon":"ele-Bell"}},{"name":"spdmTaskAll","zhCn":"所有任务","en":"All Tasks","path":"/spdm/task/all","meta":{"icon":"ele-DocumentCopy"}},{"name":"spdmTaskExecution","zhCn":"任务执行","en":"Task execution","path":"/spdm/task/execution","meta":{"icon":"ele-Operation"}}]},
 	spdmData: {"name":"moduleApps.spdmData","zhCn":"数据管理","en":"Data Management","meta":{"icon":"ele-TakeawayBox"},"pages":[{"name":"spdmDataOverview","zhCn":"数据总览","en":"Data Overview","path":"/spdm/data/overview","meta":{"icon":"ele-DataAnalysis"}},{"name":"spdmDataAnalysis","zhCn":"数据查询","en":"Data Query","path":"/spdm/data/analysis","meta":{"icon":"ele-Search"}},{"name":"spdmDataPermission","zhCn":"数据权限","en":"Data Permission","path":"/spdm/data/permission","meta":{"icon":"ele-Warning"}},{"name":"spdmDataTrain","zhCn":"数据训练","en":"Data Training","path":"/spdm/data/train","meta":{"icon":"ele-Cpu"}},{"name":"spdmDataForecast","zhCn":"数据预测","en":"Data Prediction","path":"/spdm/data/forecast","meta":{"icon":"ele-Paperclip"}}]},
 	spdmSimulation: {"name":"moduleApps.spdmSimulation","zhCn":"流程管理","en":"Process Management","meta":{"icon":"ele-Finished"},"pages":[{"name":"spdmSimulationProcess","zhCn":"仿真流程","en":"Simulation Process","path":"/spdm/simulation/process","meta":{"icon":"ele-FolderChecked"}},{"name":"spdmSystemApplication","zhCn":"应用中心","en":"Application Center","path":"/spdm/simulation/application","meta":{"icon":"ele-Cellphone"}}]},
 	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"}}]},
@@ -91,6 +92,14 @@ export const navMap = {
 	industrial_resource_bank: {"name":"moduleRoutes.industrial_resource_bank","zhCn":"工业资源库","en":"Industrial Resource Bank","subApps":["material_information_table","material_color_error","erp_material"],"meta":{"icon":"iconfont icon-quanjushezhi_o"}},
 };
 export const pageMap = {
+  "spdmTaskSponsor": {
+    "path": "/spdm/task/sponsor",
+    "name": "moduleRoutes.spdmTaskSponsor",
+    "meta": {
+      "icon": "ele-Warning",
+      "code": "spdmTaskList_view"
+    }
+  },
   "spdmProjectProjectList": {
     "path": "/spdm/project/projectList",
     "name": "moduleRoutes.spdmProjectProjectList",
@@ -115,14 +124,6 @@ export const pageMap = {
       "code": "spdmProject_view"
     }
   },
-  "spdmTaskSponsor": {
-    "path": "/spdm/task/sponsor",
-    "name": "moduleRoutes.spdmTaskSponsor",
-    "meta": {
-      "icon": "ele-Warning",
-      "code": "spdmTask_view"
-    }
-  },
   "spdmTaskConfirm": {
     "path": "/spdm/task/confirm",
     "name": "moduleRoutes.spdmTaskConfirm",

scripts/package/sql/sys_app.sql

@@ -8,6 +8,7 @@ CREATE TABLE `sys_app`  (
   PRIMARY KEY (`app_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应用' ROW_FORMAT = DYNAMIC;
 
+INSERT INTO `sys_app` VALUES (8676203018, 'spdmTaskList');
 INSERT INTO `sys_app` VALUES (1156596470, 'spdmProject');
 INSERT INTO `sys_app` VALUES (4802450613, 'spdmTask');
 INSERT INTO `sys_app` VALUES (6489405838, 'spdmData');

scripts/package/sql/sys_function.sql

@@ -9,6 +9,11 @@ CREATE TABLE `sys_function`  (
   PRIMARY KEY (`function_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '功能编码与应用' ROW_FORMAT = DYNAMIC;
 
+INSERT INTO `sys_function` VALUES (2003208417, 'spdmTaskList_view', 'spdmTaskList');
+INSERT INTO `sys_function` VALUES (2116679949, 'spdmTaskList_add', 'spdmTaskList');
+INSERT INTO `sys_function` VALUES (6616404168, 'spdmTaskList_edit', 'spdmTaskList');
+INSERT INTO `sys_function` VALUES (191529055, 'spdmTaskList_del', 'spdmTaskList');
+INSERT INTO `sys_function` VALUES (1619955889, 'spdmTaskList_export', 'spdmTaskList');
 INSERT INTO `sys_function` VALUES (6734734043, 'spdmProject_view', 'spdmProject');
 INSERT INTO `sys_function` VALUES (4464919454, 'spdmProject_add', 'spdmProject');
 INSERT INTO `sys_function` VALUES (6742225697, 'spdmProject_edit', 'spdmProject');

src/i18n/pages/route/en.ts

@@ -12,6 +12,7 @@ export default {
 		tokenLogin: 'Token Login',
 	},
 	moduleFuncs: {
+    spdmTaskList: 'Pending Task',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
     spdmData: 'Data Management',
@@ -93,6 +94,7 @@ export default {
     erp_material: 'Material Management',
 	},
   moduleApps: {
+    spdmTaskList: 'Pending Task',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
     spdmData: 'Data Management',
@@ -174,10 +176,10 @@ export default {
     erp_material: 'Material Management',
   },
   moduleRoutes: {
+    spdmTaskSponsor: 'Pending Task',
     spdmProjectProjectList: 'Project List',
     spdmProjectDataStatistics: 'Data Statistics',
     spdmProjectDashboard: 'Simulation Dashboard',
-    spdmTaskSponsor: 'I Initiated',
     spdmTaskConfirm: 'I confirmed',
     spdmTaskExecute: 'I executed',
     spdmTaskAttention: 'I Attention',

src/i18n/pages/route/zh-cn.ts

@@ -20,6 +20,7 @@ export default {
     shutdown: '停止',
 	},
   moduleApps: {
+    spdmTaskList: '新增待办',
     spdmProject: '项目管理',
     spdmTask: '任务管理',
     spdmData: '数据管理',
@@ -101,10 +102,10 @@ export default {
     erp_material: '物料管理',
   },
   moduleRoutes: {
+    spdmTaskSponsor: '新增待办',
     spdmProjectProjectList: '项目列表',
     spdmProjectDataStatistics: '数据统计',
     spdmProjectDashboard: '仿真看板',
-    spdmTaskSponsor: '新增待办',
     spdmTaskConfirm: '我确认的',
     spdmTaskExecute: '我执行的',
     spdmTaskAttention: '我关注的',

src/router/menus.ts

@@ -7,6 +7,14 @@ export default [
       "isKeepAlive": true
     }
   },
+  {
+    "name": "moduleApps.spdmTaskList",
+    "path": "/spdm/task/sponsor",
+    "meta": {
+      "icon": "ele-Warning",
+      "code": "spdmTaskList_view"
+    }
+  },
   {
     "name": "moduleApps.spdmProject",
     "path": "/spdm/project/projectList",
@@ -43,20 +51,12 @@ export default [
   },
   {
     "name": "moduleApps.spdmTask",
-    "path": "/spdm/task/sponsor",
+    "path": "/spdm/task/confirm",
     "meta": {
       "icon": "ele-Calendar",
       "code": "spdmTask_view"
     },
     "children": [
-      {
-        "path": "/spdm/task/sponsor",
-        "name": "moduleRoutes.spdmTaskSponsor",
-        "meta": {
-          "icon": "ele-Warning",
-          "code": "spdmTask_view"
-        }
-      },
       {
         "path": "/spdm/task/confirm",
         "name": "moduleRoutes.spdmTaskConfirm",

src/router/modules.ts

@@ -1,4 +1,10 @@
 export default [
+	{
+		path: '/spdm/task/sponsor',
+		name: 'moduleRoutes.spdmTaskSponsor',
+		component: () => import('/@/spdm/views/index.vue'),
+		meta: {"icon":"ele-Warning","code":"spdmTaskList_view"},
+	},
 	{
 		path: '/spdm/project/projectList',
 		name: 'moduleRoutes.spdmProjectProjectList',
@@ -17,12 +23,6 @@ export default [
 		component: () => import('/@/spdm/views/index.vue'),
 		meta: {"icon":"ele-DataBoard","code":"spdmProject_view"},
 	},
-	{
-		path: '/spdm/task/sponsor',
-		name: 'moduleRoutes.spdmTaskSponsor',
-		component: () => import('/@/spdm/views/index.vue'),
-		meta: {"icon":"ele-Warning","code":"spdmTask_view"},
-	},
 	{
 		path: '/spdm/task/confirm',
 		name: 'moduleRoutes.spdmTaskConfirm',

src/router/powers.ts

@@ -9,7 +9,7 @@ export interface IPowerItem {
 	children: {id: IFunctionId; label: string}[];
 }
 
-export const appIds = ["1156596470","4802450613","6489405838","5930500551","7583213365","6254890661","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"];
+export const appIds = ["8676203018","1156596470","4802450613","6489405838","5930500551","7583213365","6254890661","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"];
 export const appIdMap = new Set(appIds);
 
 export const filterFunctionCodesIsApp = (codeList: string[]) => {
@@ -19,6 +19,11 @@ export const filterFunctionCodesIsApp = (codeList: string[]) => {
 };
 
 export default <IPowerItem[]>[
+  {
+		id: '8676203018',
+		label: 'moduleApps.spdmTaskList',
+		children: [{"id":"2003208417","label":"moduleFuncs.view"},{"id":"2116679949","label":"moduleFuncs.add"},{"id":"6616404168","label":"moduleFuncs.edit"},{"id":"191529055","label":"moduleFuncs.del"},{"id":"1619955889","label":"moduleFuncs.export"}],
+	},
   {
 		id: '1156596470',
 		label: 'moduleApps.spdmProject',

src/spdm/function.mjs

@@ -1,4 +1,24 @@
 export const appList = [
+  {
+    name: 'spdmTaskList',
+    zhCn: '新增待办',
+    en: 'Pending Task',
+    meta: {
+      icon: 'ele-Warning',
+    },
+    pages: [
+      {
+        name: 'spdmTaskSponsor',
+        zhCn: '新增待办',
+        en: 'Pending Task',
+        path: '/spdm/task/sponsor',
+        component: () => import('/@/spdm/views/index.vue'),
+        meta: {
+          icon: 'ele-Warning',
+        },
+      },
+    ]
+  },
   {
     name: 'spdmProject',
     zhCn: '项目管理',
@@ -47,16 +67,6 @@ export const appList = [
       icon: 'ele-Calendar',
     },
     pages: [
-      {
-        name: 'spdmTaskSponsor',
-        zhCn: '新增待办',
-		    en: 'I Initiated',
-        path: '/spdm/task/sponsor',
-        component: () => import('/@/spdm/views/index.vue'),
-        meta: {
-          icon: 'ele-Warning',
-        },
-      },
       {
         name: 'spdmTaskConfirm',
         zhCn: '我确认的',
@@ -414,6 +424,9 @@ export const appList = [
 export const navList = [];
 
 export const menuList = [
+  {
+		appName: 'spdmTaskList',
+	},
   {
 		appName: 'spdmProject',
 	},