diff --git a/scripts/package/function.mjs b/scripts/package/function.mjs index e520072..5e57f35 100644 --- a/scripts/package/function.mjs +++ b/scripts/package/function.mjs @@ -472,6 +472,16 @@ export const appList = [ icon: 'ele-Link', }, }, + { + name: 'spdmSystemPermission', + zhCn: '权限管理', + en: 'Permission', + path: '/spdm/system/permission', + component: () => import('/@/spdm/views/index.vue'), + meta: { + icon: 'ele-Lock', + }, + }, { name: 'spdmSystemDynamicTable', zhCn: '动态表格', diff --git a/scripts/package/i18n/en.ts b/scripts/package/i18n/en.ts index 7db6735..1de50db 100644 --- a/scripts/package/i18n/en.ts +++ b/scripts/package/i18n/en.ts @@ -200,6 +200,7 @@ export default { spdmSystemStorage: 'Data Storage', spdmSystemDictionary: 'Data Dictionary', spdmSystemLogs: 'Logs', + spdmSystemPermission: 'Permission', spdmSystemDynamicTable: 'Dynamic Table', projectList: 'Project List', projectDetail: 'Project Detail', diff --git a/scripts/package/i18n/zh-cn.ts b/scripts/package/i18n/zh-cn.ts index c34a4fb..bfcfe05 100644 --- a/scripts/package/i18n/zh-cn.ts +++ b/scripts/package/i18n/zh-cn.ts @@ -126,6 +126,7 @@ export default { spdmSystemStorage: '数据存储', spdmSystemDictionary: '数据字典', spdmSystemLogs: '日志管理', + spdmSystemPermission: '权限管理', spdmSystemDynamicTable: '动态表格', projectList: '项目列表', projectDetail: '项目详情', diff --git a/scripts/package/moduleMap.mjs b/scripts/package/moduleMap.mjs index 75e7522..c0b3014 100644 --- a/scripts/package/moduleMap.mjs +++ b/scripts/package/moduleMap.mjs @@ -5,7 +5,7 @@ export const appMap = { 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"}}]}, 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":"spdmCompetenceCenterAnimation","zhCn":"仿真动画库","en":"Animation Library","path":"/spdm/competenceCenter/animation","meta":{"icon":"ele-VideoCamera"}},{"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"}}]}, + 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":"spdmSystemPermission","zhCn":"权限管理","en":"Permission","path":"/spdm/system/permission","meta":{"icon":"ele-Lock"}},{"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"}},{"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"}}]}, @@ -284,6 +284,14 @@ export const pageMap = { "code": "spdmSystem_view" } }, + "spdmSystemPermission": { + "path": "/spdm/system/permission", + "name": "moduleRoutes.spdmSystemPermission", + "meta": { + "icon": "ele-Lock", + "code": "spdmSystem_view" + } + }, "spdmSystemDynamicTable": { "path": "/spdm/system/dynamicTable", "name": "moduleRoutes.spdmSystemDynamicTable", diff --git a/src/i18n/pages/route/en.ts b/src/i18n/pages/route/en.ts index 7db6735..1de50db 100644 --- a/src/i18n/pages/route/en.ts +++ b/src/i18n/pages/route/en.ts @@ -200,6 +200,7 @@ export default { spdmSystemStorage: 'Data Storage', spdmSystemDictionary: 'Data Dictionary', spdmSystemLogs: 'Logs', + spdmSystemPermission: 'Permission', spdmSystemDynamicTable: 'Dynamic Table', projectList: 'Project List', projectDetail: 'Project Detail', diff --git a/src/i18n/pages/route/zh-cn.ts b/src/i18n/pages/route/zh-cn.ts index c34a4fb..bfcfe05 100644 --- a/src/i18n/pages/route/zh-cn.ts +++ b/src/i18n/pages/route/zh-cn.ts @@ -126,6 +126,7 @@ export default { spdmSystemStorage: '数据存储', spdmSystemDictionary: '数据字典', spdmSystemLogs: '日志管理', + spdmSystemPermission: '权限管理', spdmSystemDynamicTable: '动态表格', projectList: '项目列表', projectDetail: '项目详情', diff --git a/src/router/menus.ts b/src/router/menus.ts index c8aaa56..e80598d 100644 --- a/src/router/menus.ts +++ b/src/router/menus.ts @@ -257,6 +257,14 @@ export default [ "code": "spdmSystem_view" } }, + { + "path": "/spdm/system/permission", + "name": "moduleRoutes.spdmSystemPermission", + "meta": { + "icon": "ele-Lock", + "code": "spdmSystem_view" + } + }, { "path": "/spdm/system/dynamicTable", "name": "moduleRoutes.spdmSystemDynamicTable", diff --git a/src/router/modules.ts b/src/router/modules.ts index 38fb27a..99f43a4 100644 --- a/src/router/modules.ts +++ b/src/router/modules.ts @@ -143,6 +143,12 @@ export default [ component: () => import('/@/spdm/views/index.vue'), meta: {"icon":"ele-Link","code":"spdmSystem_view"}, }, + { + path: '/spdm/system/permission', + name: 'moduleRoutes.spdmSystemPermission', + component: () => import('/@/spdm/views/index.vue'), + meta: {"icon":"ele-Lock","code":"spdmSystem_view"}, + }, { path: '/spdm/system/dynamicTable', name: 'moduleRoutes.spdmSystemDynamicTable', diff --git a/src/spdm/function.mjs b/src/spdm/function.mjs index dbf0b37..c9f1b9a 100644 --- a/src/spdm/function.mjs +++ b/src/spdm/function.mjs @@ -437,6 +437,16 @@ export const appList = [ icon: 'ele-Link', }, }, + { + name: 'spdmSystemPermission', + zhCn: '权限管理', + en: 'Permission', + path: '/spdm/system/permission', + component: () => import('/@/spdm/views/index.vue'), + meta: { + icon: 'ele-Lock', + }, + }, { name: 'spdmSystemDynamicTable', zhCn: '动态表格', diff --git a/src/spdm/moduleMap.mjs b/src/spdm/moduleMap.mjs index 8ba9edd..a7c8730 100644 --- a/src/spdm/moduleMap.mjs +++ b/src/spdm/moduleMap.mjs @@ -295,6 +295,14 @@ export const pageMap = { "code": "spdmSystem_view" } }, + "spdmSystemPermission": { + "path": "/spdm/system/permission", + "name": "moduleRoutes.spdmSystemPermission", + "meta": { + "icon": "ele-Lock", + "code": "spdmSystem_view" + } + }, "spdmSystemDynamicTable": { "path": "/spdm/system/dynamicTable", "name": "moduleRoutes.spdmSystemDynamicTable", diff --git a/src/views/login/component/password.vue b/src/views/login/component/password.vue index 6caca98..54605f1 100644 --- a/src/views/login/component/password.vue +++ b/src/views/login/component/password.vue @@ -168,13 +168,16 @@ const onSignIn = async () => { loading.value = true; // 正在登录中 try { Session.clear(); - if (!isPhoneNum(state.ruleForm.username)) { - await useUserInfo().loginTenant(state.ruleForm) - emit('signInSuccess'); // 触发事件 - } else { - await useUserInfo().login(state.ruleForm); // 调用登录方法 - emit('signInSuccess'); // 触发事件 - } + // SPDM CODE 工号走账号密码登录 + await useUserInfo().login(state.ruleForm); // 调用登录方法 + emit('signInSuccess'); // 触发事件 + // if (!isPhoneNum(state.ruleForm.username)) { + // await useUserInfo().loginTenant(state.ruleForm) + // emit('signInSuccess'); // 触发事件 + // } else { + // await useUserInfo().login(state.ruleForm); // 调用登录方法 + // emit('signInSuccess'); // 触发事件 + // } } finally { loading.value = false; // 登录结束 if (verifyImageEnable.value) {