merge

scripts/package/function.mjs

@@ -268,6 +268,23 @@ export const appList = [
 			},
 		],
 	},
+	{
+		name: 'spdm_JobSubmit',
+		zhCn: '作业提交',
+		en: 'Job Submit',
+		pages: [
+			{
+				name: 'spdmJobSubmit',
+				zhCn: '作业提交',
+				en: 'Job Submit',
+				path: '/spdm/job/submit',
+				component: () => import('/@/spdm/views/index.vue'),
+				meta: {
+					icon: 'ele-DocumentAdd',
+				},
+			},
+		],
+	},
 	{
 		name: 'spdm_DataOverview',
 		zhCn: '数据总览',
@@ -2089,6 +2106,15 @@ export const navList = [
 			icon: 'ele-Calendar',
 		},
 	},
+	{
+		name: 'spdmJob',
+		zhCn: '作业管理',
+		en: 'Job Management',
+		subApps: ['spdm_JobSubmit'],
+		meta: {
+			icon: 'ele-Files',
+		},
+	},
 	{
 		name: 'spdmData',
 		zhCn: '数据管理',
@@ -2254,6 +2280,9 @@ export const menuList = [
 	{
 		navName: 'spdmTask',
 	},
+	{
+		navName: 'spdmJob',
+	},
 	{
 		navName: 'spdmData',
 	},

scripts/package/i18n/en.ts

@@ -24,6 +24,7 @@ export default {
     spdm_TaskAll: 'All Tasks',
     spdm_TaskExecution: 'Task Execution',
     spdm_ReportWork: 'Report Work',
+    spdm_JobSubmit: 'Job Submit',
     spdm_DataOverview: 'Data Overview',
     spdm_DataAnalysis: 'Data Query',
     spdm_DataPermission: 'Data Permission',
@@ -135,6 +136,7 @@ export default {
     spdm_TaskAll: 'All Tasks',
     spdm_TaskExecution: 'Task Execution',
     spdm_ReportWork: 'Report Work',
+    spdm_JobSubmit: 'Job Submit',
     spdm_DataOverview: 'Data Overview',
     spdm_DataAnalysis: 'Data Query',
     spdm_DataPermission: 'Data Permission',
@@ -249,6 +251,7 @@ export default {
     spdmTaskAll: 'All Tasks',
     spdmTaskExecution: 'Task Execution',
     spdmReportWork: 'Report Work',
+    spdmJobSubmit: 'Job Submit',
     spdmDataOverview: 'Data Overview',
     spdmDataAnalysis: 'Data Query',
     spdmDataPermission: 'Data Permission',
@@ -358,6 +361,7 @@ export default {
     erpMaterial: 'Material Management',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
+    spdmJob: 'Job Management',
     spdmData: 'Data Management',
     spdmSimulation: 'Process Management',
     spdmCompetenceCenter: 'Capability Center',

scripts/package/i18n/zh-cn.ts

@@ -32,6 +32,7 @@ export default {
     spdm_TaskAll: '所有任务',
     spdm_TaskExecution: '仿真执行',
     spdm_ReportWork: '报工列表',
+    spdm_JobSubmit: '作业提交',
     spdm_DataOverview: '数据总览',
     spdm_DataAnalysis: '数据查询',
     spdm_DataPermission: '数据权限',
@@ -146,6 +147,7 @@ export default {
     spdmTaskAll: '所有任务',
     spdmTaskExecution: '仿真执行',
     spdmReportWork: '报工列表',
+    spdmJobSubmit: '作业提交',
     spdmDataOverview: '数据总览',
     spdmDataAnalysis: '数据查询',
     spdmDataPermission: '数据权限',
@@ -255,6 +257,7 @@ export default {
     erpMaterial: '物料管理',
     spdmProject: '项目管理',
     spdmTask: '任务管理',
+    spdmJob: '作业管理',
     spdmData: '数据管理',
     spdmSimulation: '流程管理',
     spdmCompetenceCenter: '能力中心',

scripts/package/moduleMap.mjs

@@ -11,6 +11,7 @@ export const appMap = {
 	spdm_TaskAll: {"name":"moduleApps.spdm_TaskAll","zhCn":"所有任务","en":"All Tasks","pages":[{"name":"spdmTaskAll","zhCn":"所有任务","en":"All Tasks","path":"/spdm/task/all","meta":{"icon":"ele-DocumentCopy"}}]},
 	spdm_TaskExecution: {"name":"moduleApps.spdm_TaskExecution","zhCn":"仿真执行","en":"Task Execution","pages":[{"name":"spdmTaskExecution","zhCn":"仿真执行","en":"Task Execution","path":"/spdm/task/execution","meta":{"icon":"ele-Operation"}}]},
 	spdm_ReportWork: {"name":"moduleApps.spdm_ReportWork","zhCn":"报工列表","en":"Report Work","pages":[{"name":"spdmReportWork","zhCn":"报工列表","en":"Report Work","path":"/spdm/task/reportWork","meta":{"icon":"ele-Tickets"}}]},
+	spdm_JobSubmit: {"name":"moduleApps.spdm_JobSubmit","zhCn":"作业提交","en":"Job Submit","pages":[{"name":"spdmJobSubmit","zhCn":"作业提交","en":"Job Submit","path":"/spdm/job/submit","meta":{"icon":"ele-DocumentAdd"}}]},
 	spdm_DataOverview: {"name":"moduleApps.spdm_DataOverview","zhCn":"数据总览","en":"Data Overview","pages":[{"name":"spdmDataOverview","zhCn":"数据总览","en":"Data Overview","path":"/spdm/data/overview","meta":{"icon":"ele-DataAnalysis"}}]},
 	spdm_DataAnalysis: {"name":"moduleApps.spdm_DataAnalysis","zhCn":"数据查询","en":"Data Query","pages":[{"name":"spdmDataAnalysis","zhCn":"数据查询","en":"Data Query","path":"/spdm/data/analysis","meta":{"icon":"ele-Search"}}]},
 	spdm_DataPermission: {"name":"moduleApps.spdm_DataPermission","zhCn":"数据权限","en":"Data Permission","pages":[{"name":"spdmDataPermission","zhCn":"数据权限","en":"Data Permission","path":"/spdm/data/permission","meta":{"icon":"ele-Warning"}}]},
@@ -112,6 +113,7 @@ export const appMap = {
 export const navMap = {
 	spdmProject: {"name":"moduleRoutes.spdmProject","zhCn":"项目管理","en":"Project Management","subApps":["spdm_AllProject","spdm_ChargeProject","spdm_FllowProject","spdm_ProjectDashboard"],"meta":{"icon":"ele-House"}},
 	spdmTask: {"name":"moduleRoutes.spdmTask","zhCn":"任务管理","en":"Task Management","subApps":["spdm_TaskSponsor","spdm_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_ReportWork"],"meta":{"icon":"ele-Calendar"}},
+	spdmJob: {"name":"moduleRoutes.spdmJob","zhCn":"作业管理","en":"Job Management","subApps":["spdm_JobSubmit"],"meta":{"icon":"ele-Files"}},
 	spdmData: {"name":"moduleRoutes.spdmData","zhCn":"数据管理","en":"Data Management","subApps":["spdm_DataOverview","spdm_DataAnalysis","spdm_DataPermission","spdm_DataTrain","spdm_DataForecast"],"meta":{"icon":"ele-TakeawayBox"}},
 	spdmSimulation: {"name":"moduleRoutes.spdmSimulation","zhCn":"流程管理","en":"Process Management","subApps":["spdm_SimulationProcess","spdm_SystemApplication"],"meta":{"icon":"ele-Finished"}},
 	spdmCompetenceCenter: {"name":"moduleRoutes.spdmCompetenceCenter","zhCn":"能力中心","en":"Capability Center","subApps":["spdm_CompetenceCenterCondition","spdm_CompetenceCenterStandardScene","spdm_CompetenceCenterKnowledge","spdm_CompetenceCenterParameter","spdm_CompetenceCenterReport","spdm_CompetenceCenterAnimation","spdm_CompetenceCenterRobot","spdm_CompetenceCenterIndustrialDesign","spdm_CompetenceCenterToleranceAnalysis","spdm_CompetenceCenterExceptionCase"],"meta":{"icon":"ele-Reading"}},
@@ -247,6 +249,14 @@ export const pageMap = {
       "code": "spdm_ReportWork_view"
     }
   },
+  "spdmJobSubmit": {
+    "path": "/spdm/job/submit",
+    "name": "moduleRoutes.spdmJobSubmit",
+    "meta": {
+      "icon": "ele-DocumentAdd",
+      "code": "spdm_JobSubmit_view"
+    }
+  },
   "spdmDataOverview": {
     "path": "/spdm/data/overview",
     "name": "moduleRoutes.spdmDataOverview",

scripts/package/sql/sys_app.sql

@@ -20,6 +20,7 @@ INSERT INTO `sys_app` VALUES (1492688104, 'spdm_TaskAttention');
 INSERT INTO `sys_app` VALUES (6037428677, 'spdm_TaskAll');
 INSERT INTO `sys_app` VALUES (4023091864, 'spdm_TaskExecution');
 INSERT INTO `sys_app` VALUES (9129218323, 'spdm_ReportWork');
+INSERT INTO `sys_app` VALUES (7649132234, 'spdm_JobSubmit');
 INSERT INTO `sys_app` VALUES (6871282497, 'spdm_DataOverview');
 INSERT INTO `sys_app` VALUES (8526152209, 'spdm_DataAnalysis');
 INSERT INTO `sys_app` VALUES (5988284884, 'spdm_DataPermission');

scripts/package/sql/sys_function.sql

@@ -69,6 +69,11 @@ INSERT INTO `sys_function` VALUES (7415006674, 'spdm_ReportWork_add', 'spdm_Repo
 INSERT INTO `sys_function` VALUES (3950296985, 'spdm_ReportWork_edit', 'spdm_ReportWork');
 INSERT INTO `sys_function` VALUES (7546997669, 'spdm_ReportWork_del', 'spdm_ReportWork');
 INSERT INTO `sys_function` VALUES (9697674931, 'spdm_ReportWork_export', 'spdm_ReportWork');
+INSERT INTO `sys_function` VALUES (8692288874, 'spdm_JobSubmit_view', 'spdm_JobSubmit');
+INSERT INTO `sys_function` VALUES (4066120840, 'spdm_JobSubmit_add', 'spdm_JobSubmit');
+INSERT INTO `sys_function` VALUES (2226302877, 'spdm_JobSubmit_edit', 'spdm_JobSubmit');
+INSERT INTO `sys_function` VALUES (2586941479, 'spdm_JobSubmit_del', 'spdm_JobSubmit');
+INSERT INTO `sys_function` VALUES (6962497137, 'spdm_JobSubmit_export', 'spdm_JobSubmit');
 INSERT INTO `sys_function` VALUES (3116478448, 'spdm_DataOverview_view', 'spdm_DataOverview');
 INSERT INTO `sys_function` VALUES (3485528822, 'spdm_DataOverview_add', 'spdm_DataOverview');
 INSERT INTO `sys_function` VALUES (7134401498, 'spdm_DataOverview_edit', 'spdm_DataOverview');

src/i18n/pages/route/en.ts

@@ -24,6 +24,7 @@ export default {
     spdm_TaskAll: 'All Tasks',
     spdm_TaskExecution: 'Task Execution',
     spdm_ReportWork: 'Report Work',
+    spdm_JobSubmit: 'Job Submit',
     spdm_DataOverview: 'Data Overview',
     spdm_DataAnalysis: 'Data Query',
     spdm_DataPermission: 'Data Permission',
@@ -135,6 +136,7 @@ export default {
     spdm_TaskAll: 'All Tasks',
     spdm_TaskExecution: 'Task Execution',
     spdm_ReportWork: 'Report Work',
+    spdm_JobSubmit: 'Job Submit',
     spdm_DataOverview: 'Data Overview',
     spdm_DataAnalysis: 'Data Query',
     spdm_DataPermission: 'Data Permission',
@@ -249,6 +251,7 @@ export default {
     spdmTaskAll: 'All Tasks',
     spdmTaskExecution: 'Task Execution',
     spdmReportWork: 'Report Work',
+    spdmJobSubmit: 'Job Submit',
     spdmDataOverview: 'Data Overview',
     spdmDataAnalysis: 'Data Query',
     spdmDataPermission: 'Data Permission',
@@ -358,6 +361,7 @@ export default {
     erpMaterial: 'Material Management',
     spdmProject: 'Project Management',
     spdmTask: 'Task Management',
+    spdmJob: 'Job Management',
     spdmData: 'Data Management',
     spdmSimulation: 'Process Management',
     spdmCompetenceCenter: 'Capability Center',

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

@@ -32,6 +32,7 @@ export default {
     spdm_TaskAll: '所有任务',
     spdm_TaskExecution: '仿真执行',
     spdm_ReportWork: '报工列表',
+    spdm_JobSubmit: '作业提交',
     spdm_DataOverview: '数据总览',
     spdm_DataAnalysis: '数据查询',
     spdm_DataPermission: '数据权限',
@@ -146,6 +147,7 @@ export default {
     spdmTaskAll: '所有任务',
     spdmTaskExecution: '仿真执行',
     spdmReportWork: '报工列表',
+    spdmJobSubmit: '作业提交',
     spdmDataOverview: '数据总览',
     spdmDataAnalysis: '数据查询',
     spdmDataPermission: '数据权限',
@@ -255,6 +257,7 @@ export default {
     erpMaterial: '物料管理',
     spdmProject: '项目管理',
     spdmTask: '任务管理',
+    spdmJob: '作业管理',
     spdmData: '数据管理',
     spdmSimulation: '流程管理',
     spdmCompetenceCenter: '能力中心',

src/router/menus.ts

@@ -121,6 +121,23 @@ export default [
       }
     ]
   },
+  {
+    "name": "moduleRoutes.spdmJob",
+    "path": "spdmJob",
+    "meta": {
+      "icon": "ele-Files"
+    },
+    "children": [
+      {
+        "name": "moduleApps.spdm_JobSubmit",
+        "path": "/spdm/job/submit",
+        "meta": {
+          "icon": "ele-DocumentAdd",
+          "code": "spdm_JobSubmit_view"
+        }
+      }
+    ]
+  },
   {
     "name": "moduleRoutes.spdmData",
     "path": "spdmData",

src/router/modules.ts

@@ -89,6 +89,12 @@ export default [
 		component: () => import('/@/spdm/views/index.vue'),
 		meta: {"icon":"ele-Tickets","code":"spdm_ReportWork_view"},
 	},
+	{
+		path: '/spdm/job/submit',
+		name: 'moduleRoutes.spdmJobSubmit',
+		component: () => import('/@/spdm/views/index.vue'),
+		meta: {"icon":"ele-DocumentAdd","code":"spdm_JobSubmit_view"},
+	},
 	{
 		path: '/spdm/data/overview',
 		name: 'moduleRoutes.spdmDataOverview',

src/router/powers.ts

@@ -9,7 +9,7 @@ export interface IPowerItem {
 	children: {id: IFunctionId; label: string}[];
 }
 
-export const appIds = ["4776298884","144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","4600352034","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","1073400191","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","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 = ["4776298884","144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","7649132234","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","4600352034","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","1073400191","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","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[]) => {
@@ -79,6 +79,11 @@ export default <IPowerItem[]>[
 		label: 'moduleApps.spdm_ReportWork',
 		children: [{"id":"557285917","label":"moduleFuncs.view"},{"id":"7415006674","label":"moduleFuncs.add"},{"id":"3950296985","label":"moduleFuncs.edit"},{"id":"7546997669","label":"moduleFuncs.del"},{"id":"9697674931","label":"moduleFuncs.export"}],
 	},
+  {
+		id: '7649132234',
+		label: 'moduleApps.spdm_JobSubmit',
+		children: [{"id":"8692288874","label":"moduleFuncs.view"},{"id":"4066120840","label":"moduleFuncs.add"},{"id":"2226302877","label":"moduleFuncs.edit"},{"id":"2586941479","label":"moduleFuncs.del"},{"id":"6962497137","label":"moduleFuncs.export"}],
+	},
   {
 		id: '6871282497',
 		label: 'moduleApps.spdm_DataOverview',

src/spdm/function.mjs

@@ -16,6 +16,23 @@ export const appList = [
 			},
 		],
 	},
+	{
+		name: 'spdm_JobSubmit',
+		zhCn: '作业提交',
+		en: 'Job Submit',
+		pages: [
+			{
+				name: 'spdmJobSubmit',
+				zhCn: '作业提交',
+				en: 'Job Submit',
+				path: '/spdm/job/submit',
+				component: () => import('/@/spdm/views/index.vue'),
+				meta: {
+					icon: 'ele-DocumentAdd',
+				},
+			},
+		],
+	},
 	{
 		name: 'spdm_TaskSponsor',
 		zhCn: '我提出的',
@@ -682,6 +699,15 @@ export const navList = [
 			icon: 'ele-Calendar',
 		},
 	},
+	{
+		name: 'spdmJob',
+		zhCn: '作业管理',
+		en: 'Job Management',
+		subApps: ['spdm_JobSubmit'],
+		meta: {
+			icon: 'ele-Files',
+		},
+	},
 	{
 		name: 'spdmData',
 		zhCn: '数据管理',
@@ -748,6 +774,9 @@ export const menuList = [
 	{
 		navName: 'spdmTask',
 	},
+	{
+		navName: 'spdmJob',
+	},
 	{
 		navName: 'spdmData',
 	},

src/spdm/moduleMap.mjs

@@ -111,6 +111,14 @@ export const pageMap = {
 			code: 'spdm_ReportWork_view',
 		},
 	},
+	spdmJobSubmit: {
+		path: '/spdm/job/submit',
+		name: 'moduleRoutes.spdmJobSubmit',
+		meta: {
+			icon: 'ele-DocumentAdd',
+			code: 'spdm_Job_submit',
+		},
+	},
 	spdmTaskWorkLoad: {
 		path: '/spdm/task/workLoad',
 		name: 'moduleRoutes.spdmTaskWorkLoad',