update:菜单调整,token登录优化

This commit is contained in:
2025-12-22 19:15:52 +08:00
parent 62c238a6e1
commit c692b6bcc1
18 changed files with 146 additions and 85 deletions

2
.env
View File

@@ -1,5 +1,5 @@
# 网站主标题 # 网站主标题
VITE_GLOBAL_TITLE= 'SPDM' VITE_GLOBAL_TITLE= '仿真流程与数据管理系统'
# footer # footer
VITE_FOOTER_TITLE= '©2024 honeycom.com' VITE_FOOTER_TITLE= '©2024 honeycom.com'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
public/favicon_2.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -64,8 +64,8 @@ export const appList = [
}, },
{ {
name: 'spdmProjectDashboard', name: 'spdmProjectDashboard',
zhCn: '数据看板', zhCn: '仿真看板',
en: 'Data Dashboard', en: 'Simulation Dashboard',
path: '/spdm/project/dashboard', path: '/spdm/project/dashboard',
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: { meta: {
@@ -224,14 +224,24 @@ export const appList = [
pages: [ pages: [
{ {
name: 'spdmSimulationProcess', name: 'spdmSimulationProcess',
zhCn: '仿真流程', zhCn: '仿真流程',
en: 'Process Library', en: 'Simulation Process',
path: '/spdm/simulation/process', path: '/spdm/simulation/process',
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: { meta: {
icon: 'ele-FolderChecked', icon: 'ele-FolderChecked',
}, },
}, },
{
name: 'spdmSystemApplication',
zhCn: '应用中心',
en: 'Application Center',
path: '/spdm/simulation/application',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Cellphone',
},
},
// { // {
// name: 'spdmSimulationPublicProcess', // name: 'spdmSimulationPublicProcess',
// zhCn: '通用仿真流程库', // zhCn: '通用仿真流程库',
@@ -412,16 +422,6 @@ export const appList = [
// icon: 'ele-School', // icon: 'ele-School',
// }, // },
// }, // },
{
name: 'spdmSystemApplication',
zhCn: '应用管理',
en: 'Application Management',
path: '/spdm/system/application',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Cellphone',
},
},
{ {
name: 'spdmSystemLogs', name: 'spdmSystemLogs',
zhCn: '日志管理', zhCn: '日志管理',

View File

@@ -176,7 +176,7 @@ export default {
moduleRoutes: { moduleRoutes: {
spdmProjectProjectList: 'Project List', spdmProjectProjectList: 'Project List',
spdmProjectDataStatistics: 'Data Statistics', spdmProjectDataStatistics: 'Data Statistics',
spdmProjectDashboard: 'Data Dashboard', spdmProjectDashboard: 'Simulation Dashboard',
spdmTaskSponsor: 'I Initiated', spdmTaskSponsor: 'I Initiated',
spdmTaskConfirm: 'I confirmed', spdmTaskConfirm: 'I confirmed',
spdmTaskExecute: 'I executed', spdmTaskExecute: 'I executed',
@@ -188,14 +188,14 @@ export default {
spdmDataPermission: 'Data Permission', spdmDataPermission: 'Data Permission',
spdmDataTrain: 'Data Training', spdmDataTrain: 'Data Training',
spdmDataForecast: 'Data Prediction', spdmDataForecast: 'Data Prediction',
spdmSimulationProcess: 'Process Library', spdmSimulationProcess: 'Simulation Process',
spdmSystemApplication: 'Application Center',
spdmCompetenceCenterCondition: 'Condition Library', spdmCompetenceCenterCondition: 'Condition Library',
spdmCompetenceCenterIndicator: 'Indicator Library', spdmCompetenceCenterIndicator: 'Indicator Library',
spdmCompetenceCenterKnowledge: 'Knowledge Library', spdmCompetenceCenterKnowledge: 'Knowledge Library',
spdmCompetenceCenterParameter: 'Parameter Library', spdmCompetenceCenterParameter: 'Parameter Library',
spdmSystemStorage: 'Data Storage', spdmSystemStorage: 'Data Storage',
spdmSystemDictionary: 'Data Dictionary', spdmSystemDictionary: 'Data Dictionary',
spdmSystemApplication: 'Application Management',
spdmSystemLogs: 'Logs', spdmSystemLogs: 'Logs',
spdmSystemDynamicTable: 'Dynamic Table', spdmSystemDynamicTable: 'Dynamic Table',
projectList: 'Project List', projectList: 'Project List',

View File

@@ -103,7 +103,7 @@ export default {
moduleRoutes: { moduleRoutes: {
spdmProjectProjectList: '项目列表', spdmProjectProjectList: '项目列表',
spdmProjectDataStatistics: '数据统计', spdmProjectDataStatistics: '数据统计',
spdmProjectDashboard: '数据看板', spdmProjectDashboard: '仿真看板',
spdmTaskSponsor: '新增待办', spdmTaskSponsor: '新增待办',
spdmTaskConfirm: '我确认的', spdmTaskConfirm: '我确认的',
spdmTaskExecute: '我执行的', spdmTaskExecute: '我执行的',
@@ -115,14 +115,14 @@ export default {
spdmDataPermission: '数据权限', spdmDataPermission: '数据权限',
spdmDataTrain: '数据训练', spdmDataTrain: '数据训练',
spdmDataForecast: '数据预测', spdmDataForecast: '数据预测',
spdmSimulationProcess: '仿真流程', spdmSimulationProcess: '仿真流程',
spdmSystemApplication: '应用中心',
spdmCompetenceCenterCondition: '仿真工况库', spdmCompetenceCenterCondition: '仿真工况库',
spdmCompetenceCenterIndicator: '仿真指标库', spdmCompetenceCenterIndicator: '仿真指标库',
spdmCompetenceCenterKnowledge: '仿真知识库', spdmCompetenceCenterKnowledge: '仿真知识库',
spdmCompetenceCenterParameter: '仿真参数库', spdmCompetenceCenterParameter: '仿真参数库',
spdmSystemStorage: '数据存储', spdmSystemStorage: '数据存储',
spdmSystemDictionary: '数据字典', spdmSystemDictionary: '数据字典',
spdmSystemApplication: '应用管理',
spdmSystemLogs: '日志管理', spdmSystemLogs: '日志管理',
spdmSystemDynamicTable: '动态表格', spdmSystemDynamicTable: '动态表格',
projectList: '项目列表', projectList: '项目列表',

View File

@@ -1,10 +1,10 @@
export const appMap = { export const appMap = {
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":"Data Dashboard","path":"/spdm/project/dashboard","meta":{"icon":"ele-DataBoard"}}]}, 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":"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"}}]},
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"}}]}, 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":"Process Library","path":"/spdm/simulation/process","meta":{"icon":"ele-FolderChecked"}}]}, 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"}}]}, 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":"spdmSystemApplication","zhCn":"应用管理","en":"Application Management","path":"/spdm/system/application","meta":{"icon":"ele-Cellphone"}},{"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":"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"}}]}, 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":"taskTransfer","zhCn":"转办任务","en":"Transfer Task","path":"/task/transfer","meta":{"icon":"fa fa-share-square"}},{"name":"taskStarted","zhCn":"发起任务","en":"Started Task","path":"/task/started","meta":{"icon":"fa fa-plane"}},{"name":"taskCc","zhCn":"抄送任务","en":"CC Task","path":"/task/cc","meta":{"icon":"fa fa-arrow-circle-right"}},{"name":"taskCompleted","zhCn":"已完成任务","en":"Completed Task","path":"/task/completed","meta":{"icon":"fa fa-hand-o-right"}}]}, 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":"taskTransfer","zhCn":"转办任务","en":"Transfer Task","path":"/task/transfer","meta":{"icon":"fa fa-share-square"}},{"name":"taskStarted","zhCn":"发起任务","en":"Started Task","path":"/task/started","meta":{"icon":"fa fa-plane"}},{"name":"taskCc","zhCn":"抄送任务","en":"CC Task","path":"/task/cc","meta":{"icon":"fa fa-arrow-circle-right"}},{"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"}}]}, 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"}}]},
@@ -211,6 +211,14 @@ export const pageMap = {
"code": "spdmSimulation_view" "code": "spdmSimulation_view"
} }
}, },
"spdmSystemApplication": {
"path": "/spdm/simulation/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSimulation_view"
}
},
"spdmCompetenceCenterCondition": { "spdmCompetenceCenterCondition": {
"path": "/spdm/competenceCenter/condition", "path": "/spdm/competenceCenter/condition",
"name": "moduleRoutes.spdmCompetenceCenterCondition", "name": "moduleRoutes.spdmCompetenceCenterCondition",
@@ -259,14 +267,6 @@ export const pageMap = {
"code": "spdmSystem_view" "code": "spdmSystem_view"
} }
}, },
"spdmSystemApplication": {
"path": "/spdm/system/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSystem_view"
}
},
"spdmSystemLogs": { "spdmSystemLogs": {
"path": "/spdm/system/logs", "path": "/spdm/system/logs",
"name": "moduleRoutes.spdmSystemLogs", "name": "moduleRoutes.spdmSystemLogs",

View File

@@ -176,7 +176,7 @@ export default {
moduleRoutes: { moduleRoutes: {
spdmProjectProjectList: 'Project List', spdmProjectProjectList: 'Project List',
spdmProjectDataStatistics: 'Data Statistics', spdmProjectDataStatistics: 'Data Statistics',
spdmProjectDashboard: 'Data Dashboard', spdmProjectDashboard: 'Simulation Dashboard',
spdmTaskSponsor: 'I Initiated', spdmTaskSponsor: 'I Initiated',
spdmTaskConfirm: 'I confirmed', spdmTaskConfirm: 'I confirmed',
spdmTaskExecute: 'I executed', spdmTaskExecute: 'I executed',
@@ -188,14 +188,14 @@ export default {
spdmDataPermission: 'Data Permission', spdmDataPermission: 'Data Permission',
spdmDataTrain: 'Data Training', spdmDataTrain: 'Data Training',
spdmDataForecast: 'Data Prediction', spdmDataForecast: 'Data Prediction',
spdmSimulationProcess: 'Process Library', spdmSimulationProcess: 'Simulation Process',
spdmSystemApplication: 'Application Center',
spdmCompetenceCenterCondition: 'Condition Library', spdmCompetenceCenterCondition: 'Condition Library',
spdmCompetenceCenterIndicator: 'Indicator Library', spdmCompetenceCenterIndicator: 'Indicator Library',
spdmCompetenceCenterKnowledge: 'Knowledge Library', spdmCompetenceCenterKnowledge: 'Knowledge Library',
spdmCompetenceCenterParameter: 'Parameter Library', spdmCompetenceCenterParameter: 'Parameter Library',
spdmSystemStorage: 'Data Storage', spdmSystemStorage: 'Data Storage',
spdmSystemDictionary: 'Data Dictionary', spdmSystemDictionary: 'Data Dictionary',
spdmSystemApplication: 'Application Management',
spdmSystemLogs: 'Logs', spdmSystemLogs: 'Logs',
spdmSystemDynamicTable: 'Dynamic Table', spdmSystemDynamicTable: 'Dynamic Table',
projectList: 'Project List', projectList: 'Project List',

View File

@@ -103,7 +103,7 @@ export default {
moduleRoutes: { moduleRoutes: {
spdmProjectProjectList: '项目列表', spdmProjectProjectList: '项目列表',
spdmProjectDataStatistics: '数据统计', spdmProjectDataStatistics: '数据统计',
spdmProjectDashboard: '数据看板', spdmProjectDashboard: '仿真看板',
spdmTaskSponsor: '新增待办', spdmTaskSponsor: '新增待办',
spdmTaskConfirm: '我确认的', spdmTaskConfirm: '我确认的',
spdmTaskExecute: '我执行的', spdmTaskExecute: '我执行的',
@@ -115,14 +115,14 @@ export default {
spdmDataPermission: '数据权限', spdmDataPermission: '数据权限',
spdmDataTrain: '数据训练', spdmDataTrain: '数据训练',
spdmDataForecast: '数据预测', spdmDataForecast: '数据预测',
spdmSimulationProcess: '仿真流程', spdmSimulationProcess: '仿真流程',
spdmSystemApplication: '应用中心',
spdmCompetenceCenterCondition: '仿真工况库', spdmCompetenceCenterCondition: '仿真工况库',
spdmCompetenceCenterIndicator: '仿真指标库', spdmCompetenceCenterIndicator: '仿真指标库',
spdmCompetenceCenterKnowledge: '仿真知识库', spdmCompetenceCenterKnowledge: '仿真知识库',
spdmCompetenceCenterParameter: '仿真参数库', spdmCompetenceCenterParameter: '仿真参数库',
spdmSystemStorage: '数据存储', spdmSystemStorage: '数据存储',
spdmSystemDictionary: '数据字典', spdmSystemDictionary: '数据字典',
spdmSystemApplication: '应用管理',
spdmSystemLogs: '日志管理', spdmSystemLogs: '日志管理',
spdmSystemDynamicTable: '动态表格', spdmSystemDynamicTable: '动态表格',
projectList: '项目列表', projectList: '项目列表',

View File

@@ -2,12 +2,24 @@
<div class="layout-logo" :class="{'size-mini': !setShowLogo}" @click="onThemeConfigChange"> <div class="layout-logo" :class="{'size-mini': !setShowLogo}" @click="onThemeConfigChange">
<template v-if="setShowLogo"> <template v-if="setShowLogo">
<!-- <span :style="{color:setFontColor}">{{ systemConfig.globalTitle }}</span> --> <!-- <span :style="{color:setFontColor}">{{ systemConfig.globalTitle }}</span> -->
<ImageDecoration height="50px" class="spdm-logo" :src="systemConfig.logo"> <div class="spdm-head-logo">
<div class="logo">
<ImageDecoration height="50px" :src="systemConfig.logo">
<template #error>
<ImageDecoration height="38px" src="/@/spdm/assets/spdm_logo.png" />
</template>
</ImageDecoration>
</div>
<div class="main">
<div class="title">SPDM</div>
<div class="name">仿真流程与数据管理系统</div>
</div>
</div>
<!-- <ImageDecoration height="50px" :src="systemConfig.logo">
<template #error> <template #error>
<!-- <ImageDecoration height="38px" src="/@/assets/logo.png" /> --> <ImageDecoration height="38px" src="/@/assets/logo.png" />
<ImageDecoration height="38px" src="/@/spdm/assets/spdm_logo.png" />
</template> </template>
</ImageDecoration> </ImageDecoration> -->
<!-- <img class="layout-logo-img" :src="systemConfig.logo" alt="" /> --> <!-- <img class="layout-logo-img" :src="systemConfig.logo" alt="" /> -->
<i v-show="!themeConfig.isCollapse" class="ml-auto mdi mdi-sort-variant text-4xl" /> <i v-show="!themeConfig.isCollapse" class="ml-auto mdi mdi-sort-variant text-4xl" />
</template> </template>

View File

@@ -4,7 +4,7 @@ import 'nprogress/nprogress.css';
import pinia from '/@/stores/index'; import pinia from '/@/stores/index';
import {useKeepALiveNames} from '/@/stores/keepAliveNames'; import {useKeepALiveNames} from '/@/stores/keepAliveNames';
import {useTagsViewRoutes} from '/@/stores/tagsViewRoutes'; import {useTagsViewRoutes} from '/@/stores/tagsViewRoutes';
import {cidContext, Token} from '/@/utils/storage'; import {cidContext, Local, Session, Token} from '/@/utils/storage';
import {staticRoutes, baseRoutes} from '/@/router/route'; import {staticRoutes, baseRoutes} from '/@/router/route';
import {NextLoading} from '/@/utils/loading'; import {NextLoading} from '/@/utils/loading';
@@ -88,6 +88,10 @@ export function formatTwoStageRoutes(arr: any) {
// 路由加载前 // 路由加载前
router.beforeEach(async (to, from) => { router.beforeEach(async (to, from) => {
if (to.query.dm_access_token) { // SPDM CODE
Session.clear();
Local.clear();
}
NProgress.configure({showSpinner: false}); NProgress.configure({showSpinner: false});
// 判断是否已经存在标签,不存在则设置缓存 // 判断是否已经存在标签,不存在则设置缓存
if (!storesTagsViewRoutes.keepAliveNames.includes(decodeURIComponent(to.href))) { if (!storesTagsViewRoutes.keepAliveNames.includes(decodeURIComponent(to.href))) {

View File

@@ -164,6 +164,14 @@ export default [
"icon": "ele-FolderChecked", "icon": "ele-FolderChecked",
"code": "spdmSimulation_view" "code": "spdmSimulation_view"
} }
},
{
"path": "/spdm/simulation/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSimulation_view"
}
} }
] ]
}, },
@@ -233,14 +241,6 @@ export default [
"code": "spdmSystem_view" "code": "spdmSystem_view"
} }
}, },
{
"path": "/spdm/system/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSystem_view"
}
},
{ {
"path": "/spdm/system/logs", "path": "/spdm/system/logs",
"name": "moduleRoutes.spdmSystemLogs", "name": "moduleRoutes.spdmSystemLogs",

View File

@@ -89,6 +89,12 @@ export default [
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-FolderChecked","code":"spdmSimulation_view"}, meta: {"icon":"ele-FolderChecked","code":"spdmSimulation_view"},
}, },
{
path: '/spdm/simulation/application',
name: 'moduleRoutes.spdmSystemApplication',
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-Cellphone","code":"spdmSimulation_view"},
},
{ {
path: '/spdm/competenceCenter/condition', path: '/spdm/competenceCenter/condition',
name: 'moduleRoutes.spdmCompetenceCenterCondition', name: 'moduleRoutes.spdmCompetenceCenterCondition',
@@ -125,12 +131,6 @@ export default [
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-Collection","code":"spdmSystem_view"}, meta: {"icon":"ele-Collection","code":"spdmSystem_view"},
}, },
{
path: '/spdm/system/application',
name: 'moduleRoutes.spdmSystemApplication',
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-Cellphone","code":"spdmSystem_view"},
},
{ {
path: '/spdm/system/logs', path: '/spdm/system/logs',
name: 'moduleRoutes.spdmSystemLogs', name: 'moduleRoutes.spdmSystemLogs',

View File

@@ -29,8 +29,8 @@ export const appList = [
}, },
{ {
name: 'spdmProjectDashboard', name: 'spdmProjectDashboard',
zhCn: '数据看板', zhCn: '仿真看板',
en: 'Data Dashboard', en: 'Simulation Dashboard',
path: '/spdm/project/dashboard', path: '/spdm/project/dashboard',
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: { meta: {
@@ -189,14 +189,24 @@ export const appList = [
pages: [ pages: [
{ {
name: 'spdmSimulationProcess', name: 'spdmSimulationProcess',
zhCn: '仿真流程', zhCn: '仿真流程',
en: 'Process Library', en: 'Simulation Process',
path: '/spdm/simulation/process', path: '/spdm/simulation/process',
component: () => import('/@/spdm/views/index.vue'), component: () => import('/@/spdm/views/index.vue'),
meta: { meta: {
icon: 'ele-FolderChecked', icon: 'ele-FolderChecked',
}, },
}, },
{
name: 'spdmSystemApplication',
zhCn: '应用中心',
en: 'Application Center',
path: '/spdm/simulation/application',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Cellphone',
},
},
// { // {
// name: 'spdmSimulationPublicProcess', // name: 'spdmSimulationPublicProcess',
// zhCn: '通用仿真流程库', // zhCn: '通用仿真流程库',
@@ -377,16 +387,6 @@ export const appList = [
// icon: 'ele-School', // icon: 'ele-School',
// }, // },
// }, // },
{
name: 'spdmSystemApplication',
zhCn: '应用管理',
en: 'Application Management',
path: '/spdm/system/application',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Cellphone',
},
},
{ {
name: 'spdmSystemLogs', name: 'spdmSystemLogs',
zhCn: '日志管理', zhCn: '日志管理',

View File

@@ -37,10 +37,51 @@
} }
} }
.spdm-logo { .spdm-head-logo {
width: 80px !important; width: 100%;
padding: 0 10px; height: 100%;
background-color: var(--el-color-primary); display: flex;
align-items: center;
justify-content: space-between;
.logo {
width: 40px;
height: 40px;
.el-image {
width: 100% !important;
height: 100% !important;
}
}
.main {
flex: 1;
width: 100%;
.title {
font-size: 18px;
color: var(--el-color-primary);
font-weight: bold;
margin-bottom: 2px;
}
.name {
font-size: 12px;
color: var(--el-text-color-primary);
}
}
}
.spdm-login-logo {
display: flex;
align-items: center;
.logo {
width: 50px;
height: 50px;
margin-right: 5px;
border-radius: 50%;
overflow: hidden;
}
.title {
font-weight: bold;
font-size: 30px;
color: var(--el-text-color-primary);
}
} }
// 为了解决子应用定位样式错位 // 为了解决子应用定位样式错位

View File

@@ -127,6 +127,14 @@ export const pageMap = {
"code": "spdmSimulation_view" "code": "spdmSimulation_view"
} }
}, },
"spdmSystemApplication": {
"path": "/spdm/simulation/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSimulation_view"
}
},
"spdmSimulationPublicProcess": { "spdmSimulationPublicProcess": {
"path": "/spdm/simulation/publicProcess", "path": "/spdm/simulation/publicProcess",
"name": "moduleRoutes.spdmSimulationPublicProcess", "name": "moduleRoutes.spdmSimulationPublicProcess",
@@ -255,14 +263,6 @@ export const pageMap = {
"code": "spdmSystem_view" "code": "spdmSystem_view"
} }
}, },
"spdmSystemApplication": {
"path": "/spdm/system/application",
"name": "moduleRoutes.spdmSystemApplication",
"meta": {
"icon": "ele-Cellphone",
"code": "spdmSystem_view"
}
},
"spdmSystemLogs": { "spdmSystemLogs": {
"path": "/spdm/system/logs", "path": "/spdm/system/logs",
"name": "moduleRoutes.spdmSystemLogs", "name": "moduleRoutes.spdmSystemLogs",

View File

@@ -1,5 +1,5 @@
// import logo from '/@/assets/logo.png'; // import logo from '/@/assets/logo.png';
import logo from '/@/spdm/assets/spdm_logo.png'; // SPDM CODE import logo from '/@/assets/spdm-logo-mini.jpg'; // SPDM CODE
import logoMini from '/@/assets/spdm-logo-mini.jpg'; // SPDM CODE import logoMini from '/@/assets/spdm-logo-mini.jpg'; // SPDM CODE
import {Local} from '/@/utils/storage'; import {Local} from '/@/utils/storage';
import {mergeWith} from 'lodash'; import {mergeWith} from 'lodash';

View File

@@ -19,7 +19,11 @@
<div class="login-box"> <div class="login-box">
<div class="login-form"> <div class="login-form">
<div class="mb-3 text-left"> <div class="mb-3 text-left">
<img class="h-20" :src="systemConfig.logo" alt="" /> <div class="spdm-login-logo">
<img class="logo" :src="systemConfig.logo" alt="" />
<div class="title">仿真流程与数据管理系统</div>
</div>
<!-- <img class="h-20" :src="systemConfig.logo" alt="" /> -->
<div class="mt-6 text-xl font-medium">Welcome back!</div> <div class="mt-6 text-xl font-medium">Welcome back!</div>
<!-- <div class="my-4 text-lg hidden md:block">{{ systemConfig.globalTitle }}</div> --> <!-- <div class="my-4 text-lg hidden md:block">{{ systemConfig.globalTitle }}</div> -->
</div> </div>