Merge remote-tracking branch 'remotes/origin/test'
This commit is contained in:
commit
916688b47c
@ -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';
|
||||||
|
@ -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
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user