diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 174999e02..34f98aaed 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -476,49 +476,49 @@ class SkinCode extends defaultStyle { offset: { x: 0, y: 0 }, text: '分散自律', lightColor: '#0f0', - defaultColor: '#ccc' + defaultColor: '#7F7F7F' }, graphRoad: { show: true, offset: { x: 0, y: 0 }, text: '按图排路', - lightColor: '#0f0', - defaultColor: '#ccc' + lightColor: '#ff0', + defaultColor: '#0f0' }, planControl: { show: true, offset: { x: 0, y: 0 }, text: '计划控制', lightColor: '#0f0', - defaultColor: '#ccc' + defaultColor: '#7F7F7F' }, centerCommunication: { show: true, offset: { x: 0, y: 30 }, text: '中心通信', - lightColor: '#0f0', - defaultColor: '#ccc' + lightColor: '#FF0000', + defaultColor: '#0f0' }, selfDisciplineCommunication: { show: true, offset: { x: 0, y: 30 }, text: '自律机通信', - lightColor: '#0f0', - defaultColor: '#ccc' + lightColor: '#7F7F7F', + defaultColor: '#0f0' }, allowedTurnBack: { show: true, offset: { x: 0, y: 30 }, text: '允许转回', - lightColor: '#0f0', - defaultColor: '#ccc' + lightColor: '#ff0', + defaultColor: '#7F7F7F' }, trainControl: { show: true, offset: { x: 0, y: 30 }, text: '列控', - lightColor: '#0f0', - defaultColor: '#ccc' + lightColor: '#ff0', + defaultColor: '#0f0' } } }; diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 3bfc9d237..17c0e364c 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -165,7 +165,11 @@ export default class Station extends Group { const queryCtc = queryList.find(item => { return item.includes('ctc'); }); - if (queryCtc && model.createControlMode) { + const queryCtcLineCode = queryList.find(item => { + return item.includes('lineCode=16'); + }); + const pic = store.state.map.picture; + if ((queryCtc && model.createControlMode) || (pic == 'trafficTerminal' && queryCtcLineCode)) { this.createCtcControlMode(); } else if (this.style.Station.StationControl.special) { if (model.visible && model.createControlMode) { // model.createControlMode 控制模式 @@ -850,7 +854,7 @@ export default class Station extends Group { // } } - handleLocal() { // 站控 + handleLocal(model) { // 站控 this.noneBeforeMode = 'Local'; this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor); @@ -859,7 +863,23 @@ export default class Station extends Group { this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.stationControlCC && this.stationControlCC.setStyle({text:'LC', textFill:this.style.Station.StationControl.text.stationControlColor}); this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.lightColor); - this.selfDisciplineThree && this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.lightColor, 3); + // this.selfDisciplineThree && this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.lightColor, 3); + if (this.selfDisciplineThree) { + const arr = ['', 'Center', 'Station', 'Station_Shunt']; + let index = arr.findIndex(item => { + return model.operationMode == item; + }); + if (index < 1) { + index = 1; + } + this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.lightColor, index); + } + if (this.graphRoad && model.routeSetMode == 'Manual_Set_Route') { + this.graphRoad.setColor(this.style.Station.StationControl.graphRoad.lightColor); + } + if (this.planControl && model.planControl) { + this.planControl.setColor(this.style.Station.StationControl.planControl.lightColor); + } // if (this.style.Station.StationControl.disPlayNone) { // this.stationText && this.stationText.setStyle('textFill', '#fff'); // if (this.model.subheadDisplay) { // 副标题 @@ -938,7 +958,17 @@ export default class Station extends Group { this.selfDiscipline && this.selfDiscipline.setColor(this.style.Station.StationControl.selfDiscipline.defaultColor); this.selfDisciplineControl && this.selfDisciplineControl.setColor(this.style.Station.StationControl.selfDisciplineControl.defaultColor); this.veryControlButton && this.veryControlButton.setStyle({ fill: this.style.Station.StationControl.veryControlButton.defaultColor }); - this.selfDisciplineThree && this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.defaultColor, 3); + this.centerCommunication && this.centerCommunication.setColor(this.style.Station.StationControl.centerCommunication.defaultColor); + this.graphRoad && this.graphRoad.setColor(this.style.Station.StationControl.graphRoad.defaultColor); + this.planControl && this.planControl.setColor(this.style.Station.StationControl.planControl.defaultColor); + this.trainControl && this.trainControl.setColor(this.style.Station.StationControl.trainControl.defaultColor); + this.allowedTurnBack && this.allowedTurnBack.setColor(this.style.Station.StationControl.allowedTurnBack.defaultColor); + this.selfDisciplineCommunication && this.selfDisciplineCommunication.setColor(this.style.Station.StationControl.selfDisciplineCommunication.defaultColor); + if (this.selfDisciplineThree) { + this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.defaultColor, 1); + this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.defaultColor, 2); + this.selfDisciplineThree.setColor(this.style.Station.StationControl.selfDisciplineThree.defaultColor, 3); + } if (this.style.Station.stationText.isSpecialType) { this.stationText.setColor(this.style.Station.stationText.noneModeColor); this.stationText.setBackground(this.style.Station.stationText.defaultBackColor); @@ -972,12 +1002,12 @@ export default class Station extends Group { this.eachChild(item => { item.hide(); }); } else { store.getters['map/checkStationGuideMaster'](this._code, model.sguideMasterLock, model.xguideMasterLock); - model.controlMode && this['handle' + model.controlMode](); + model.controlMode && this['handle' + model.controlMode](model); model.preResetValidDuration && this.handlePreResetLamp(); model.controller && this.handleComplexControl(model.controller); model.emergencyController != undefined && this.handleEmergencyChange(model.emergencyController); model.controlApplicant && this.handleControlApplicant(model); - model.allowAutonomy && this.handleAllowAutonomy(); + model.allowAutonomy && this.handleAllowAutonomy(model); this.handleGuideLock(model); if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller || model.emergencyController != undefined) && model.centralized) { model.chargeStationCodeList.forEach(item => { diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index e9686ae9c..a042d87c0 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -137,15 +137,15 @@ export default class Train extends Group { if (style.Section.trainPosition.display) { const data = this.model.physicalCode; const oldmodel = store.getters['map/getDeviceByCode'](data); - const leftPoint = oldmodel.points[0]; - const rightPoint = oldmodel.points[oldmodel.points.length - 1]; + const leftPoint = oldmodel.instance.computedPoints[0]; + const rightPoint = oldmodel.instance.computedPoints[oldmodel.instance.computedPoints.length - 1]; this.startX = this.model.right == 1 ? leftPoint.x : rightPoint.x; this.startY = this.model.right == 1 ? leftPoint.y : rightPoint.y; // 算出折线的长度 this.lineLength = 0; let oldPoint = null; this.pointList = []; - oldmodel.points.forEach((point) => { + oldmodel.instance.computedPoints.forEach((point) => { if (oldPoint) { const temp = Math.sqrt( Math.pow(point.x - oldPoint.x, 2) + diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue index 88a020e40..f81a1e719 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue @@ -101,11 +101,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -319,9 +314,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, cancelSpeed() { let sectionCode = this.selected.code; if (this.selected.type == '02' || this.selected.type == '03') { diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue index 737799077..053cbf4d7 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue @@ -117,11 +117,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -460,9 +455,6 @@ export default { }).catch(() => { this.$refs.noticeInfo.doShow(operate); }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuStation.vue b/src/jmapNew/theme/beijing_01/menus/menuStation.vue index 7c121a37d..7835aedee 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStation.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStation.vue @@ -114,11 +114,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -290,9 +285,6 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue index 3d1b00058..fe40addfb 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue @@ -141,11 +141,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -325,9 +320,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue index 7b6c2e497..1b6f517e4 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue @@ -90,11 +90,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -305,9 +300,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue index 9e4a6d29c..bc33c5079 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue @@ -220,10 +220,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -374,9 +370,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 30aa378a7..af230d5b0 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -87,11 +87,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -285,9 +280,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 2272f6f44..03f9ea685 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -209,11 +209,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -473,9 +468,6 @@ export default { createDeviceLabel() { this.doClose(); this.$refs.createDeviceLabel.doShow(); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue index 1b63d6e2c..0d733d1f2 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue @@ -126,11 +126,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -377,9 +372,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue index 596d3d260..0448cc45f 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue @@ -95,11 +95,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -237,9 +232,6 @@ export default { }).catch(() => { this.$refs.noticeInfo.doShow(); }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index f484f8283..f9d15ffc0 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -113,11 +113,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -285,9 +280,6 @@ export default { }, createDeviceLabel() { this.$refs.createDeviceLabel.doShow(); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue index 1476dda68..6ec4d1da9 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue @@ -142,10 +142,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -293,9 +289,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue index 426490735..4b7cadb11 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue @@ -81,11 +81,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -227,9 +222,6 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue index 27896bbc3..fb111ac3d 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue @@ -179,11 +179,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -371,9 +366,6 @@ export default { } } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue index 5763bf8e7..ee41c5571 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue @@ -59,11 +59,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -140,9 +135,6 @@ export default { console.error('该车站无zc设备'); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue index 08397f540..26ec057c2 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue @@ -107,11 +107,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -231,9 +226,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue index af199b865..919f4c840 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue @@ -120,11 +120,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -273,9 +268,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue index f1cbb9119..8a85e5ae6 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue @@ -143,10 +143,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -287,9 +283,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index 289f082d6..8d51be242 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -33,7 +33,7 @@ - + - + @@ -158,7 +158,7 @@ export default { }, methods: { doShow(operate, selected) { - this.$root.$emit('dialogOpen', selected); + this.$root.$emit('dialogOpen', selected); this.selected = selected; if (!this.dialogShow) { this.switchName = ''; @@ -198,7 +198,7 @@ export default { doClose() { this.loading = false; this.dialogShow = false; - this.$root.$emit('dialogClose', this.selected); + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); mouseCancelState(this.selected); }, diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue b/src/jmapNew/theme/components/menus/dialog/trainOperation.vue similarity index 100% rename from src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainOperation.vue rename to src/jmapNew/theme/components/menus/dialog/trainOperation.vue diff --git a/src/jmapNew/theme/components/menus/menuTrain.vue b/src/jmapNew/theme/components/menus/menuTrain.vue index ac559ac93..6d9980f72 100644 --- a/src/jmapNew/theme/components/menus/menuTrain.vue +++ b/src/jmapNew/theme/components/menus/menuTrain.vue @@ -2,18 +2,24 @@
+ +
diff --git a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue index 983d64619..a38b1d4c9 100644 --- a/src/jmapNew/theme/datie_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_01/menus/menuSwitch.vue @@ -112,11 +112,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -266,9 +261,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_01/menus/menuTrain.vue b/src/jmapNew/theme/datie_01/menus/menuTrain.vue index 0856bdfe3..e66d16215 100644 --- a/src/jmapNew/theme/datie_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_01/menus/menuTrain.vue @@ -27,7 +27,6 @@ import TrainDetailInfo from './dialog/trainDetailInfo'; import CancelMouseState from '@/mixin/CancelMouseState'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; -// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; export default { @@ -116,10 +115,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -214,9 +209,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue index 2d8d59316..7d8b73d35 100644 --- a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue @@ -33,7 +33,7 @@
与中心通信正常
- + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue new file mode 100644 index 000000000..9caf08f28 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue @@ -0,0 +1,320 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue new file mode 100644 index 000000000..7845e7a5b --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/defectivePasswordBox.vue @@ -0,0 +1,118 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/forkDirective.vue b/src/jmapNew/theme/datie_02/menus/dialog/forkDirective.vue new file mode 100644 index 000000000..28cc0e6e7 --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/forkDirective.vue @@ -0,0 +1,160 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue new file mode 100644 index 000000000..8330e5e5a --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue @@ -0,0 +1,250 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue index f8b220c6c..b8015321c 100644 --- a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue @@ -10,6 +10,7 @@
+
@@ -28,6 +29,7 @@ import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/contr import { timestampFormat } from '@/utils/date'; // import BottomTable from './bottomTable'; import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config'; +import MenuButtonCtc from './menuButtonCtc'; export default { name: 'DispatchWorkMenu', @@ -39,7 +41,8 @@ export default { MenuStationStand, MenuStation, MenuTrain, - PassiveContorl + PassiveContorl, + MenuButtonCtc // BottomTable }, props: { diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index 97ea3c357..aeb09a584 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -1,118 +1,125 @@ @@ -130,6 +137,9 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo' import { MouseEvent, DeviceMenu } from '@/scripts/ConstDic'; import { EventBus } from '@/scripts/event-bus'; import {UserOperationType} from '../../../../scripts/ConstDic'; +import ForkDirective from './dialog/forkDirective'; +import ApplyOrAgreeModeCovert from './dialog/applyOrAgreeModeCovert'; +import StatusSelect from './dialog/statusSelect'; export default { name: 'MapButtonMenu', components: { @@ -138,7 +148,10 @@ export default { NoticeInfo, PopMenu, TrainRoute, - ShuntRoute + ShuntRoute, + ForkDirective, + ApplyOrAgreeModeCovert, + StatusSelect }, props: { selected: { @@ -146,6 +159,12 @@ export default { default: () => { return null; } + }, + work: { + type: String, + default: () => { + return 'ctcWork'; + } } }, data() { @@ -155,6 +174,7 @@ export default { y: 0 }, operation: '', + modeCovertShow:false, buttonName: '', guideColorDown: '#FEEE1A', guideColorUp: '#DCDCDC', @@ -196,6 +216,12 @@ export default { 'autoReentryList', 'autoReentryData' ]), + hasModeApplyList() { + return this.$store.state.socket.operationModeApplyList.length; + }, + isDispatchWork () { + return this.work == 'dispatchWork'; + }, Switch() { return OperationEvent.Switch; }, @@ -262,7 +288,11 @@ export default { this.$store.dispatch('menuOperation/setButtonOperation', null); this.clearOperate(); }, + '$store.state.menuOperation.leftClickCount': function (val) { + this.modeCovertShow = false; + }, '$store.state.menuOperation.menuCount': function (val) { + this.modeCovertShow = false; if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) { const operate = { userOperationType: 'rightClick', @@ -374,7 +404,28 @@ export default { } } }, + statusSelectBtn() { + const operate = { + operation: OperationEvent.CTCCommand.switchRouteSetModel.menu.operation + }; + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + if (valid) { + this.$refs.statusSelect.doShow(); + } + }); + }, + modeCovertBtn(operation) { + const operate = { + operation: operation + }; + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + this.modeCovertShow = true; + this.operation = operation; + }); + }, buttonDown(operation, commandTypeList) { + // MixinCommand.modeCovert.button.operation + this.modeCovertShow = false; const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode); if (!station || station.controlMode === 'Interlock') { return; } const operate = { @@ -382,26 +433,57 @@ export default { userOperationType: UserOperationType.LEFTCLICK, operation: operation }; - this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - if (valid) { - this.$store.dispatch('menuOperation/setButtonOperation', operation === this.Command.cancel.clearMbm.operation ? null : operation); - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + if (operation == this.MixinCommand.modeCovert.button.operation) { + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + this.modeCovertShow = true; this.operation = operation; - this.commandTypeList = commandTypeList; - const operationList = [ - this.Signal.humanTrainRoute.button.operation, - this.Section.fault.button.operation, - this.Signal.guide.button.operation, - this.Station.guideLock.button.operation - ]; - if (operationList.includes(operation)) { - operate['operateNext'] = this.Command.close.password.operation; - this.$refs.password.doShow(operate); + }); + } else { + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + if (valid) { + this.$store.dispatch('menuOperation/setButtonOperation', operation === this.Command.cancel.clearMbm.operation ? null : operation); + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.operation = operation; + this.commandTypeList = commandTypeList; + const operationList = [ + this.Signal.humanTrainRoute.button.operation, + this.Section.fault.button.operation, + this.Signal.guide.button.operation, + this.Station.guideLock.button.operation + ]; + if (operationList.includes(operation)) { + operate['operateNext'] = this.Command.close.password.operation; + this.$refs.password.doShow(operate); + } + this.timeNode = this.$store.state.socket.simulationTimeSync; } - this.timeNode = this.$store.state.socket.simulationTimeSync; - } + }); + } + + }, + applyModeCovert() { + const operate = { + userOperationType: UserOperationType.LEFTCLICK, + operation: this.MixinCommand.modeCovert.applyModeCovert.operation + }; + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + this.modeCovertShow = false; + this.$refs.applyOrAgreeModeCovert.doShow(operate); + this.clearOperate(); }); }, + agreeModeCovert() { + const operate = { + userOperationType: UserOperationType.LEFTCLICK, + operation: this.MixinCommand.modeCovert.agreeModeCovert.operation + }; + this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { + this.modeCovertShow = false; + this.$refs.applyOrAgreeModeCovert.doShow(operate); + this.clearOperate(); + }); + + }, // 解析进路数据 handleRouteDataMap() { this.routeDataMap = {}; @@ -773,9 +855,10 @@ export default { operate.over = true; operate.cmdType = CMD.Switch.CMD_SWITCH_BLOCK; } else if (this.operation === OperationEvent.Station.guideLock.button.operation) { + console.log(this.selected, 'selected'); operate.userOperationType = UserOperationType.LEFTCLICK; operate.over = true; - operate.cmdType = CMD.Station.CMD_STATION_MASTER_LOCK; + operate.cmdType = this.selected.instance && this.selected.instance.guideLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK; } this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { }).catch(e => { @@ -794,11 +877,10 @@ export default { }, // 分路不良 handelDefectiveShunting(model) { - // CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING; if (model._type == 'Section') { const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING, + start: true, + // cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING, operation: OperationEvent.Section.defectiveShunting.menu.operation, userOperationType: UserOperationType.LEFTCLICK, param:{ @@ -807,23 +889,25 @@ export default { } }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } + if (valid) { + // operate.operation = OperationEvent.Section.defectiveShunting.menu.operation; + this.$refs.forkDirective.doShow(operate, this.selected); + } }); } else if (model._type == 'Switch') { const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING, + start: true, operation: OperationEvent.Section.defectiveShunting.menu.operation, userOperationType: UserOperationType.LEFTCLICK, param:{ - sectionCode: model.sectionACode, - shuntingTypeList:['SWITCH_FRONT_SHUNTING'] + sectionCode: model.sectionACode } }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } + if (valid) { + operate.operation = OperationEvent.Switch.defectiveShunting.before.operation; + this.$refs.forkDirective.doShow(operate, this.selected); + } }); } this.clearOperate(); @@ -971,4 +1055,43 @@ export default { background-color: $hoverBg; } } + .modeCovertPopList{ + position: absolute; + width: 130px; + background: #F0F0F0; + bottom: 18px; + left: 780px; + box-shadow: 1px 3px 3px #000; + } + .eachModeCovertPop{ + font-size: 15px; + padding: 5px 0px 5px 10px; + cursor: pointer; + } + .eachModeCovertPop:hover{ + background: #c3c3c3; + } + .disabled { + cursor: not-allowed; + span { + color: #ccc !important; + } + } + .redFlick { + background: red; + } + @keyframes fade { + from { + opacity: 1.0; + } + 50% { + opacity: 0.2; + } + to { + opacity: 1.0; + } + } + .flicker { + animation: fade 600ms infinite; + } diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue index 9f71f053d..7c3899c57 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue @@ -67,11 +67,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -174,9 +169,6 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index 9892ca1eb..59b447c9a 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -135,11 +135,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -325,9 +320,6 @@ export default { } } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuStation.vue b/src/jmapNew/theme/datie_02/menus/menuStation.vue index 0b0a6e72d..11e16d744 100644 --- a/src/jmapNew/theme/datie_02/menus/menuStation.vue +++ b/src/jmapNew/theme/datie_02/menus/menuStation.vue @@ -65,11 +65,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -154,9 +149,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, // 非常站控 veryControlClick(selected) { // stationCode车站编号、pressDown：1按下、0抬起 diff --git a/src/jmapNew/theme/datie_02/menus/menuStationStand.vue b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue index 0c7edb2f3..ca2812d79 100644 --- a/src/jmapNew/theme/datie_02/menus/menuStationStand.vue +++ b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue @@ -50,11 +50,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -113,9 +108,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue index 6dc363de9..c04934f16 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue @@ -8,6 +8,7 @@ + @@ -27,6 +28,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO import RouteCancel from './menuDialog/routeCancel'; import { UserOperationType } from '@/scripts/ConstDic'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; +import ForkDirective from './dialog/forkDirective'; export default { name: 'SwitchMenu', @@ -38,7 +40,8 @@ export default { SetFault, SwitchHookLock, DrawSelect, - RouteCancel + RouteCancel, + ForkDirective }, mixins: [ CancelMouseState @@ -177,11 +180,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -338,57 +336,33 @@ export default { }, // 岔前 分路不良 beforeForkDirective() { - const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING_FRONT, - operation: OperationEvent.Switch.defectiveShunting.before.operation, - userOperationType: UserOperationType.RIGHTCLICK, - param:{ - sectionCode:this.selected.sectionACode + commitOperate(menuOperate.Switch.beforeForkDirective, {sectionCode:this.selected.sectionACode}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.forkDirective.doShow(operate, this.selected); } - }; - this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } }); }, // 定位 分路不良 locateForkDirective() { - const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING_FIXED, - operation: OperationEvent.Switch.defectiveShunting.locate.operation, - userOperationType: UserOperationType.RIGHTCLICK, - param:{ - sectionCode:this.selected.sectionACode + commitOperate(menuOperate.Switch.locateForkDirective, {sectionCode:this.selected.sectionACode}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.forkDirective.doShow(operate, this.selected); } - }; - this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } }); }, // 反位 分路不良 reverseForkDirective() { - const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING_REVERSE, - operation: OperationEvent.Switch.defectiveShunting.reverse.operation, - userOperationType: UserOperationType.RIGHTCLICK, - param:{ - sectionCode:this.selected.sectionACode + commitOperate(menuOperate.Switch.locateForkDirective, {sectionCode:this.selected.sectionACode}, 0).then(({valid, operate})=>{ + if (valid) { + this.$refs.forkDirective.doShow(operate, this.selected); } - }; - this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } }); }, // 区段确认空闲，取消分路不良 cancleForkDirective() { const operate = { - over: true, - cmdType:CMD.Section.CMD_SECTION_CANCEL_DEFECTIVE_SHUNTING, + start: true, + // cmdType:CMD.Section.CMD_SECTION_CANCEL_DEFECTIVE_SHUNTING, operation: OperationEvent.Switch.cancelDefectiveShunting.menu.operation, userOperationType: UserOperationType.RIGHTCLICK, param:{ @@ -396,8 +370,9 @@ export default { } }; this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { - // if (valid) { - // } + if (valid) { + this.$refs.forkDirective.doShow(operate, this.selected); + } }); }, // 道岔钩锁 @@ -411,9 +386,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue index 78fddffaa..f01e053ed 100644 --- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue @@ -6,6 +6,7 @@ + @@ -21,8 +22,10 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate'; import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'; import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop'; +import TrainOperation from '@/jmapNew/theme/components/menus/dialog/trainOperation'; import {UserOperationType} from '../../../../scripts/ConstDic'; - +import { MouseEvent } from '@/scripts/ConstDic'; +import { getSessionStorage } from '@/utils/auth'; export default { name: 'MenuTrain', components: { @@ -31,7 +34,8 @@ export default { SetFault, UpdateTrip, SpeedLimit, - TrainStop + TrainStop, + TrainOperation }, mixins: [ CancelMouseState @@ -80,10 +84,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -135,7 +135,10 @@ export default { ]), ...mapGetters('menuOperation', [ 'buttonOperation' - ]) + ]), + project() { + return getSessionStorage('project'); + } }, watch: { '$store.state.menuOperation.menuCount': function () { @@ -144,6 +147,11 @@ export default { } else { this.doClose(); } + }, + '$store.state.menuOperation.selected': function (val) { + if (val._type === 'Train' && val._event === MouseEvent.Left && this.project === 'thailandsandbox') { + this.$refs.trainOperation.doShow(val); + } } }, methods: { @@ -216,9 +224,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, handleSpeedLimit() { // 限速指令 this.$refs.speedLimit.doShow(this.selected); }, diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue index 8ea9cd159..884ffa75c 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue @@ -96,11 +96,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } // { // label: '设置备用车', @@ -251,9 +246,6 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue index deb43ec46..85b96e301 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue @@ -171,11 +171,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -381,9 +376,6 @@ export default { } } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue index 3d6191e8c..d8895da01 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue @@ -72,11 +72,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -162,9 +157,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, handlerOpenPdf(elem) { const url = `https://joylink.club/oss/projects/wjls/${this.selected.jp}/${elem.file}`; window.open(url, '_blank'); diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue index 67d61edb4..cd77d8df0 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue @@ -91,11 +91,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -211,9 +206,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue index 7586a11b9..ce396dea8 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSwitch.vue @@ -178,11 +178,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -335,9 +330,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue index e31dda637..2c6f1ba4a 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue @@ -150,10 +150,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -289,9 +285,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { this.trainSend(menuOperate.Driver.driveAhead); }, diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue index d76aaa65c..7aecfa05c 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue @@ -96,11 +96,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } // { // label: '设置备用车', @@ -255,9 +250,6 @@ export default { this.$refs.trainAddPlan.doShow(operate); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue index 820955653..641e26aae 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue @@ -177,11 +177,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -390,9 +385,6 @@ export default { } } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue index 3d6191e8c..d8895da01 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue @@ -72,11 +72,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -162,9 +157,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, handlerOpenPdf(elem) { const url = `https://joylink.club/oss/projects/wjls/${this.selected.jp}/${elem.file}`; window.open(url, '_blank'); diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue index 67d61edb4..cd77d8df0 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue @@ -91,11 +91,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -211,9 +206,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected, []); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue index 8ffa4b7c3..5b2cc762d 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue @@ -172,11 +172,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -332,9 +327,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue index 324661ac7..b419ec630 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue @@ -153,10 +153,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -299,9 +295,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { this.trainSend(menuOperate.Driver.driveAhead); }, diff --git a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue index 15d63f2c0..7dd297c49 100644 --- a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue +++ b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue @@ -153,10 +153,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -299,9 +295,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { this.trainSend(menuOperate.Driver.driveAhead); }, diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index a54a4a12b..9c960ec71 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -109,11 +109,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -296,9 +291,6 @@ export default { this.$refs.allLineCancelLimit.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue index 56e2d3136..753a358da 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue @@ -174,11 +174,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -452,9 +447,6 @@ export default { } }); return routes; - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuStation.vue b/src/jmapNew/theme/foshan_01/menus/menuStation.vue index e87e9a346..b6975004c 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStation.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStation.vue @@ -73,11 +73,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -179,9 +174,6 @@ export default { this.$refs.stationCmdControl.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue index df4a9f847..4153f8c6c 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue @@ -166,11 +166,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -324,9 +319,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue index c5ac56154..20304e6b2 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue @@ -153,11 +153,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -428,9 +423,6 @@ export default { this.$refs.allLineCancelLimit.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue index 5bb9cba52..6a09cbebf 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue @@ -123,10 +123,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -275,9 +271,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch(() => { diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue index 2d7b90a10..afeb3d702 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue @@ -127,11 +127,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: this.$t('menu.menuSection.triggerFaultManagement'), - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -325,9 +320,6 @@ export default { this.$refs.speedCmdControl.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue index 19c2f66e1..da1d05613 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue @@ -178,11 +178,6 @@ export default { label: this.$t('menu.menuSignal.cancelFault'), handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: this.$t('menu.menuSection.triggerFaultManagement'), - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -513,9 +508,6 @@ export default { this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected)); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue index 4294b3d24..7c27ea55f 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue @@ -101,11 +101,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: this.$t('menu.menuSection.triggerFaultManagement'), - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -234,9 +229,6 @@ export default { this.$refs.stationSetRouteControlAll.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue index a4ff1dd83..18ca49971 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue @@ -167,11 +167,6 @@ export default { label: '取消站台紧急停车', handler: this.cancelEmergencyClose, cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE - }, - { - label: this.$t('menu.menuSection.triggerFaultManagement'), - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -356,9 +351,6 @@ export default { this.$refs.noticeInfo.doShow(); }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, // 打开PSL面板 openPsl() { this.$refs.psl.doShow(this.selected); diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue index d40d2f0a8..8c75d9c2d 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue @@ -140,11 +140,6 @@ export default { { label: this.$t('menu.menuSwitch.cancelFault'), handler: this.cancelStoppage - }, - { - label: this.$t('menu.menuSection.triggerFaultManagement'), - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -337,9 +332,6 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue index a5a0689d2..73d2becdc 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue @@ -28,7 +28,7 @@ import TrainSwitch from './dialog/trainSwitch'; import TrainEditNumber from './dialog/trainEditNumber'; import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'; import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate'; -import TrainOperation from './menuDialog/trainOperation'; +import TrainOperation from '@/jmapNew/theme/components/menus/dialog/trainOperation'; import { MouseEvent } from '@/scripts/ConstDic'; import { getSessionStorage } from '@/utils/auth'; @@ -91,10 +91,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -243,9 +239,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue index b18398d42..22e3547ee 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue @@ -47,11 +47,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -126,9 +121,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue index 9639baf40..9367394d1 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue @@ -41,11 +41,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -112,9 +107,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStation.vue b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue index d26115d02..ec0dd4342 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuStation.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue @@ -59,11 +59,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -156,9 +151,6 @@ export default { console.error('该车站无zc设备'); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue index 9eb3af287..0f2460e8b 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue @@ -59,11 +59,6 @@ export default { label: '取消站台紧急停车', handler: this.cancelEmergencyClose, cmdType: CMD.Stand.CMD_STAND_CANCEL_EMERGENCY_CLOSE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -146,9 +141,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue index f716af1fb..a2fc4fb76 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue @@ -46,11 +46,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -126,9 +121,6 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue index c5b174024..369acffe6 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue @@ -51,11 +51,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ], menuDirective: [ @@ -312,9 +307,6 @@ export default { console.error(error); this.$refs.noticeInfo.doShow(); }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } // // 添加列车识别号 // addTrainId() { diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSection.vue b/src/jmapNew/theme/nanjing_02/menus/menuSection.vue index 01cb72cdb..685d64584 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuSection.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuSection.vue @@ -44,11 +44,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -142,9 +137,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue b/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue index cb75601cb..a8a62e598 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue @@ -41,11 +41,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -112,9 +107,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuStation.vue b/src/jmapNew/theme/nanjing_02/menus/menuStation.vue index 65a915235..df0e21132 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuStation.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuStation.vue @@ -56,11 +56,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -154,9 +149,6 @@ export default { console.error('该车站无zc设备'); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue b/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue index 0065d4570..a47c3296d 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue @@ -40,11 +40,6 @@ export default { label: this.$t('menu.menuStationStand.cancelFault'), handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -109,9 +104,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue b/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue index cf74f4d27..8c61e1d4f 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue @@ -49,11 +49,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -130,9 +125,6 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue index 19b2c6053..5a836c0a7 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue @@ -45,11 +45,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ], menuDirective: [ @@ -306,9 +301,6 @@ export default { console.error(error); this.$refs.noticeInfo.doShow(); }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue index a39c95cd8..f839f50d7 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue @@ -142,11 +142,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -351,9 +346,6 @@ export default { } else if (operate.operation === OperationEvent.Section.unlock.confirm.operation) { this.$refs.sectionUnLock.doShow(menuOperate.Section.unlock, this.selected); } - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue index b14e909e7..1e7211d2a 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue @@ -165,11 +165,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -381,9 +376,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue index 6ff6e1741..af078f91c 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue @@ -107,11 +107,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -259,9 +254,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue index c9b43fea2..a84a137d1 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue @@ -176,11 +176,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -354,9 +349,6 @@ export default { this.$refs.standDetail.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue index 154c82c76..38b2782b9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue @@ -165,11 +165,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -363,9 +358,6 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 0848b0dad..10ab4a906 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -140,10 +140,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -285,9 +281,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue index 04eb36e1e..d9cfa9a08 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue @@ -141,10 +141,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -286,9 +282,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, nextStation() { commitOperate(menuOperate.Driver.driveAhead, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{ }).catch((error) => { diff --git a/src/jmapNew/theme/race_01/menus/menuPower.vue b/src/jmapNew/theme/race_01/menus/menuPower.vue index 841d507c3..f61087de0 100644 --- a/src/jmapNew/theme/race_01/menus/menuPower.vue +++ b/src/jmapNew/theme/race_01/menus/menuPower.vue @@ -38,11 +38,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType:CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -106,9 +101,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue index 5df27104e..5d0c83f35 100644 --- a/src/jmapNew/theme/race_01/menus/menuSection.vue +++ b/src/jmapNew/theme/race_01/menus/menuSection.vue @@ -127,11 +127,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -334,9 +329,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/race_01/menus/menuSignal.vue b/src/jmapNew/theme/race_01/menus/menuSignal.vue index a34bfe348..960351990 100644 --- a/src/jmapNew/theme/race_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/race_01/menus/menuSignal.vue @@ -168,11 +168,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -362,9 +357,6 @@ export default { this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/race_01/menus/menuStation.vue b/src/jmapNew/theme/race_01/menus/menuStation.vue index 5789df8b2..8f7315b43 100644 --- a/src/jmapNew/theme/race_01/menus/menuStation.vue +++ b/src/jmapNew/theme/race_01/menus/menuStation.vue @@ -109,11 +109,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -253,9 +248,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/race_01/menus/menuStationStand.vue b/src/jmapNew/theme/race_01/menus/menuStationStand.vue index fb6913f21..c74ac5328 100644 --- a/src/jmapNew/theme/race_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/race_01/menus/menuStationStand.vue @@ -173,11 +173,6 @@ export default { label: '手动开启屏蔽门', handler: this.openPsdByHand, cmdType: CMD.Stand.CMD_STAND_OPEN_PSD - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -344,9 +339,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, // 手动开启屏蔽门 openPsdByHand() { commitOperate(menuOperate.StationStand.openPsdByHand, {standCode:this.selected.code}, 3).then(({valid, operate})=>{ diff --git a/src/jmapNew/theme/race_01/menus/menuSwitch.vue b/src/jmapNew/theme/race_01/menus/menuSwitch.vue index 0baaea01b..78f61c656 100644 --- a/src/jmapNew/theme/race_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/race_01/menus/menuSwitch.vue @@ -167,11 +167,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '道岔钩锁', handler: this.hookLock, @@ -362,9 +357,6 @@ export default { this.$refs.switchHookLock.doShow(this.selected, operate); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue index 2c1a7c9bb..74a0e6caa 100644 --- a/src/jmapNew/theme/race_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue @@ -154,10 +154,6 @@ export default { label: '取消故障', handler: this.cancelStoppage }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement - }, { label: '托管', handler: this.setCollocation @@ -321,9 +317,6 @@ export default { } }); }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, // 设置连挂 setLink() { commitOperate(menuOperate.Common.setLink, { code: this.selected.code }, 0).then(({valid, operate})=>{ diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue index e07dd9921..8edbe7839 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue @@ -150,11 +150,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -311,9 +306,6 @@ export default { this.$refs.speedCmdControl.doShow(operate, this.selected); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue index 63eab3df1..c1c85498a 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue @@ -218,11 +218,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -449,9 +444,6 @@ export default { this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected)); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue index 4da15dea5..0d83409c2 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue @@ -161,11 +161,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -302,9 +297,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue index 81d513375..1814db426 100644 --- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue +++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue @@ -169,11 +169,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -343,10 +338,6 @@ export default { } }); }, - // 触发故障管理 - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); - }, // 打开PSL面板 openPsl() { this.$refs.psl.doShow(this.selected); diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue index 5cb403b64..155773f0b 100644 --- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue @@ -175,11 +175,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ], menuDirective: [ @@ -352,9 +347,6 @@ export default { // 道岔钩锁 hookLock() { this.$refs.switchHookLock.doShow(this.selected); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue index 8db4b35e4..82a617952 100644 --- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue @@ -132,10 +132,6 @@ export default { { label: '取消故障', handler: this.cancelStoppage - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement } ], menuDirective: [ @@ -526,9 +522,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } // // 交换列车识别号 // switchTrainId() { diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue index 4be17f28f..0f614e975 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSection.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue @@ -183,11 +183,6 @@ export default { handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT - }, { label: '设置备用车', handler: this.loadSpare, @@ -371,9 +366,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue index 807fcc29a..ec9955591 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue @@ -187,11 +187,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -577,9 +572,6 @@ export default { if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { this.$refs.popMenu.resetShowPosition(point); } - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue index 6e786f079..f55cd9b5b 100644 --- a/src/jmapNew/theme/xian_02/menus/menuStation.vue +++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue @@ -227,11 +227,6 @@ export default { label: '重启联锁机', handler: this.restartInterlock, cmdType: CMD.Station.CMD_STATION_RESTART_INTERLOCK_MACHINE - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -485,9 +480,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue index 5033c3aa8..f22e14c23 100644 --- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue +++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue @@ -169,11 +169,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -378,9 +373,6 @@ export default { callback: action => { } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue index da6c80368..5d2f1e5bf 100644 --- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue +++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue @@ -249,11 +249,6 @@ export default { label: '取消故障', handler: this.cancelStoppage, cmdType: CMD.Fault.CMD_CANCEL_FAULT - }, - { - label: '触发故障管理', - handler: this.triggerFaultManagement, - cmdType: CMD.Fault.CMD_TRIGGER_FAULT } ] }; @@ -516,9 +511,6 @@ export default { this.$refs.stopProfile.doShow(step, this.selected, 'down'); } }); - }, - triggerFaultManagement() { - this.$store.dispatch('training/setTriggerFaultCount', this.selected); } } }; diff --git a/src/jmapNew/transformHandle.js b/src/jmapNew/transformHandle.js index bb6e25b8c..0c087471b 100644 --- a/src/jmapNew/transformHandle.js +++ b/src/jmapNew/transformHandle.js @@ -41,7 +41,7 @@ class TransformHandle { // const scale = parseFloat((20 / this.scaleIndex).toFixed(2)); const scaleRate = this.$painter.$jmap.$options.getScaleRate(); if (scaleRate < 1) { - view.trainB.mouseEvent.arrowText.setStyle({ textFont: (10 / scaleRate).ceil() + 'px consolas' }); + view.trainB.mouseEvent.arrowText.setStyle({ textFont: Math.ceil(10 / scaleRate) + 'px consolas' }); } } diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index a237dfac7..85d887894 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -491,7 +491,10 @@ export default { CTC_QUERY_DISPATCH_COMMAND:{value:'CTC_QUERY_DISPATCH_COMMAND', label: '调度台命令查询'}, CTC_SEND_DISPATCH_COMMAND:{value:'CTC_SEND_DISPATCH_COMMAND', label: '调度台命令下达'}, CTC_SIGN_DISPATCH_COMMAND:{value:'CTC_SIGN_DISPATCH_COMMAND', label: '调度台命令签收'}, - CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'} + CTC_READ_DISPATCH_COMMAND:{value:'CTC_READ_DISPATCH_COMMAND', label: '调度台命令已读'}, + CTC_SWITCH_ROUTE_SET_MODEL:{value:'Station_Switch_Route_Set_Model', label: '状态切换操作'}, + CTC_SWITCH_CONTROL_OPERATION_MODEL:{value:'Station_Switch_Control_Operation_Mode', label: '操作模式转换'}, + CTC_AGREE_OPERATION_MODEL:{value:'Station_Handle_Operation_Mode_Apply', label: '同意操作模式转换'} }, RAIL: { @@ -501,7 +504,10 @@ export default { CMD_RAIL_QUERY_REGISTER: {value: 'RAIL_QUERY_REGISTER', label: '查询行车簿册'}, CMD_RAIL_GIVE_TICKET_TO: {value: 'RAIL_GIVE_TICKET_TO', label: '给出票据'}, CMD_RAIL_EQUIPMENT_CONSTRUCTION_INFO_SAVE:{value: 'EQUIPMENT_CONSTRUCTION_INFO_SAVE', label: '填写施工登记簿册'}, - CMD_RAIL_EQUIPMENT_CONSTRUCTION_INFO_QUERY:{value: 'EQUIPMENT_CONSTRUCTION_INFO_QUERY', label: '查询施工登记簿册'} + CMD_RAIL_EQUIPMENT_CONSTRUCTION_INFO_QUERY:{value: 'EQUIPMENT_CONSTRUCTION_INFO_QUERY', label: '查询施工登记簿册'}, + CMD_RAIL_FLOOD_CONTROL_SAFETY_SUBMIT:{value: 'CONTROL_FLOOD_SIGN_SAVE', label: '填写防洪安全上岗签到表'}, + CMD_RAIL_FLOOD_CONTROL_SAFETY_UPDATE:{value: 'CONTROL_FLOOD_SIGN_UPDATE', label: '更新防洪安全上岗签到表'}, + CMD_RAIL_ABNORMAL_TRAIN_SAVE:{value: 'KEY_LINK_CONTROL_INFO_SAVE', label: '填写非正常情况接发列车关键环节控制表'} }, Conversation: { CMD_Conversation_Chat_Text: {value: 'Conversation_Chat_Text', label: '发送文本消息'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index d0027209a..1540247a5 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1309,6 +1309,18 @@ export const OperationEvent = { before:{ operation: '11g', domId: '_Tips-Switch-DefectiveShunting-Before{TOP}' + }, + confirm:{ + operation: '11h', + domId: '_Tips-Switch-DefectiveShunting-confirm{TOP}' + }, + password:{ + operation: '11i', + domId: '_Tips-Switch-DefectiveShunting-password{TOP}' + }, + twoConfirm:{ + operation: '11j', + domId: '_Tips-Switch-DefectiveShunting-twoConfirm{TOP}' } }, @@ -3791,6 +3803,28 @@ export const OperationEvent = { operation: '299c', domId: '_Tips-Control-StationControl-Confirm{TOP}' } + }, + modeCovert:{ + button:{ + operation: '299d', + domId: '_Tips-Mode-Covert-Button{TOP}' + }, + agreeModeCovert:{ + operation: '299e', + domId: '_Tips-Agree-Mode-Covert{TOP}' + }, + applyModeCovert:{ + operation: '299f', + domId: '_Tips-Apply-Mode-Covert{TOP}' + }, + agreeModeCovertCommit:{ + operation: '299g', + domId: '_Tips-Agree-Mode-Covert-Commit{TOP}' + }, + applyModeCovertCommit:{ + operation: '299g', + domId: '_Tips-Apply-Mode-Covert-Commit{TOP}' + } } }, CTCCommand: { @@ -4214,6 +4248,20 @@ export const OperationEvent = { operation: 'a062', domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}' } + }, + switchRouteSetModel: { + menu: { + operation: 'a063', + domId: '_Tips-CTC-switchRouteSetModel-menu{TOP}' + }, + confirm: { + operation: 'a064', + domId: '_Tips-CTC-switchRouteSetModel-confirm' + }, + cancel: { + operation: 'a065', + domId: '_Tips-CTC-switchRouteSetModel-cancel' + } } // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION diff --git a/src/scripts/cmdPlugin/newHandler.js b/src/scripts/cmdPlugin/newHandler.js index 8fa32f7ae..b0cd0779e 100644 --- a/src/scripts/cmdPlugin/newHandler.js +++ b/src/scripts/cmdPlugin/newHandler.js @@ -88,14 +88,31 @@ class Handler { // 获取实训操作 getTrainingOperation() { const stepInfo = store.state.trainingNew.stepInfo; - const operateOrder = store.state.trainingNew.operateOrder; - return stepInfo.operations ? stepInfo.operations[operateOrder] : {}; + const operation = stepInfo.operations ? stepInfo.operations[store.state.trainingNew.operateOrder] : {}; + return this.isSpecialOperation(operation); + } + // 是否为特殊操作 特殊操作需跳过 + isSpecialOperation(operation) { + if (operation && operation.special) { + store.dispatch('trainingNew/operateOrderIncrease'); + return this.getTrainingOperation(); + } else { + return operation; + } } // 是否为步骤最后一步操作 isLastOperation() { const stepInfo = store.state.trainingNew.stepInfo; const operateOrder = store.state.trainingNew.operateOrder; - return stepInfo.operations.length <= operateOrder + 1; + return stepInfo.operations.length <= operateOrder + 1 || this.allSpecialOperation(stepInfo, operateOrder + 1); + } + // 检查后面操作是否均为特殊操作 + allSpecialOperation(stepInfo, operateOrder) { + let flag = true; + for (; operateOrder < stepInfo.operations.length; operateOrder++) { + if (stepInfo.operations[operateOrder] && !stepInfo.operations[operateOrder].special) flag = false; + } + return flag; } // 是否未特殊语音执行步骤列表的最后一步 isLastVoiceStep() { diff --git a/src/scripts/cmdPlugin/newValidateHandler.js b/src/scripts/cmdPlugin/newValidateHandler.js index 460d15065..2e152eeb3 100644 --- a/src/scripts/cmdPlugin/newValidateHandler.js +++ b/src/scripts/cmdPlugin/newValidateHandler.js @@ -22,22 +22,34 @@ class ValidateHandler { valid = false; } return valid; } - checkDeviceCodeConsistent(deviceCode1, deviceCode2) { - const linkDeviceCode1 = store.state.map.linkSwitchMap[deviceCode1]; - console.log(deviceCode1, deviceCode2, linkDeviceCode1, linkDeviceCode1 === deviceCode2); + isNeedCheckLinkSwitch(operation) { + // 道岔单锁/单解 单操到定位/反位 + const needCheckLinkSwitchOperation = [OperationEvent.Switch.lock.menu.operation, OperationEvent.Switch.unlock.menu.operation, + OperationEvent.Switch.locate.menu.operation, OperationEvent.Switch.reverse.menu.operation, OperationEvent.Switch.lock.button.operation, + OperationEvent.Switch.unlock.button.operation, OperationEvent.Switch.locate.button.operation, OperationEvent.Switch.reverse.button.operation, + OperationEvent.Switch.turnout.menu.operation, OperationEvent.Switch.turnout.menuButton.operation, OperationEvent.Switch.lock.menuButton.operation, + OperationEvent.Switch.unlock.menuButton.operation, OperationEvent.Switch.locate.menuButton.operation, OperationEvent.Switch.reverse.menuButton.operation]; + return needCheckLinkSwitchOperation.includes(operation); + } + checkDeviceCodeConsistent(deviceCode1, deviceCode2, operation) { + let linkDeviceCode1 = ''; + if (this.isNeedCheckLinkSwitch(operation)) { + linkDeviceCode1 = store.state.map.linkSwitchMap[deviceCode1]; + } return deviceCode1 === deviceCode2 || linkDeviceCode1 === deviceCode2; } - checkParamConsistent(param1, param2) { + checkParamConsistent(param1, param2, operation) { const linkParam = {}; let linkDataFlag = false; - for (const key in param1) { - linkParam[key] = param1[key]; - if (store.state.map.linkSwitchMap[param1[key]]) { - linkDataFlag = true; - linkParam[key] = store.state.map.linkSwitchMap[param1[key]]; + if (this.isNeedCheckLinkSwitch(operation)) { + for (const key in param1) { + linkParam[key] = param1[key]; + if (store.state.map.linkSwitchMap[param1[key]]) { + linkDataFlag = true; + linkParam[key] = store.state.map.linkSwitchMap[param1[key]]; + } } } - console.log(linkDataFlag, linkParam, param2, objectIsEqual(linkParam, param2)); if (linkDataFlag) { return objectIsEqual(param1, param2) || objectIsEqual(linkParam, param2); } else { @@ -58,7 +70,7 @@ class ValidateHandler { valid = (cmd === stepOperation.operationType) && valid; } if (operate.code || stepOperation.deviceCode) { - valid = this.checkDeviceCodeConsistent(operate.code, stepOperation.deviceCode) && valid; + valid = this.checkDeviceCodeConsistent(operate.code, stepOperation.deviceCode, operate.operation) && valid; } if (stepOperation.subType) { valid = (operate.subType === stepOperation.subType) && valid; @@ -70,29 +82,26 @@ class ValidateHandler { valid = (operate.userOperationType === stepOperation.userOperationType) && valid; } if (stepOperation.val) { - // || operate.val valid = ((operate.val).toString() === stepOperation.val.toString()) && valid; } const opParam = operate.param === undefined ? {} : operate.param; if ((opParam || stepOperation.params) && !opParam.hasOwnProperty('fileBase64Str')) { - valid = this.checkParamConsistent(opParam, stepOperation.params) && valid; + valid = this.checkParamConsistent(opParam, stepOperation.params, operate.operation) && valid; } if (valid && store.state.trainingNew.voiceStepIndex > -1) { !Handler.isLastVoiceStep() && store.dispatch('trainingNew/voiceStepIndexIncrease'); } else if (valid && Handler.isLastOperation()) { - store.dispatch('trainingNew/handleStepRecord', { type:'OVER', stepOperation, operate }); + store.dispatch('trainingNew/handleStepRecord', { type:'OVER', stepOperation }); Handler.nextStep(); } else if (valid) { store.dispatch('trainingNew/operateOrderIncrease'); - store.dispatch('trainingNew/handleStepRecord', { type:'CONTINUE', stepOperation, operate }); + store.dispatch('trainingNew/handleStepRecord', { type:'CONTINUE', stepOperation }); Handler.judgeIsTextSendOperation(); } else { console.log(operate, stepOperation, '----------'); - if (store.state.trainingNew.voiceStepIndex < 0) { - store.dispatch('trainingNew/handleStepRecord', { type:'ERROR', stepOperation, operate }); - } + store.dispatch('trainingNew/handleStepRecord', { type:'ERROR', stepOperation }); console.error('校验失败；'); } return valid; diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 9f46e5bbe..4b56cba08 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -118,7 +118,8 @@ const socket = { }, simulationWorkParam: {}, conversationMessage: {}, - controlTransfer: {} + controlTransfer: {}, + operationModeApplyList: [] // 模式转换消息列表 }, getters: { }, @@ -392,6 +393,19 @@ const socket = { }, setControlTransfer: (state, transfer) => { state.controlTransfer = transfer; + }, + operationModeApply: (state, list) => { + state.operationModeApplyList = list; + }, + clearOperationModeApplyList: (state, list) => { + list.forEach(item => { + const index = state.operationModeApplyList.findIndex(every => { + return every.code == item.code && every.target == item.target; + }); + if (index >= 0) { + state.operationModeApplyList.splice(index, 1); + } + }); } }, @@ -627,6 +641,9 @@ const socket = { }, setControlTransfer: ({ commit }, transfer) => { commit('setControlTransfer', transfer); + }, + operationModeApply: ({ commit }, message) => { + commit('operationModeApply', message); } } }; diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 050a60b79..547888a91 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -43,8 +43,6 @@ const training = { orignalUserRoleId:'', // 设置旧的角色的id scriptQuitCount: 0, // 主动退出剧本 scriptOperationType: '', // 剧本操作类型 - triggerFaultCount: 0, // 触发故障计数器 - triggerFaultDevice: '', // 触发故障目标设备 trainingStart: false, // 实训开始状态 notifySelected: null, // 场景弹窗内容 runPathList:[], // 运行线 (宁波三号线) @@ -306,10 +304,6 @@ const training = { setScriptOperationType: (state, scriptOperationType) => { state.scriptOperationType = scriptOperationType; }, - setTriggerFaultCount: (state, device) => { - state.triggerFaultCount++; - state.triggerFaultDevice = device; - }, setTrainingStart: (state, flag) => { state.trainingStart = flag; }, @@ -646,10 +640,6 @@ const training = { setScriptOperationType: ({ commit }, data) => { commit('setScriptOperationType', data); }, - /** 触发故障计数器 */ - setTriggerFaultCount: ({ commit }, device) => { - commit('setTriggerFaultCount', device); - }, /** 运行线 (宁波三号线) */ setRunPathSelected: ({ commit }, runPathList) => { commit('setRunPathSelected', runPathList); diff --git a/src/store/modules/trainingNew.js b/src/store/modules/trainingNew.js index 96d3a9bfe..210444b43 100644 --- a/src/store/modules/trainingNew.js +++ b/src/store/modules/trainingNew.js @@ -103,7 +103,6 @@ const training = { setVoiceStepList: (state, voiceStepList) => { state.voiceStepIndex = 0; state.voiceStepList = voiceStepList; - console.log(voiceStepList, state.voiceStepIndex); }, voiceStepIndexIncrease: (state) => { state.voiceStepIndex++; @@ -115,7 +114,10 @@ const training = { setExamSwitch: (state, flag) => { state.examSwitch = flag; }, - handleStepRecord: (state, { type, stepOperation, operate }) => { + handleStepRecord: (state, { type, stepOperation }) => { + if (!state.stepRecord.length) { + return; + } const step = state.stepRecord[state.stepRecord.length - 1]; if (!step.clientOperations.length || step.clientOperations[step.clientOperations.length - 1].id !== stepOperation.id) { step.clientOperations.push({ id: stepOperation.id }); @@ -198,19 +200,23 @@ const training = { commit('clearVoiceStepList'); }, handleMatchVoice: ({ commit }, info) => { + const stepOperation = Handler.getTrainingOperation(); if (info && info.content === 'true') { const rightMsg = {errMsg: LangStorage.getLang() === 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green'}; commit('setOperateErrMsg', rightMsg); if (Handler.isLastOperation()) { + store.dispatch('trainingNew/handleStepRecord', { type:'OVER', stepOperation }); Handler.nextStep(); commit('clearVoiceStepList'); } else { + store.dispatch('trainingNew/handleStepRecord', { type:'CONTINUE', stepOperation }); commit('clearVoiceStepList'); commit('operateOrderIncrease'); Handler.judgeIsTextSendOperation(); } } else if (info && info.content === 'false') { const errorMsg = {errMsg: LangStorage.getLang() === 'en' ? 'operation mistake!' : '操作错误！', color: 'red'}; + store.dispatch('trainingNew/handleStepRecord', { type:'ERROR', stepOperation }); commit('setOperateErrMsg', errorMsg); Handler.handleVoiceStepList(); } @@ -218,8 +224,8 @@ const training = { setExamSwitch: ({ commit }, flag) => { commit('setExamSwitch', flag); }, - handleStepRecord: ({ commit }, { type, stepOperation, operate }) => { - commit('handleStepRecord', { type, stepOperation, operate }); + handleStepRecord: ({ commit }, { type, stepOperation }) => { + commit('handleStepRecord', { type, stepOperation }); } } }; diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js index 72bb09480..30a61a8ac 100644 --- a/src/utils/subscribeCallback.js +++ b/src/utils/subscribeCallback.js @@ -82,6 +82,10 @@ function handle(data) { case 'Simulation_Control_Pause': // 暂停中 store.dispatch('scriptRecord/updateSimulationPause', msg); break; + case 'Simulation_Operation_Mode_Apply': // 模式转换消息 + console.log('模式转换消息', msg); + store.dispatch('socket/operationModeApply', msg); + break; case 'BROADCAST': // 升级通知消息 Notification.warning({ title: msg.title, diff --git a/src/views/authorityTransfer/distributePackage.vue b/src/views/authorityTransfer/distributePackage.vue index e4e627eb3..1d16a3fcd 100644 --- a/src/views/authorityTransfer/distributePackage.vue +++ b/src/views/authorityTransfer/distributePackage.vue @@ -1,5 +1,5 @@ @@ -28,6 +28,7 @@ export default { ], queryForm: { labelWidth: '80px', + leftSpan: 20, reset: true, queryObject: { name: { @@ -38,6 +39,14 @@ export default { type: 'text', label: 'id' }, + account:{ + type: 'text', + label: '账号' + }, + parentAccount:{ + type: 'text', + label: '父账号' + }, roles: { type: 'select', label: this.$t('system.roles'), @@ -85,6 +94,16 @@ export default { prop: 'id', width: 80 }, + { + title: '账号', + prop: 'account', + width: 80 + }, + { + title: '父账号', + prop: 'parentAccount', + width: 80 + }, { title: this.$t('system.name'), prop: 'name' diff --git a/src/views/newMap/display/chatBox.vue b/src/views/newMap/display/chatBox.vue index 1b1d8a365..d7977446b 100644 --- a/src/views/newMap/display/chatBox.vue +++ b/src/views/newMap/display/chatBox.vue @@ -128,7 +128,7 @@ export default { methods: { scrollTop() { this.$nextTick(() => { - const scrollTop = this.messageList.length * 65 - 250; + const scrollTop = this.messageList.length * 62; document.querySelector('.chat-box-content').scrollTop = scrollTop; }); }, @@ -146,13 +146,11 @@ export default { playAllAudio() { this.$nextTick(function() { this.currentMessage = this.currentAudioList.shift(); - console.log(this.currentMessage, '************'); if (this.currentMessage.type === 'Text') { return; } document.querySelector('#audioPlay').src = this.currentMessage.audioPath; document.querySelector('#audioPlay').play(); - console.log(document.querySelector('#audioPlay'), '--------------'); this.$set(this.currentMessage, 'activeAuto', true); this.play = true; document.querySelector('#audioPlay').onended = () => { diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue index 2e50d5c5a..aefdee3dd 100644 --- a/src/views/newMap/display/exam/examPanel.vue +++ b/src/views/newMap/display/exam/examPanel.vue @@ -35,7 +35,9 @@ v-for="(question, index) in questionList[1]" :key="index" class="item training" - :class="{ current: currentQuestionIndex === index && currentQuestionType === 2 }" + :class="{ current: currentQuestionIndex === index && currentQuestionType === 2, + submited: questionStateList[1][index] + }" @click="questionSelect(index, 2)" > {{ index + 1 }} @@ -99,7 +101,13 @@ export default { trainDetail: data.trainDetail } }; - submitAnswer(postData).then(resp => {}).catch(() => { this.$message.error('记录数据失败！'); }); + + submitAnswer(postData).then(resp => { + this.$set(this.questionStateList[1], this.currentQuestionIndex, true); + console.log(this.questionStateList, '----------------------------'); + }).catch(() => { + this.$message.error('记录数据失败！'); + }); }); }, methods: { @@ -147,7 +155,9 @@ export default { } this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data); await loadPublishTraining(this.$route.query.group, training.questionId, {mode: ''}); - await assignUsersPlayRoles([{userId: this.$store.state.user.id, memberId: this.examSceneRuleMap[training.questionId]}], this.$route.query.group); + if (detailResp.data.type === 'SCENE') { + await assignUsersPlayRoles([{userId: this.$store.state.user.id, memberId: this.examSceneRuleMap[training.questionId]}], this.$route.query.group); + } this.$message.success('加载实训成功！'); } catch (e) { this.$message.error('加载实训失败！'); diff --git a/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue b/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue index 115fbdc8e..4c7c083b5 100644 --- a/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue +++ b/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue @@ -158,7 +158,8 @@ + diff --git a/src/views/newMap/display/terminals/equipmentConstructionTable.vue b/src/views/newMap/display/terminals/equipmentConstructionTable.vue index 87b0a4669..c15b65a48 100644 --- a/src/views/newMap/display/terminals/equipmentConstructionTable.vue +++ b/src/views/newMap/display/terminals/equipmentConstructionTable.vue @@ -89,6 +89,7 @@ - - diff --git a/src/views/newMap/trainTicket/greenLicence.vue b/src/views/newMap/trainTicket/greenLicence.vue deleted file mode 100644 index 74e91c188..000000000 --- a/src/views/newMap/trainTicket/greenLicence.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - diff --git a/src/views/newMap/trainTicket/index.vue b/src/views/newMap/trainTicket/index.vue deleted file mode 100644 index 338b950f4..000000000 --- a/src/views/newMap/trainTicket/index.vue +++ /dev/null @@ -1,342 +0,0 @@ - - - - - diff --git a/src/views/newMap/trainTicket/redLicence.vue b/src/views/newMap/trainTicket/redLicence.vue deleted file mode 100644 index b7db04b4b..000000000 --- a/src/views/newMap/trainTicket/redLicence.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - diff --git a/src/views/newMap/trainTicket/ticketInfo.vue b/src/views/newMap/trainTicket/ticketInfo.vue deleted file mode 100644 index 3cf6d53a3..000000000 --- a/src/views/newMap/trainTicket/ticketInfo.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/src/views/newMap/trainTicket/trainTicket.vue b/src/views/newMap/trainTicket/trainTicket.vue deleted file mode 100644 index e1f159717..000000000 --- a/src/views/newMap/trainTicket/trainTicket.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - - diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue index 7e294e7bf..7d2b1bef4 100644 --- a/src/views/publish/examRule/draft/editRule.vue +++ b/src/views/publish/examRule/draft/editRule.vue @@ -57,7 +57,7 @@ - - - + + + + + + + + +
+ + + + +
+ + + { @@ -220,6 +258,7 @@ export default { this.mapSystemId = row.id; this.ruleForm.name = row.name; this.ruleForm.desc = row.desc || ''; + this.ruleForm.bgUrl = row.bgUrl || ''; this.ruleForm.type = row.paramVO.type; this.typeChange(this.ruleForm.type); this.frontTableData.forEach(item => { @@ -338,7 +377,8 @@ export default { this.ruleForm = { name: '', type: '', - desc: '' + desc: '', + bgUrl: '' }; this.frontTableData = [ { key: 'singleMember', label: '是否单角色', value: false, type: 'checkbox' }, @@ -384,6 +424,7 @@ export default { mapId: this.$route.query.mapId, name: this.ruleForm.name, desc: this.ruleForm.desc, + bgUrl: this.ruleForm.bgUrl, paramVO: { type: this.ruleForm.type, itemMap:itemMap, diff --git a/src/views/trainingPlatform/simulation.vue b/src/views/trainingPlatform/simulation.vue index 16a1d3ef3..c5149acb6 100644 --- a/src/views/trainingPlatform/simulation.vue +++ b/src/views/trainingPlatform/simulation.vue @@ -7,11 +7,21 @@