joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/test_dispaly' into test

Browse Source
This commit is contained in:
dong 2023-01-16 17:58:42 +08:00
commit 2bec6887f6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/components/Navbar.vue
View File

@ -160,7 +160,9 @@ export default {
}, },
mounted() { mounted() {
this.routes = this.$router.options.routes; 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'; this.activePath = '/simulation/simulationIndex';
} else if (this.$route.fullPath.indexOf('design/usermap') >= 0) { } else if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
this.activePath = '/design/usermap/home'; this.activePath = '/design/usermap/home';

2
src/views/newMap/display/terminals/terminalMenu.vue
View File

@ -83,7 +83,7 @@ export default {
{ {
name: '簿册', name: '簿册',
code: 'registerBook', code: 'registerBook',
roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT'], roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER'],
isShow: () => this.$route.query.simType === 'RAILWAY', isShow: () => this.$route.query.simType === 'RAILWAY',
click: this.changePictureShow click: this.changePictureShow
}, },