diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index 9eb645ca3..dfe61ed1b 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -400,4 +400,8 @@ export default class Train extends Group { this.isShowShape = false; } } + screenShow() { + // this.text && this.text.hide(); + this.setState(this.model); + } } diff --git a/src/router/index_HYD.js b/src/router/index_HYD.js index 463694274..89fef869f 100644 --- a/src/router/index_HYD.js +++ b/src/router/index_HYD.js @@ -371,7 +371,6 @@ export const asyncRouter = [ path: 'mapPreview/:mapId', component: MapPreview, hidden: true - }, { // 新版地图预览 path: 'mapPreviewNew/:mapId', diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue index e263e57e8..422ef959b 100644 --- a/src/views/iscs/iscsSystem/groupNav.vue +++ b/src/views/iscs/iscsSystem/groupNav.vue @@ -306,6 +306,9 @@ export default { } }); } + if (!this.$route.params.mode) { + this.selectChildren(this.navList[0].children[0], 0); + } }, mounted() { window.onbeforeunload = this.clearSubscribe; @@ -362,7 +365,7 @@ export default { } } }, - selectChildren(item, index) { // 选择子菜单 + selectChildren(item, index) { // 选择菜单 this.selectChildIndex = index; this.type = item.type; const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group }; diff --git a/src/views/iscs/iscsSystem/nav.vue b/src/views/iscs/iscsSystem/nav.vue index 8d5bd426f..84e28a1fc 100644 --- a/src/views/iscs/iscsSystem/nav.vue +++ b/src/views/iscs/iscsSystem/nav.vue @@ -303,6 +303,11 @@ export default { }; }, watch: {}, + created() { + if (!this.$route.params.mode) { + this.selectChildren(this.navList[0].children[0], 0); + } + }, mounted() { this.navList.forEach((nav, navIndex)=>{ if (nav.children && nav.children.length > 0) { @@ -333,7 +338,7 @@ export default { } } }, - selectChildren(item, index) { // 选择子菜单 + selectChildren(item, index) { // 选择菜单 this.selectChildIndex = index; this.type = item.type; this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } }); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 467d7af69..8b0f2fd83 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -406,6 +406,7 @@ export default { } }, async getUserRole() { + console.log("getUserRole"); const res = await getSimulationUserInfo(this.group); const data = res.data || {}; this.userRole = data.type || 'AUDIENCE'; @@ -468,6 +469,7 @@ export default { }, // 设置prdType和role setSimulationPrdType(swch) { + console.log("setSimulationPrdType"); // Admin 管理员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘 switch (this.userRole) { // case 'ADMIN': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'ADMIN'); this.hideIbp(); break; @@ -578,7 +580,8 @@ export default { hideIbp() { Message.closeAll(); - this.drivingShow = false; + console.log("hideIbp"); + // this.drivingShow = false; this.panelShow = true; this.ibpShow = false; if (this.$refs && this.$refs.ibpPlate) {