From a50049648cec80a085972cd75ad2cf5a511d2b75 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 11 Oct 2022 14:07:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 50 +++++++++++++--------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 53ce6dcb7..7ad907065 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1585,7 +1585,7 @@ export const asyncRouter = [
         ]
     },
     { // 新路由-教学管理菜单
-        path: '/teachingManagement',
+        path: '/info',
         component: Layout,
         meta: {
             i18n: 'newRouter.teachingManagement',
@@ -1593,41 +1593,19 @@ export const asyncRouter = [
         },
         children: [
             { // 班级管理
-                path: 'classroom',
-                component: TeachHome,
+                path: 'organization',
+                component: OrganizationManage,
                 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: PublishExamRule,
-                meta: {
-                    i18n: 'newRouter.exam'
-                }
+                    i18n: 'newRouter.teachingManagement'
+                },
+                children: [
+                    {
+                        path:'classManage',
+                        component: OrgClassManage,
+                        hidden: true
+                    }
+                ]
             }
-
         ]
     },
     { // 新路由-线路设计
@@ -1776,7 +1754,7 @@ export const asyncRouter = [
                 children: [
                     {
                         // 线路类型管理
-                        path: 'companyManage',
+                        path: 'lineTypeManage',
                         component: configLine,
                         meta: {
                             i18n: 'newRouter.lineTypeManage'
@@ -1784,7 +1762,7 @@ export const asyncRouter = [
                     },
                     {
                         // 线路数据管理
-                        path: 'companyManage',
+                        path: 'lineDataManage',
                         component: Temporary,
                         meta: {
                             i18n: 'newRouter.lineDataManage'

From 43ce203058d1b7e6d0db5c7dd7d017c263434aa7 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 11 Oct 2022 15:14:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                      | 2 +-
 src/layout/components/Navbar.vue | 8 ++++----
 src/router/index.js              | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d166edcfa..b255a7351 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -75,7 +75,7 @@ export default {
             this.loading = false;
         },
         '$route': function(val) {
-            if (val.path == '/trainingPlatform/multiplayerSimulation') {
+            if (val.path == '/simulation/multiplayerSimulation') {
                 this.quickEntry();
             }
         }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d760ddf70..35edcfa57 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -42,14 +42,14 @@
           <template v-for="(child,cdx) in item.children">
             <template v-if="!child.hidden">
               <template v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)">
-                <el-submenu :key="cdx" :index="child.path" :show-timeout="100" popper-class="grandChildClass">
+                <el-submenu :key="cdx" :index="item.path+'/'+child.path" :show-timeout="100" :hide-timeout="100" popper-class="grandChildClass">
                   <template slot="title">
                     <span v-if="child.meta" slot="title">{{ $t(child.meta.i18n) }}</span>
                   </template>
                   <template v-for="(grandchild,gdx) in child.children">
                     <template v-if="!grandchild.hidden">
                       <template v-if="!grandchild.children" :to="child.path+'/'+grandchild.path">
-                        <el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (child.path+'/'+grandchild.path)">
+                        <el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path)">
                           <span
                             v-if="grandchild.meta"
                             slot="title"
@@ -57,11 +57,11 @@
                         </el-menu-item>
                       </template>
                       <template v-else :to="child.path+'/'+grandchild.path">
-                        <el-submenu v-for="(mgChild,mgdx) in grandchild.children" :key="mgdx" :index="mgChild.path" :show-timeout="100">
+                        <el-submenu v-for="(mgChild,mgdx) in grandchild.children" :key="mgChild" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path+'/'+mgChild.path)" :show-timeout="100" :hide-timeout="100">
                           <template slot="title">
                             <span v-if="mgChild.meta" slot="title">{{ $t(mgChild.meta.i18n) }}</span>
                           </template>
-                          <el-menu-item :key="mgdx" :index="item.redirect ? item.redirect : (child.path+'/'+grandchild.path + '/' + mgChild.path)">
+                          <el-menu-item :key="mgdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path + '/' + mgChild.path)">
                             <span
                               v-if="mgChild.meta"
                               slot="title"
diff --git a/src/router/index.js b/src/router/index.js
index 7ad907065..eb8ce0d7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1544,7 +1544,7 @@ export const asyncRouter = [
         ]
     },
     { // 新路由-仿真菜单
-        path: '/trainingPlatform',
+        path: '/simulation',
         component: Layout,
         meta: {
             i18n: 'newRouter.simulation',
@@ -1552,7 +1552,7 @@ export const asyncRouter = [
         },
         children: [
             { // 仿真
-                path: '',
+                path: 'simulationIndex',
                 component: TrainingPlatform,
                 // route: { path: '/simulation/trainingPlatform/detail' },
                 meta: {
@@ -1661,7 +1661,7 @@ export const asyncRouter = [
         },
         children: [
             { // 系统数据管理
-                path: '/systemDataManagement',
+                path: 'systemDataManagement',
                 component: TransitionIndex,
                 meta: {
                     i18n: 'newRouter.SystemDataManagement'
@@ -1691,7 +1691,7 @@ export const asyncRouter = [
                 ]
             },
             { // 在线信息管理
-                path: '/OnlineInformationManagement',
+                path: 'OnlineInformationManagement',
                 component: TransitionIndex,
                 meta: {
                     i18n: 'newRouter.OnlineInformationManagement'