From cf871345e3f9853bfb74098b0750da7f97699730 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 22 Jan 2021 19:52:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=8D=97=E4=BA=AC?= =?UTF-8?q?=E4=BA=8C=E5=88=97=E8=BD=A6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing_02/menus/dialog/trainControl.vue | 12 ++++++------ .../theme/nanjing_02/menus/menuButton.vue | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue index 11ee4744d..78b4ed949 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue @@ -154,12 +154,12 @@ export default { watch:{ '$store.state.menuOperation.selectedCount':function(em) { const device = this.$store.state.menuOperation.selected; - if (device && device.code && device.deviceType === 'TRAIN') { - this.tempTableData = [device]; - this.sectionCode = device.sectionModel.name; - this.tripNum = device.destinationCode + device.serviceNumber + (device.tripNumber.substring(1)); - this.groupNum = device.groupNumber; - } + // if (device && device.code && device.deviceType === 'TRAIN') { + // this.tempTableData = [device]; + // this.sectionCode = device.sectionModel.name; + // this.tripNum = device.destinationCode + device.serviceNumber + (device.tripNumber.substring(1)); + // this.groupNum = device.groupNumber; + // } } }, mounted() { diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 9e76cdd04..f3eaea535 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -847,14 +847,14 @@ export default { handleTrainParam() { if (this.selectedObj.type === '01') { this.formModelSectionName = this.selectedObj.name; - this.$store.state.map.activeTrainList.forEach(trainCode => { - const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); - if (trainModel && trainModel.physicalCode === this.selectedObj.code) { - this.formModelTripNum = trainModel.serviceNumber + trainModel.destinationCode + (trainModel.tripNumber.substring(1)); - this.trainModel = trainModel; - this.formModelNewTrip = ''; - } - }); + // this.$store.state.map.activeTrainList.forEach(trainCode => { + // const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); + // if (trainModel && trainModel.physicalCode === this.selectedObj.code) { + // this.formModelTripNum = trainModel.serviceNumber + trainModel.destinationCode + (trainModel.tripNumber.substring(1)); + // this.trainModel = trainModel; + // this.formModelNewTrip = ''; + // } + // }); } }, pushTempData(list) { From e574bcf2eb83e59a1f3180284ce3ca7aa1cf7b9b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 22 Jan 2021 21:14:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=97=E4=BA=8C=20=E6=8C=A4=E5=B2=94?= =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/nanjing_02/menus/menuButton.vue | 2 +- src/scripts/cmdPlugin/CommandEnum.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index f3eaea535..05848da97 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -1008,7 +1008,7 @@ export default { { name: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.locate.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '强行转岔', cmdType: CMD.Switch.CMD_SWITCH_FORCE_TURN, operate: OperationEvent.Switch.locate.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, { name: '强解道岔', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, - { name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, + { name: '挤岔恢复', cmdType: CMD.Switch.CMD_SWITCH_SQUEEZE_RECOVERY, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch || selectedObj.fault !== 'SQUEEZE' }, { name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch }, { name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, { name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 3628c76db..eb9f383ec 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -37,7 +37,9 @@ export default { /** 道岔区段解封 */ CMD_SWITCH_SECTION_UNBLOCK: {value: 'Switch_Section_Unblock', label: '道岔区段解封'}, /** 道岔钩锁 **/ - CMD_SWITCH_HOOK_LOCK:{value:'Switch_Hook_Lock', label:'道岔钩锁'} + CMD_SWITCH_HOOK_LOCK:{value:'Switch_Hook_Lock', label:'道岔钩锁'}, + /** 挤岔恢复 */ + CMD_SWITCH_SQUEEZE_RECOVERY: {value: 'Switch_Squeeze_Recovery', label: '挤岔恢复'} }, // 控制模式操作 From a55f69a3cbf30db22de9132310acad584883e2f7 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 22 Jan 2021 21:28:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E5=BB=B6=E6=97=B6=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 52ec4cf6e..3554e6522 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -349,8 +349,8 @@ export default class Section extends Group { ]); } } else { - if (sectionB && sectionB.instance) { sectionB.instance.line.stopAnimation(true); } - if (sectionC && sectionC.instance) { sectionC.instance.line.stopAnimation(true); } + if (sectionB && sectionB.instance) { sectionB.instance.line.stopAnimation(true); sectionB.delayUnlock && sectionB.instance.delayUnlock(); } + if (sectionC && sectionC.instance) { sectionC.instance.line.stopAnimation(true); sectionC.delayUnlock && sectionB.instance.delayUnlock(); } } } }