diff --git a/src/jmapNew/shape/graph/TrainWindow/index.js b/src/jmapNew/shape/graph/TrainWindow/index.js index 637fc59de..f24e66fe4 100644 --- a/src/jmapNew/shape/graph/TrainWindow/index.js +++ b/src/jmapNew/shape/graph/TrainWindow/index.js @@ -78,11 +78,9 @@ class TrainWindow extends Group { } setState(model) { - // if (!this.isShowShape) return; - if (this.model.showMode == '01' || !this.style.TrainWindow.show) { + const path = window.location.href; + if (!path.includes('lineDesign') && (this.model.showMode == '01' || !this.style.TrainWindow.show)) { this.eachChild(item => { item.hide(); }); - // } else if (!store.getters['map/checkDeviceShow'](this._code)) { - // this.trainRect && this.trainRect.hide(); } else if (model._tro) { this.trainRect && this.trainRect.hide(); } else { diff --git a/src/jmapNew/theme/beijing_01/menus/menuBar.vue b/src/jmapNew/theme/beijing_01/menus/menuBar.vue index 02abdec55..ead333d9a 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuBar.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuBar.vue @@ -112,7 +112,7 @@ import HelpAbout from './menuDialog/helpAbout'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import { EventBus } from '@/scripts/event-bus'; import { State2SimulationMap } from '@/scripts/cmdPlugin/Config'; -import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; +// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; export default { name: 'MenuBar', @@ -703,7 +703,7 @@ export default { }, initMenu(menu) { const type = State2SimulationMap[this.$store.state.training.prdType]; - this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); + // this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); if (this.menu[3]) { this.menu[3].children = this.initStationList(); } diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index d0aca68bf..c611edf10 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -244,7 +244,7 @@