update:菜单优化，更换logo

scripts/package/function.mjs

@@ -34,7 +34,7 @@ export const ScopeApp = 'moduleApps';
 export const ScopeRoute = 'moduleRoutes';
 
 export const appList = [
-   {
+  {
     name: 'spdmProject',
     zhCn: '项目管理',
 		en: 'Project Management',
@@ -213,25 +213,35 @@ export const appList = [
     },
     pages: [
       {
-        name: 'spdmSimulationPublicProcess',
+        name: 'spdmSimulationProcess',
-        zhCn: '通用仿真流程库',
+        zhCn: '仿真流程库',
-		    en: 'Public Process Library',
+		    en: 'Process Library',
-        path: '/spdm/simulation/publicProcess',
+        path: '/spdm/simulation/process',
         component: () => import('/@/spdm/views/index.vue'),
         meta: {
           icon: 'ele-FolderChecked',
         },
       },
-      {
+      // {
-        name: 'spdmSimulationMyProcess',
+      //   name: 'spdmSimulationPublicProcess',
-        zhCn: '我的仿真流程库',
+      //   zhCn: '通用仿真流程库',
-		    en: 'My Process Library',
+		  //   en: 'Public Process Library',
-        path: '/spdm/simulation/myProcess',
+      //   path: '/spdm/simulation/publicProcess',
-        component: () => import('/@/spdm/views/index.vue'),
+      //   component: () => import('/@/spdm/views/index.vue'),
-        meta: {
+      //   meta: {
-          icon: 'ele-Folder',
+      //     icon: 'ele-FolderChecked',
-        },
+      //   },
-      },
+      // },
+      // {
+      //   name: 'spdmSimulationMyProcess',
+      //   zhCn: '我的仿真流程库',
+		  //   en: 'My Process Library',
+      //   path: '/spdm/simulation/myProcess',
+      //   component: () => import('/@/spdm/views/index.vue'),
+      //   meta: {
+      //     icon: 'ele-Folder',
+      //   },
+      // },
       // {
       //   name: 'spdmSimulationAppCenter',
       //   zhCn: '应用中心',

scripts/package/i18n/en.ts

@@ -186,8 +186,7 @@ export default {
     spdmDataPermission: 'Data Permission',
     spdmDataTrain: 'Data Training',
     spdmDataForecast: 'Data Prediction',
-    spdmSimulationPublicProcess: 'Public Process Library',
+    spdmSimulationProcess: 'Process Library',
-    spdmSimulationMyProcess: 'My Process Library',
     spdmCompetenceCenterCondition: 'Condition Library',
     spdmCompetenceCenterIndicator: 'Indicator Library',
     spdmCompetenceCenterKnowledge: 'Knowledge Library',

scripts/package/i18n/zh-cn.ts

@@ -113,8 +113,7 @@ export default {
     spdmDataPermission: '数据权限',
     spdmDataTrain: '数据训练',
     spdmDataForecast: '数据预测',
-    spdmSimulationPublicProcess: '通用仿真流程库',
+    spdmSimulationProcess: '仿真流程库',
-    spdmSimulationMyProcess: '我的仿真流程库',
     spdmCompetenceCenterCondition: '仿真工况库',
     spdmCompetenceCenterIndicator: '仿真指标库',
     spdmCompetenceCenterKnowledge: '仿真知识库',

scripts/package/moduleMap.mjs

@@ -2,7 +2,7 @@ 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"}}]},
 	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"}}]},
-	spdmSimulation: {"name":"moduleApps.spdmSimulation","zhCn":"流程管理","en":"Process Management","meta":{"icon":"ele-Finished"},"pages":[{"name":"spdmSimulationPublicProcess","zhCn":"通用仿真流程库","en":"Public Process Library","path":"/spdm/simulation/publicProcess","meta":{"icon":"ele-FolderChecked"}},{"name":"spdmSimulationMyProcess","zhCn":"我的仿真流程库","en":"My Process Library","path":"/spdm/simulation/myProcess","meta":{"icon":"ele-Folder"}}]},
+	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"}}]},
 	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":"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"}}]},
@@ -195,22 +195,14 @@ export const pageMap = {
       "code": "spdmData_view"
     }
   },
-  "spdmSimulationPublicProcess": {
+  "spdmSimulationProcess": {
-    "path": "/spdm/simulation/publicProcess",
+    "path": "/spdm/simulation/process",
-    "name": "moduleRoutes.spdmSimulationPublicProcess",
+    "name": "moduleRoutes.spdmSimulationProcess",
     "meta": {
       "icon": "ele-FolderChecked",
       "code": "spdmSimulation_view"
     }
   },
-  "spdmSimulationMyProcess": {
-    "path": "/spdm/simulation/myProcess",
-    "name": "moduleRoutes.spdmSimulationMyProcess",
-    "meta": {
-      "icon": "ele-Folder",
-      "code": "spdmSimulation_view"
-    }
-  },
   "spdmCompetenceCenterCondition": {
     "path": "/spdm/competenceCenter/condition",
     "name": "moduleRoutes.spdmCompetenceCenterCondition",

src/i18n/pages/route/en.ts

@@ -186,8 +186,7 @@ export default {
     spdmDataPermission: 'Data Permission',
     spdmDataTrain: 'Data Training',
     spdmDataForecast: 'Data Prediction',
-    spdmSimulationPublicProcess: 'Public Process Library',
+    spdmSimulationProcess: 'Process Library',
-    spdmSimulationMyProcess: 'My Process Library',
     spdmCompetenceCenterCondition: 'Condition Library',
     spdmCompetenceCenterIndicator: 'Indicator Library',
     spdmCompetenceCenterKnowledge: 'Knowledge Library',

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

@@ -113,8 +113,7 @@ export default {
     spdmDataPermission: '数据权限',
     spdmDataTrain: '数据训练',
     spdmDataForecast: '数据预测',
-    spdmSimulationPublicProcess: '通用仿真流程库',
+    spdmSimulationProcess: '仿真流程库',
-    spdmSimulationMyProcess: '我的仿真流程库',
     spdmCompetenceCenterCondition: '仿真工况库',
     spdmCompetenceCenterIndicator: '仿真指标库',
     spdmCompetenceCenterKnowledge: '仿真知识库',

src/layout/logo/index.vue

@@ -2,9 +2,10 @@
 	<div class="layout-logo" :class="{'size-mini': !setShowLogo}" @click="onThemeConfigChange">
 		<template v-if="setShowLogo">
 			<!-- <span :style="{color:setFontColor}">{{ systemConfig.globalTitle }}</span> -->
-			<ImageDecoration height="38px" :src="systemConfig.logo">
+			<ImageDecoration height="50px" class="spdm-logo" :src="systemConfig.logo">
 				<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>
 			</ImageDecoration>
 			<!-- <img class="layout-logo-img" :src="systemConfig.logo" alt="" /> -->

src/router/menus.ts

@@ -143,27 +143,19 @@ export default [
   },
   {
     "name": "moduleApps.spdmSimulation",
-    "path": "/spdm/simulation/publicProcess",
+    "path": "/spdm/simulation/process",
     "meta": {
       "icon": "ele-Finished",
       "code": "spdmSimulation_view"
     },
     "children": [
       {
-        "path": "/spdm/simulation/publicProcess",
+        "path": "/spdm/simulation/process",
-        "name": "moduleRoutes.spdmSimulationPublicProcess",
+        "name": "moduleRoutes.spdmSimulationProcess",
         "meta": {
           "icon": "ele-FolderChecked",
           "code": "spdmSimulation_view"
         }
-      },
-      {
-        "path": "/spdm/simulation/myProcess",
-        "name": "moduleRoutes.spdmSimulationMyProcess",
-        "meta": {
-          "icon": "ele-Folder",
-          "code": "spdmSimulation_view"
-        }
       }
     ]
   },

src/router/modules.ts

@@ -78,17 +78,11 @@ export default [
 		meta: {"icon":"ele-Paperclip","code":"spdmData_view"},
 	},
 	{
-		path: '/spdm/simulation/publicProcess',
+		path: '/spdm/simulation/process',
-		name: 'moduleRoutes.spdmSimulationPublicProcess',
+		name: 'moduleRoutes.spdmSimulationProcess',
 		component: () => import('/@/spdm/views/index.vue'),
 		meta: {"icon":"ele-FolderChecked","code":"spdmSimulation_view"},
 	},
-	{
-		path: '/spdm/simulation/myProcess',
-		name: 'moduleRoutes.spdmSimulationMyProcess',
-		component: () => import('/@/spdm/views/index.vue'),
-		meta: {"icon":"ele-Folder","code":"spdmSimulation_view"},
-	},
 	{
 		path: '/spdm/competenceCenter/condition',
 		name: 'moduleRoutes.spdmCompetenceCenterCondition',

src/spdm/function.mjs

@@ -178,25 +178,35 @@ export const appList = [
     },
     pages: [
       {
-        name: 'spdmSimulationPublicProcess',
+        name: 'spdmSimulationProcess',
-        zhCn: '通用仿真流程库',
+        zhCn: '仿真流程库',
-		    en: 'Public Process Library',
+		    en: 'Process Library',
-        path: '/spdm/simulation/publicProcess',
+        path: '/spdm/simulation/process',
         component: () => import('/@/spdm/views/index.vue'),
         meta: {
           icon: 'ele-FolderChecked',
         },
       },
-      {
+      // {
-        name: 'spdmSimulationMyProcess',
+      //   name: 'spdmSimulationPublicProcess',
-        zhCn: '我的仿真流程库',
+      //   zhCn: '通用仿真流程库',
-		    en: 'My Process Library',
+		  //   en: 'Public Process Library',
-        path: '/spdm/simulation/myProcess',
+      //   path: '/spdm/simulation/publicProcess',
-        component: () => import('/@/spdm/views/index.vue'),
+      //   component: () => import('/@/spdm/views/index.vue'),
-        meta: {
+      //   meta: {
-          icon: 'ele-Folder',
+      //     icon: 'ele-FolderChecked',
-        },
+      //   },
-      },
+      // },
+      // {
+      //   name: 'spdmSimulationMyProcess',
+      //   zhCn: '我的仿真流程库',
+		  //   en: 'My Process Library',
+      //   path: '/spdm/simulation/myProcess',
+      //   component: () => import('/@/spdm/views/index.vue'),
+      //   meta: {
+      //     icon: 'ele-Folder',
+      //   },
+      // },
       // {
       //   name: 'spdmSimulationAppCenter',
       //   zhCn: '应用中心',

src/spdm/index.scss

@@ -37,6 +37,12 @@
   }
 }
 
+.spdm-logo {
+  width: 80px !important;
+  padding: 0 10px;
+  background-color: var(--el-color-primary);
+}
+
 // 为了解决子应用定位样式错位
 .el-scrollbar {
   position: static !important;

src/spdm/moduleMap.mjs

@@ -111,6 +111,14 @@ export const pageMap = {
       "code": "spdmData_view"
     }
   },
+  "spdmSimulationProcess": {
+    "path": "/spdm/simulation/process",
+    "name": "moduleRoutes.spdmSimulationProcess",
+    "meta": {
+      "icon": "ele-FolderChecked",
+      "code": "spdmSimulation_view"
+    }
+  },
   "spdmSimulationPublicProcess": {
     "path": "/spdm/simulation/publicProcess",
     "name": "moduleRoutes.spdmSimulationPublicProcess",

src/stores/themeConfig.ts

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