diff --git a/src/App.vue b/src/App.vue
index fda7b5c5b..d166edcfa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,6 +2,8 @@
+
+
+
@@ -41,13 +42,13 @@
-
+
{{ $t(child.meta.i18n) }}
-
+
{{ $t(grandchild.meta.i18n) }}
+
+
+
+ {{ $t(mgChild.meta.i18n) }}
+
+
+ {{ $t(mgChild.meta.i18n) }}
+
+
+
+
{{ $t(child.meta.i18n) }}
@@ -70,7 +85,7 @@
-
+
@@ -171,9 +186,10 @@ export default {
$height: 61px;
.rightGroup{
- position: absolute;
- right: 35px;
+ // position: absolute;
+ // right: 35px;
display: inline-block;
+ padding: 0 35px;
}
.navbar {
@@ -181,7 +197,11 @@ export default {
line-height: $height;
padding-left: 30px;
border-radius: 0px !important;
-
+ display: flex;
+ .centerNullMenu {
+ display: flex;
+ flex: 1;
+ }
.image-container {
line-height: $height;
height: $height;
@@ -214,4 +234,7 @@ export default {
margin-right:20px;
font-size:14px;
}
+ /deep/ .grandChildClass {
+ left: -210px !important;
+ }
diff --git a/src/router/index.js b/src/router/index.js
index b1b496717..85a93a3c2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -217,6 +217,9 @@ const IscsDeviceManage = () => import('@/views/system/iscsDeviceManage');
const IscsResourcesManage = () => import('@/views/system/iscsResourcesManage');
const PisScreen = () => import('@/views/pis/index');
+const Case = () => import('@/views/case/index');
+const TransitionIndex = () => import('@/views/temporary/transitionIndex');
+const Temporary = () => import('@/views/temporary/index');
// import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
// import { getSessionStorage } from '@/utils/auth';
@@ -1539,6 +1542,214 @@ export const asyncRouter = [
hidden: true
}
]
+ },
+ { // 新路由-仿真菜单
+ path: '/trainingPlatform',
+ component: Layout,
+ meta: {
+ i18n: 'newRouter.simulation',
+ roles: [admin, user, userTrainingPlatform]
+ },
+ children: [
+ {
+ path: '',
+ component: TrainingPlatform,
+ // route: { path: '/simulation/trainingPlatform/detail' },
+ meta: {
+ i18n: 'newRouter.simulation'
+ },
+ children: [
+ {
+ path: 'detail/:subSystem',
+ component: DemonstrationDetail,
+ meta: {},
+ hidden: true
+ }
+ ]
+ },
+ {
+ path: 'multiplayerSimulation',
+ // component: multiplayerSimulation,
+ meta: {
+ i18n: 'newRouter.multiplayerSimulation'
+ }
+ },
+ {
+ path: 'regulationSimulation',
+ component: Temporary,
+ meta: {
+ i18n: 'newRouter.regulationSimulation'
+ }
+ }
+
+ ]
+ },
+ { // 新路由-教学管理菜单
+ path: '/teachingManagement',
+ component: Layout,
+ meta: {
+ i18n: 'newRouter.teachingManagement',
+ roles: [admin, user, userTrainingPlatform]
+ },
+ children: [
+ {
+ path: 'classroom',
+ // component: Classroom,
+ meta: {
+ i18n: 'newRouter.classroom'
+ }
+ },
+ {
+ path: 'student',
+ // component: Student,
+ meta: {
+ i18n: 'newRouter.student'
+ }
+ },
+ {
+ path: 'theory',
+ // component: Theory,
+ meta: {
+ i18n: 'newRouter.theory'
+ }
+ },
+ {
+ path: 'training',
+ // component: Training,
+ meta: {
+ i18n: 'newRouter.training'
+ }
+ },
+ {
+ path: 'exam',
+ // component: Exam,
+ meta: {
+ i18n: 'newRouter.exam'
+ }
+ }
+
+ ]
+ },
+ { // 新路由-线路设计
+ path: '/design',
+ component: Layout,
+ meta: {
+ i18n: 'newRouter.lineDesign',
+ roles: [admin, user, userTrainingPlatform]
+ },
+ children: [
+ {
+ path: 'usermap',
+ redirect: '/design/usermap/home',
+ component: NewDesignPlatformUser,
+ meta: {
+ i18n: 'newRouter.lineDesign'
+ },
+ children: [
+ {
+ path: 'home',
+ component: DesignPlatformHome,
+ hidden: true,
+ meta: {
+ }
+ }
+ ]
+ }
+ ]
+ },
+ { // 新路由-案例
+ path: '/case',
+ component: Layout,
+ meta: {
+ i18n: 'newRouter.case',
+ roles: [admin, user, userTrainingPlatform]
+ },
+ children: [
+ {
+ path: 'index',
+ component: Case,
+ meta: {
+ i18n: 'newRouter.case'
+ }
+ }
+ ]
+ },
+ { // 新路由-系统管理
+ path: '/system',
+ component: Layout,
+ meta: {
+ i18n: 'newRouter.SystemManagement',
+ roles: [admin, userTrainingPlatform]
+ },
+ children: [
+ {
+ path: '/systemDataManagement',
+ component: TransitionIndex,
+ meta: {
+ i18n: 'newRouter.SystemDataManagement'
+ },
+ children: [
+ {
+ path: 'dictionary',
+ component: Dictionary,
+ meta: {
+ i18n: 'newRouter.dataDictionary'
+ }
+ },
+ {
+ path: 'userManage',
+ component: UserControl,
+ meta: {
+ i18n: 'newRouter.SystemAccountManagement'
+ }
+ },
+ {
+ path: 'ThirdPartyAccounts',
+ component: Temporary,
+ meta: {
+ i18n: 'newRouter.ThirdPartyAccounts'
+ }
+ }
+ ]
+ },
+ {
+ path: '/OnlineInformationManagement',
+ component: TransitionIndex,
+ meta: {
+ i18n: 'newRouter.OnlineInformationManagement'
+ },
+ children: [
+ {
+ path: 'loginUserManage',
+ component: LoginUserControl,
+ meta: {
+ i18n: 'newRouter.loginUser'
+ }
+ },
+ {
+ path: 'CacheControl',
+ component: CacheControl,
+ meta: {
+ i18n: 'newRouter.cacheDataManage'
+ }
+ },
+ {
+ path: 'existingSimulation',
+ component: ExistingSimulation,
+ meta: {
+ i18n: 'newRouter.simulationManage'
+ }
+ }
+ ]
+ },
+ {
+ path: 'companyUserManage',
+ component: DeviceManage,
+ meta: {
+ i18n: 'newRouter.companyUserManage'
+ }
+ }
+ ]
}
];
/* merge 是否再路由处理中与asyncRouter进行合并 mergeIndex合并进入asyncRouter【mergeIndex】 慎重调整asyncRouter顺序 */
diff --git a/src/views/case/index.vue b/src/views/case/index.vue
new file mode 100644
index 000000000..b4fa5a18b
--- /dev/null
+++ b/src/views/case/index.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
diff --git a/src/views/temporary/index.vue b/src/views/temporary/index.vue
new file mode 100644
index 000000000..8d79746d6
--- /dev/null
+++ b/src/views/temporary/index.vue
@@ -0,0 +1,22 @@
+
+
+ 功能实现中......
+
+
+
+
diff --git a/src/views/temporary/transitionIndex.vue b/src/views/temporary/transitionIndex.vue
new file mode 100644
index 000000000..d3cc9f052
--- /dev/null
+++ b/src/views/temporary/transitionIndex.vue
@@ -0,0 +1,12 @@
+
+
+
+