From 51cfa55f089fd49690b3e02e0c35479c48a65f8c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 18 Aug 2021 16:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E9=81=93=E5=B2=94=E5=8C=BA=E6=AE=B5=E5=BB=B6=E6=97=B6=E8=A7=A3?= =?UTF-8?q?=E9=94=81=20=E9=97=AA=E7=83=81=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Section/index.js | 2 ++ src/jmapNew/shape/graph/Switch/index.js | 4 +-- .../theme/nanjing_02/menus/menuButton.vue | 32 +++++++++---------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index ea430ebac..5053304e7 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -387,6 +387,7 @@ export default class Section extends Group { const switchModel = this.mapDevice[model.relSwitchCode]; const sectionB = this.mapDevice[switchModel.sectionBCode]; const sectionC = this.mapDevice[switchModel.sectionCCode]; + const sectionA = this.mapDevice[switchModel.sectionACode]; if (switchModel && switchModel.normalPosition === 1) { this.setSwitchSectionColor(sectionC, sectionB);// 定位 } else if (switchModel && switchModel.normalPosition === 0 && switchModel.reversePosition === 0 && switchModel.instance && switchModel.instance.switchPosition === 'reverse' && switchModel.fault !== 'SPLIT') { @@ -420,6 +421,7 @@ export default class Section extends Group { } else { 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(); } + if (sectionA && sectionA.instance) { sectionA.instance.line.stopAnimation(true); sectionA.delayUnlock && sectionA.instance.delayUnlock(); } } } } diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js index b819473cd..4485b2d11 100644 --- a/src/jmapNew/shape/graph/Switch/index.js +++ b/src/jmapNew/shape/graph/Switch/index.js @@ -726,9 +726,9 @@ export default class Switch extends Group { if (this.style.Switch.sectionAction.flag && this.model.showMode !== '05') { // 哈尔滨线路处理道岔相关区段颜色 const switchModel = this.mapDevice[model.code]; const sectionB = this.mapDevice[switchModel.sectionBCode]; - sectionB && sectionB.instance && sectionB.instance.setState(sectionB); + sectionB && sectionB.instance && sectionB.instance.handleSwitchSection(sectionB); const sectionC = this.mapDevice[switchModel.sectionCCode]; - sectionC && sectionC.instance && sectionC.instance.setState(sectionC); + sectionC && sectionC.instance && sectionC.instance.handleSwitchSection(sectionC); } model.noStatus && this.setAshShow(); !model.auto && this.artificialArc && this.artificialArc.show(); diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index e70fd78c5..b2d2bbcce 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -1311,23 +1311,23 @@ export default { { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch, isShow: () => this.$store.state.training.prdType == '01' }, - { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: '01'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: '02'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: '03'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType == 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: '04'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.roadType != 'RIGHT' && section.standTrack && this.$store.state.training.prdType == '02' }, + { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Section.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '02' }, - { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, - { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' } + { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutUpStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }, + { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutDownStop.menuButton, disabledCb: (stationControl) => !this.modeMatch, isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' } ]; this.switchParamList = [ { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch},