diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 2d55fa2d4..29e026b5f 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -91,22 +91,23 @@ export default { }, computed: { ...mapGetters('map', [ - 'routeList' + 'routeList', + 'stationList' ]), commandId() { return OperationEvent.Command.commandHaerbin.confirm.domId; }, basicParamList() { return this.$store.state.training.prdType === '01' ? [ - { name: '接收控制', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '交出控制', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '强行站控', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true }, - { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true }, - { name: '追踪全开', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '追踪全关', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '关区信号', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '自排全开', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false }, - { name: '自排全关', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false } + { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false }, + { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false }, + { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true }, + // { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true }, + { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, + { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false }, + { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false }, + { name: '自排全开', cmdType: CMD.Section.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false }, + { name: '自排全关', cmdType: CMD.Section.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false } ] : []; }, sectionParamList() { @@ -170,8 +171,8 @@ export default { { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false }, { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false }, { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false }, - { name: '自排全开', cmdType: CMD.Section.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false }, - { name: '自排全关', cmdType: CMD.Section.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false }, + { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false }, + { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false }, { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false } ]; }, @@ -237,16 +238,16 @@ export default { case 'Section': this.handleSectionMenu(); break; - // case 'Station': - // this.handleStationMenu(); - // this.deviceHighLight(this.oldDevice, false); - // this.deviceHighLight(this.selected, true); - // this.oldDevice = this.selected; - // break; + case 'Station': + this.handleStationMenu(); + this.deviceHighLight(this.oldDevice, false); + this.deviceHighLight(this.selected, true); + this.oldDevice = this.selected; + break; } } }).catch((error) => { - this.$refs.noticeInfo.doShow({}, error.message); + this.$refs.noticeInfo.doShow(error.message); }); } else { this.handleBasicMenu(); @@ -295,7 +296,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch((error) => { - this.$refs.noticeInfo.doShow(step, error.message); + this.$refs.noticeInfo.doShow(error.message); }); } }, @@ -406,19 +407,30 @@ export default { const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode); this.tempData.push(station); this.param = { - stationCode: this.$store.state.map.showCentralizedStationCode + stationCode: this.$store.state.map.showCentralizedStationCode, + stationCodes: [this.$store.state.map.showCentralizedStationCode] }; }, handleStationMenu() { this.centralizedStationList = new Array(15).fill({}); - this.stationParamList.forEach((swicth, index) => { - this.centralizedStationList[index] = swicth; + this.stationParamList.forEach((station, index) => { + this.centralizedStationList[index] = station; }); this.tempData = []; this.tempData.push(this.selected); - this.param = { - sectionCode: this.selected.code - }; + + if (this.selected.centralized) { + this.param = { + stationCode: this.selected.code, + stationCodes: [this.selected.code] + }; + } else { + this.stationList.forEach(station => { + if (station.centralized && station.chargeStationCodeList.includes(this.selected.code)) { + this.param = { stationCode: station.code, stationCodes: [station.code] }; + } + }); + } }, handleParam() { if (this.operate == OperationEvent.Signal.cancelTrainRoute.menu.operation || this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) { @@ -450,7 +462,7 @@ export default { } }).catch((error) => { this.doClose(); - this.$refs.noticeInfo.doShow(step, error.message); + this.$refs.noticeInfo.doShow(error.message); }); }, doClose() {