diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue index 620ab04d4..306663507 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue @@ -134,18 +134,9 @@ export default { }, '$store.state.training.prdType': function (val) { if (val == '01' && this.centralizedStationList1.length) { - this.switchShowStation(this.centralizedStationList1[0].code); + this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationList1[0].code); } else { - this.switchShowStation(''); - } - }, - '$store.state.training.offsetStationCode': function(code) { - if (code) { - const sectionModel = this.$store.getters['map/getDeviceByCode'](code); - if (sectionModel._type == 'Section' || sectionModel._type == 'Switch' || sectionModel._type == 'Signal') { - const stationModel = this.$store.getters['map/getDeviceByCode'](sectionModel.stationCode); - this.switchShowStation(stationModel.code); - } + this.$store.dispatch('map/setShowCentralizedStationCode', ''); } } }, @@ -176,20 +167,12 @@ export default { this.stationCode = centralizedStationList[0].code; } if (this.$store.state.training.prdType == '01') { - this.switchShowStation(this.stationCode); + this.$store.dispatch('map/setShowCentralizedStationCode', this.stationCode); } }, switchShowStation(stationCode) { this.stationCode = stationCode; - const nameList = Object.keys(this.$store.state.map.map); - let list = []; - nameList.forEach(item => { - if (item !== 'skinVO') { - list = [...list, ...this.$store.state.map.map[item]]; - } - }); - this.$jlmap.updateShowStation(list, stationCode); - this.$jlmap.setCenter(stationCode); + this.$store.dispatch('map/setShowCentralizedStationCode', stationCode); }, undeveloped() { this.doClose(); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue index d75f94528..9ef961d2f 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue @@ -52,51 +52,51 @@ export default { menu: [], menuNormal: { Local: [ - { - label: this.$t('menu.menuStationStand.detainTrain'), - handler: this.setDetainTrain, - cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN - }, - { - label: this.$t('menu.menuStationStand.cancelDetainTrain'), - handler: this.cancelDetainTrain, - cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN - }, - { - label: this.$t('menu.menuStationStand.cancelDetainTrainForce'), - handler: this.cancelDetainTrainForce, - cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN - }, - { - label: this.$t('menu.menuStationStand.jumpStop'), - handler: this.setJumpStop, - cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP - }, - { - label: this.$t('menu.menuStationStand.cancelJumpStop'), - handler: this.cancelJumpStop, - cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP - }, - { - label: this.$t('menu.menuStationStand.setRunLevel'), - handler: this.setRunLevel, - cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME - }, - { - label: this.$t('menu.menuStationStand.setEarlyDeparture'), - handler: this.earlyDeparture, - cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART - }, - { - label: this.$t('menu.menuStationStand.setBackStrategy'), - handler: this.setBackStrategy, - cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY - }, - { - label: this.$t('menu.menuStationStand.getStationStandStatus'), - handler: this.detail, - cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS - } + // { + // label: this.$t('menu.menuStationStand.detainTrain'), + // handler: this.setDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN + // }, + // { + // label: this.$t('menu.menuStationStand.cancelDetainTrain'), + // handler: this.cancelDetainTrain, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN + // }, + // { + // label: this.$t('menu.menuStationStand.cancelDetainTrainForce'), + // handler: this.cancelDetainTrainForce, + // cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN + // }, + // { + // label: this.$t('menu.menuStationStand.jumpStop'), + // handler: this.setJumpStop, + // cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP + // }, + // { + // label: this.$t('menu.menuStationStand.cancelJumpStop'), + // handler: this.cancelJumpStop, + // cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP + // }, + // { + // label: this.$t('menu.menuStationStand.setRunLevel'), + // handler: this.setRunLevel, + // cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME + // }, + // { + // label: this.$t('menu.menuStationStand.setEarlyDeparture'), + // handler: this.earlyDeparture, + // cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART + // }, + // { + // label: this.$t('menu.menuStationStand.setBackStrategy'), + // handler: this.setBackStrategy, + // cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY + // }, + // { + // label: this.$t('menu.menuStationStand.getStationStandStatus'), + // handler: this.detail, + // cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS + // } ], Center: [ // { diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue index ec3c255ac..42ebb5c39 100644 --- a/src/jmapNew/theme/ningbo_01/menus/index.vue +++ b/src/jmapNew/theme/ningbo_01/menus/index.vue @@ -92,6 +92,9 @@ export default {