From fdc546ef952e3711128b7039680c280c0e6808a4 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 16 Jan 2023 17:34:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=98=AF=E7=AB=99=E9=95=BF=E6=97=A0=E8=96=84=E5=86=8C=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/terminals/terminalMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
index 9540f8648..ce8babc89 100644
--- a/src/views/newMap/display/terminals/terminalMenu.vue
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -83,7 +83,7 @@ export default {
                 {
                     name: '簿册',
                     code: 'registerBook',
-                    roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT'],
+                    roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER'],
                     isShow: () => this.$route.query.simType === 'RAILWAY',
                     click: this.changePictureShow
                 },

From 94620bbe41a3203bd3f60d3d025a81b7215d9dfa Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 16 Jan 2023 17:57:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=95=99=E5=AD=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BD=93=E5=89=8D=E8=B7=AF=E7=94=B1=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 38d4f248b..c4eca2080 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -160,7 +160,9 @@ export default {
     },
     mounted() {
         this.routes = this.$router.options.routes;
-        if (this.$route.fullPath.includes('/trainingPlatform/simulation')) {
+        if (this.$route.fullPath.includes('/teaching/organization')) {
+            this.activePath = '/teaching/organization';
+        } else if (this.$route.fullPath.includes('/trainingPlatform/simulation')) {
             this.activePath = '/simulation/simulationIndex';
         } else if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
             this.activePath = '/design/usermap/home';