From 59df0f94587268f01db3b3417d8f0085063960ab Mon Sep 17 00:00:00 2001 From: dongzhihuan Date: Thu, 12 Mar 2026 19:27:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/package/function.mjs | 28 ++++++++++++++-------------- scripts/package/i18n/en.ts | 6 +++--- scripts/package/i18n/zh-cn.ts | 4 ++-- scripts/package/moduleMap.mjs | 6 +++--- scripts/package/sql/sys_app.sql | 2 +- scripts/package/sql/sys_function.sql | 10 +++++----- src/i18n/pages/route/en.ts | 6 +++--- src/i18n/pages/route/zh-cn.ts | 4 ++-- src/router/menus.ts | 16 ++++++++-------- src/router/modules.ts | 2 +- src/router/powers.ts | 8 ++++---- src/spdm/config.ts | 18 +++++++++--------- src/spdm/function.mjs | 26 +++++++++++++------------- 13 files changed, 68 insertions(+), 68 deletions(-) diff --git a/scripts/package/function.mjs b/scripts/package/function.mjs index 8ace19e..e1c1450 100644 --- a/scripts/package/function.mjs +++ b/scripts/package/function.mjs @@ -34,15 +34,15 @@ export const ScopeApp = 'moduleApps'; export const ScopeRoute = 'moduleRoutes'; export const appList = [ - { - name: 'spdmTaskList', - zhCn: '新增待办', - en: 'Pending Task', + { + name: 'spdm_TaskList', + zhCn: '我提出的', + en: 'I Initiated', pages: [ { name: 'spdmTaskSponsor', - zhCn: '新增待办', - en: 'Pending Task', + zhCn: '我提出的', + en: 'I Initiated', path: '/spdm/task/sponsor', component: () => import('/@/spdm/views/index.vue'), meta: { @@ -68,7 +68,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_ChargeProject', zhCn: '负责项目', en: 'Charge Project', @@ -85,7 +85,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_FllowProject', zhCn: '关注项目', en: 'Follow Project', @@ -272,7 +272,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_DataTrain', zhCn: '数据训练', en: 'Data Train', @@ -289,7 +289,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_DataForecast', zhCn: '数据预测', en: 'Data Forecast', @@ -1983,7 +1983,7 @@ export const navList = [ name: 'spdmTask', zhCn: '任务管理', en: 'Task Management', - subApps: ['spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_ReportWork'], + subApps: ['spdm_TaskList', 'spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_ReportWork'], meta: { icon: 'ele-Calendar', }, @@ -2142,9 +2142,9 @@ export const navList = [ ]; export const menuList = [ - { - appName: 'spdmTaskList', - }, + // { + // appName: 'spdmTaskList', + // }, { navName: 'spdmProject', }, diff --git a/scripts/package/i18n/en.ts b/scripts/package/i18n/en.ts index fe39222..81044a8 100644 --- a/scripts/package/i18n/en.ts +++ b/scripts/package/i18n/en.ts @@ -12,7 +12,7 @@ export default { tokenLogin: 'Token Login', }, moduleFuncs: { - spdmTaskList: 'Pending Task', + spdm_TaskList: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', spdm_FllowProject: 'Follow Project', @@ -120,7 +120,7 @@ export default { erp_material: 'Material Management', }, moduleApps: { - spdmTaskList: 'Pending Task', + spdm_TaskList: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', spdm_FllowProject: 'Follow Project', @@ -228,7 +228,7 @@ export default { erp_material: 'Material Management', }, moduleRoutes: { - spdmTaskSponsor: 'Pending Task', + spdmTaskSponsor: 'I Initiated', spdmAllProject: 'All Project', spdmChargeProject: 'Charge Project', spdmFllowProject: 'Follow Project', diff --git a/scripts/package/i18n/zh-cn.ts b/scripts/package/i18n/zh-cn.ts index 6db8fb9..789715a 100644 --- a/scripts/package/i18n/zh-cn.ts +++ b/scripts/package/i18n/zh-cn.ts @@ -20,7 +20,7 @@ export default { shutdown: '停止', }, moduleApps: { - spdmTaskList: '新增待办', + spdm_TaskList: '我提出的', spdm_AllProject: '所有项目', spdm_ChargeProject: '负责项目', spdm_FllowProject: '关注项目', @@ -128,7 +128,7 @@ export default { erp_material: '物料管理', }, moduleRoutes: { - spdmTaskSponsor: '新增待办', + spdmTaskSponsor: '我提出的', spdmAllProject: '所有项目', spdmChargeProject: '负责项目', spdmFllowProject: '关注项目', diff --git a/scripts/package/moduleMap.mjs b/scripts/package/moduleMap.mjs index b1f1781..9e65658 100644 --- a/scripts/package/moduleMap.mjs +++ b/scripts/package/moduleMap.mjs @@ -1,5 +1,5 @@ export const appMap = { - spdmTaskList: {"name":"moduleApps.spdmTaskList","zhCn":"新增待办","en":"Pending Task","pages":[{"name":"spdmTaskSponsor","zhCn":"新增待办","en":"Pending Task","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}}]}, + spdm_TaskList: {"name":"moduleApps.spdm_TaskList","zhCn":"我提出的","en":"I Initiated","pages":[{"name":"spdmTaskSponsor","zhCn":"我提出的","en":"I Initiated","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}}]}, spdm_AllProject: {"name":"moduleApps.spdm_AllProject","zhCn":"所有项目","en":"All Project","pages":[{"name":"spdmAllProject","zhCn":"所有项目","en":"All Project","path":"/spdm/project/allProject","meta":{"icon":"ele-MessageBox"}}]}, spdm_ChargeProject: {"name":"moduleApps.spdm_ChargeProject","zhCn":"负责项目","en":"Charge Project","pages":[{"name":"spdmChargeProject","zhCn":"负责项目","en":"Charge Project","path":"/spdm/project/chargeProject","meta":{"icon":"ele-MessageBox"}}]}, spdm_FllowProject: {"name":"moduleApps.spdm_FllowProject","zhCn":"关注项目","en":"Follow Project","pages":[{"name":"spdmFllowProject","zhCn":"关注项目","en":"Follow Project","path":"/spdm/project/followProject","meta":{"icon":"ele-MessageBox"}}]}, @@ -108,7 +108,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_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_ReportWork"],"meta":{"icon":"ele-Calendar"}}, + spdmTask: {"name":"moduleRoutes.spdmTask","zhCn":"任务管理","en":"Task Management","subApps":["spdm_TaskList","spdm_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_ReportWork"],"meta":{"icon":"ele-Calendar"}}, 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_CompetenceCenterKnowledge","spdm_CompetenceCenterParameter","spdm_CompetenceCenterReport","spdm_CompetenceCenterAnimation","spdm_CompetenceCenterRobot","spdm_CompetenceCenterIndustrialDesign","spdm_CompetenceCenterToleranceAnalysis"],"meta":{"icon":"ele-Reading"}}, @@ -129,7 +129,7 @@ export const pageMap = { "name": "moduleRoutes.spdmTaskSponsor", "meta": { "icon": "ele-Warning", - "code": "spdmTaskList_view" + "code": "spdm_TaskList_view" } }, "spdmAllProject": { diff --git a/scripts/package/sql/sys_app.sql b/scripts/package/sql/sys_app.sql index 9f19bce..9358317 100644 --- a/scripts/package/sql/sys_app.sql +++ b/scripts/package/sql/sys_app.sql @@ -8,7 +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 (5247427250, 'spdm_TaskList'); INSERT INTO `sys_app` VALUES (6815254491, 'spdm_AllProject'); INSERT INTO `sys_app` VALUES (4398838303, 'spdm_ChargeProject'); INSERT INTO `sys_app` VALUES (5456162595, 'spdm_FllowProject'); diff --git a/scripts/package/sql/sys_function.sql b/scripts/package/sql/sys_function.sql index d1b825f..1f64921 100644 --- a/scripts/package/sql/sys_function.sql +++ b/scripts/package/sql/sys_function.sql @@ -9,11 +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 (8303192770, 'spdm_TaskList_view', 'spdm_TaskList'); +INSERT INTO `sys_function` VALUES (456863933, 'spdm_TaskList_add', 'spdm_TaskList'); +INSERT INTO `sys_function` VALUES (3667813020, 'spdm_TaskList_edit', 'spdm_TaskList'); +INSERT INTO `sys_function` VALUES (8698394876, 'spdm_TaskList_del', 'spdm_TaskList'); +INSERT INTO `sys_function` VALUES (3524524973, 'spdm_TaskList_export', 'spdm_TaskList'); INSERT INTO `sys_function` VALUES (769444624, 'spdm_AllProject_view', 'spdm_AllProject'); INSERT INTO `sys_function` VALUES (1692924181, 'spdm_AllProject_add', 'spdm_AllProject'); INSERT INTO `sys_function` VALUES (1622842869, 'spdm_AllProject_edit', 'spdm_AllProject'); diff --git a/src/i18n/pages/route/en.ts b/src/i18n/pages/route/en.ts index fe39222..81044a8 100644 --- a/src/i18n/pages/route/en.ts +++ b/src/i18n/pages/route/en.ts @@ -12,7 +12,7 @@ export default { tokenLogin: 'Token Login', }, moduleFuncs: { - spdmTaskList: 'Pending Task', + spdm_TaskList: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', spdm_FllowProject: 'Follow Project', @@ -120,7 +120,7 @@ export default { erp_material: 'Material Management', }, moduleApps: { - spdmTaskList: 'Pending Task', + spdm_TaskList: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', spdm_FllowProject: 'Follow Project', @@ -228,7 +228,7 @@ export default { erp_material: 'Material Management', }, moduleRoutes: { - spdmTaskSponsor: 'Pending Task', + spdmTaskSponsor: 'I Initiated', spdmAllProject: 'All Project', spdmChargeProject: 'Charge Project', spdmFllowProject: 'Follow Project', diff --git a/src/i18n/pages/route/zh-cn.ts b/src/i18n/pages/route/zh-cn.ts index 6db8fb9..789715a 100644 --- a/src/i18n/pages/route/zh-cn.ts +++ b/src/i18n/pages/route/zh-cn.ts @@ -20,7 +20,7 @@ export default { shutdown: '停止', }, moduleApps: { - spdmTaskList: '新增待办', + spdm_TaskList: '我提出的', spdm_AllProject: '所有项目', spdm_ChargeProject: '负责项目', spdm_FllowProject: '关注项目', @@ -128,7 +128,7 @@ export default { erp_material: '物料管理', }, moduleRoutes: { - spdmTaskSponsor: '新增待办', + spdmTaskSponsor: '我提出的', spdmAllProject: '所有项目', spdmChargeProject: '负责项目', spdmFllowProject: '关注项目', diff --git a/src/router/menus.ts b/src/router/menus.ts index 9f36936..a237e84 100644 --- a/src/router/menus.ts +++ b/src/router/menus.ts @@ -7,14 +7,6 @@ export default [ "isKeepAlive": true } }, - { - "name": "moduleApps.spdmTaskList", - "path": "/spdm/task/sponsor", - "meta": { - "icon": "ele-Warning", - "code": "spdmTaskList_view" - } - }, { "name": "moduleRoutes.spdmProject", "path": "spdmProject", @@ -63,6 +55,14 @@ export default [ "icon": "ele-Calendar" }, "children": [ + { + "name": "moduleApps.spdm_TaskList", + "path": "/spdm/task/sponsor", + "meta": { + "icon": "ele-Warning", + "code": "spdm_TaskList_view" + } + }, { "name": "moduleApps.spdm_TaskSend", "path": "/spdm/task/send", diff --git a/src/router/modules.ts b/src/router/modules.ts index bd28cf4..1f4f2a0 100644 --- a/src/router/modules.ts +++ b/src/router/modules.ts @@ -3,7 +3,7 @@ export default [ path: '/spdm/task/sponsor', name: 'moduleRoutes.spdmTaskSponsor', component: () => import('/@/spdm/views/index.vue'), - meta: {"icon":"ele-Warning","code":"spdmTaskList_view"}, + meta: {"icon":"ele-Warning","code":"spdm_TaskList_view"}, }, { path: '/spdm/project/allProject', diff --git a/src/router/powers.ts b/src/router/powers.ts index ba43880..cb97652 100644 --- a/src/router/powers.ts +++ b/src/router/powers.ts @@ -9,7 +9,7 @@ export interface IPowerItem { children: {id: IFunctionId; label: string}[]; } -export const appIds = ["8676203018","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","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 = ["5247427250","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","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[]) => { @@ -20,9 +20,9 @@ export const filterFunctionCodesIsApp = (codeList: string[]) => { export default [ { - 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: '5247427250', + label: 'moduleApps.spdm_TaskList', + children: [{"id":"8303192770","label":"moduleFuncs.view"},{"id":"456863933","label":"moduleFuncs.add"},{"id":"3667813020","label":"moduleFuncs.edit"},{"id":"8698394876","label":"moduleFuncs.del"},{"id":"3524524973","label":"moduleFuncs.export"}], }, { id: '6815254491', diff --git a/src/spdm/config.ts b/src/spdm/config.ts index fbb7d1c..3184711 100644 --- a/src/spdm/config.ts +++ b/src/spdm/config.ts @@ -5,10 +5,10 @@ // export const CODE_ENV = 'production'; // 生产环境 // 测试环境 -// export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 -// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -// export const TENANT_NAME = 'lyric'; // 租户：利元亨 -// export const CODE_ENV = 'test'; // 测试环境 +export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 +export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +export const TENANT_NAME = 'lyric'; // 租户：利元亨 +export const CODE_ENV = 'test'; // 测试环境 // // 利元亨内网环境 // export const SPDM_URL = 'http://192.168.30.147:7115'; // SPDM项目地址 @@ -17,8 +17,8 @@ // export const CODE_ENV = 'lyric-intranet'; // 利元亨内网环境 // // 本地环境 -// export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地） -export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地） -export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -export const TENANT_NAME = 'lyric'; // 租户：利元亨 -export const CODE_ENV = 'local-dev'; // 本地开发环境 +// // export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地） +// export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地） +// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +// export const TENANT_NAME = 'lyric'; // 租户：利元亨 +// export const CODE_ENV = 'local-dev'; // 本地开发环境 diff --git a/src/spdm/function.mjs b/src/spdm/function.mjs index 4d271c4..2f73fe3 100644 --- a/src/spdm/function.mjs +++ b/src/spdm/function.mjs @@ -1,13 +1,13 @@ export const appList = [ { - name: 'spdmTaskList', - zhCn: '新增待办', - en: 'Pending Task', + name: 'spdm_TaskList', + zhCn: '我提出的', + en: 'I Initiated', pages: [ { name: 'spdmTaskSponsor', - zhCn: '新增待办', - en: 'Pending Task', + zhCn: '我提出的', + en: 'I Initiated', path: '/spdm/task/sponsor', component: () => import('/@/spdm/views/index.vue'), meta: { @@ -33,7 +33,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_ChargeProject', zhCn: '负责项目', en: 'Charge Project', @@ -50,7 +50,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_FllowProject', zhCn: '关注项目', en: 'Follow Project', @@ -237,7 +237,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_DataTrain', zhCn: '数据训练', en: 'Data Train', @@ -254,7 +254,7 @@ export const appList = [ }, ], }, - { + { name: 'spdm_DataForecast', zhCn: '数据预测', en: 'Data Forecast', @@ -576,7 +576,7 @@ export const navList = [ name: 'spdmTask', zhCn: '任务管理', en: 'Task Management', - subApps: ['spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_ReportWork'], + subApps: ['spdm_TaskList', 'spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_ReportWork'], meta: { icon: 'ele-Calendar', }, @@ -638,9 +638,9 @@ export const navList = [ ]; export const menuList = [ - { - appName: 'spdmTaskList', - }, + // { + // appName: 'spdmTaskList', + // }, { navName: 'spdmProject', },