From 81cdaafa58e96b0c826446a9f6513449f67113ee Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 17 May 2022 10:10:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20=20?= =?UTF-8?q?=E5=88=97=E8=BD=A6=20=E8=BD=A6=E6=AC=A1=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/datie_02.js | 7 ++++--- src/jmapNew/shape/graph/Train/TrainBody.js | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 54623f812..0635ab3e8 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -786,7 +786,7 @@ class SkinCode extends defaultStyle { trainBody: { fontFamily: 'consolas', trainBodyLineWidth: 1, // 车身line宽 - changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 + changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度 specialTrainType: [ { type: '03', @@ -841,8 +841,9 @@ class SkinCode extends defaultStyle { trainServerOffset: { x: 4, y: 4} // 列车服务号偏移 }, trainTarget: { - tripNumberPrefix: '000', // 车次号前缀 - defaultTripNumber: 'DDD', // 默认车次号2 + tripNumberPrefix: '', // 车次号前缀 + // defaultTripNumber: 'DDD', // 默认车次号2 + defaultTripNumber: ' ', // 默认车次号 trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移 trainTargetTextAlign: 'right' // 车次号文字显示位置 }, diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js index 5d9b93d9e..f0638ec8a 100644 --- a/src/jmapNew/shape/graph/Train/TrainBody.js +++ b/src/jmapNew/shape/graph/Train/TrainBody.js @@ -68,13 +68,14 @@ export default class TrainBody extends Group { z: this.model.z + 1, x: parseInt(model.point.x + model.style.Train.trainTarget.trainTargetOffset.x), y: parseInt(model.point.y + model.style.Train.trainTarget.trainTargetOffset.y), - text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length), + text: tripNumber.substring(tripNumber.length - (style.Train.trainTarget.tripNumberPrefix.length || tripNumber.length)), textFill: model.style.Train.trainTarget.fontColor || style.trainTextColor, fontSize: model.style.Train.trainTarget.fontSize || model.fontSize, fontFamily: style.Train.common.fontFamily, textAlign: 'left', textVerticalAlign: 'top' }); + // console.log(model.fontSize, tripNumber.length - (style.Train.trainTarget.tripNumberPrefix.length || tripNumber.length), tripNumber, tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length || tripNumber.length); this.textTrainTarget = new ETextName({ zlevel: model.zlevel, z: model.z + 1, From 4da6ce092d65e0fece154ec4007f5a24e7c38fd9 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 17 May 2022 16:32:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E9=9D=9E=E5=B8=B8=E7=AB=99=E6=8E=A7=20?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=20=E5=85=81=E8=AE=B8=E8=87=AA=E5=BE=8B=20?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/datie_02.js | 4 +- src/jmapNew/shape/graph/Station/index.js | 6 +++ .../theme/components/utils/menuOperate.js | 7 ++- .../datie_02/menus/dialog/addSpareTrain.vue | 2 +- .../theme/datie_02/menus/menuStation.vue | 51 +++++++++++++++++++ src/scripts/cmdPlugin/CommandEnum.js | 3 +- src/scripts/cmdPlugin/OperationHandler.js | 11 ++++ 7 files changed, 80 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/config/skinCode/datie_02.js b/src/jmapNew/config/skinCode/datie_02.js index 0c281e886..bcc6fa50e 100644 --- a/src/jmapNew/config/skinCode/datie_02.js +++ b/src/jmapNew/config/skinCode/datie_02.js @@ -437,7 +437,9 @@ class SkinCode extends defaultStyle { selfDiscipline: { show: true, offset: { x: 0, y: 0 }, - text: '允许自律' + text: '允许自律', + defaultColor: '#7F7F7F', + lightColor: '#ff0', }, selfDisciplineControl: { show: true, diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index fb4395d2c..4c91004de 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -675,6 +675,7 @@ export default class Station extends Group { this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.stationControlCC && this.stationControlCC.setStyle({text:'EL', textFill:this.style.Station.StationControl.text.emergencyControlColor}); this.veryControl && this.veryControl.setColor(this.style.Station.StationControl.veryControl.defaultColor); + 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 }); if (this.style.Station.stationText.isSpecialType) { @@ -705,6 +706,7 @@ export default class Station extends Group { model.controller && this.handleComplexControl(model.controller); model.emergencyController != undefined && this.handleEmergencyChange(model.emergencyController); model.controlApplicant && this.handleControlApplicant(model); + model.allowAutonomy && this.handleAllowAutonomy(); if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller || model.emergencyController != undefined) && model.centralized) { model.chargeStationCodeList.forEach(item => { const device = store.getters['map/getDeviceByCode'](item); @@ -736,6 +738,10 @@ export default class Station extends Group { this.controlPreReset && this.controlPreReset.setColor('#f00'); } + handleAllowAutonomy() { + this.selfDiscipline && this.selfDiscipline.setColor(this.style.Station.StationControl.selfDiscipline.lightColor); + } + handleControlApplicant(model) { if (this.style.Station.stationText.isSpecialType) { const memberData = store.state.training.memberData; diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 0ee4473d5..a5f912339 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -353,6 +353,11 @@ export const menuOperate = { // 设置折返策略 operation: OperationEvent.Station.setBackStrategy.menu.operation, cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY + }, + requestVeryControl:{ + // 非常站控 大铁线路 + operation: OperationEvent.StationControl.requestVeryControl.menu.operation, + cmdType:CMD.ControlConvertMenu.CMD_CM_SPECIAL_STATION_CONTROL } }, TrainWindow: { @@ -499,7 +504,7 @@ export const menuOperate = { } }, CTC: { - //接预 + // 接预 receivingNotice: { operation: OperationEvent.CTCCommand.receivingNotice.menu.operation, cmdType: CMD.CTC.CTC_RECEIVING_NOTICE diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue index f183f818d..7a47b6c24 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue @@ -15,7 +15,7 @@ 上下行 - +
{{ messageTip1 }}
 diff --git a/src/jmapNew/theme/datie_02/menus/menuStation.vue b/src/jmapNew/theme/datie_02/menus/menuStation.vue index 34cceb178..0dec74176 100644 --- a/src/jmapNew/theme/datie_02/menus/menuStation.vue +++ b/src/jmapNew/theme/datie_02/menus/menuStation.vue @@ -4,6 +4,7 @@ + @@ -17,6 +18,9 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault'; import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; +import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; +// import Handler from '@/scripts/cmdPlugin/Handler'; +import PasswordBox from './dialog/childDialog/passwordInputBox.vue'; export default { name: 'StationMenu', @@ -24,6 +28,7 @@ export default { PopMenu, SetFault, NoticeInfo, + PasswordBox, DrawSelect }, mixins: [ @@ -92,6 +97,13 @@ export default { } else { this.doClose(); } + }, + '$store.state.menuOperation.selectedCount': function (val) { + const selected = this.$store.state.menuOperation.selected; + const subtype = this.$store.state.menuOperation.subType; + if (subtype == 'veryControlButton' && selected._type == 'Station') { + this.veryControlClick(selected); + } } }, methods: { @@ -156,6 +168,45 @@ export default { handlerOpenPdf(elem) { const url = `https://joylink.club/oss/projects/wjls/${this.selected.jp}/${elem.file}`; window.open(url, '_blank'); + }, + // 非常站控 + veryControlClick(selected) { + // stationCode车站编号、pressDown：1按下、0抬起 + const pressDown = selected.controlMode == 'Interlock' ? 0 : 1; + commitOperate(menuOperate.StationControl.requestVeryControl, { stationCode: selected.code, pressDown:pressDown }, 0).then(({valid, operate}) => { + if (valid) { + operate.nextCmdType = CMD.ControlConvertMenu.CMD_CM_SPECIAL_STATION_CONTROL; + operate['operateNext'] = OperationEvent.Command.close.password.operation; + this.$refs.password.doShow(operate); + } + }).catch(error=>{ + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + clearOperate() { // 清除操作 + // Handler.clear(); // 清空操作组 + // this.$store.dispatch('menuOperation/setButtonOperation', null); + }, + // 输入密码正确回调 + passWordCommit(data) { + let operate = {}; + if (data.nextCmdType) { + operate = { + over: true, + operation: data.operation, + cmdType: data.nextCmdType, + param: data.param + }; + } + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + } + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); } } }; diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 6c247a169..301f06022 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -66,7 +66,8 @@ export default { /** 回复中控请求（同意/拒绝） */ CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'}, CMD_CM_RECEIVE_CONTROL: {value:'CM_Receive_Control', label: '接收控制'}, - CMD_CM_SURRENDER_CONTROL: {value:'CM_Surrender_Control', label: '交出控制'} + CMD_CM_SURRENDER_CONTROL: {value:'CM_Surrender_Control', label: '交出控制'}, + CMD_CM_SPECIAL_STATION_CONTROL:{value:'CM_Special_Station_Control', label: '非常站控'} }, // 司机操作 diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index e7d4a9681..fa99f3f2a 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1293,6 +1293,17 @@ export const OperationEvent = { operation: '2054', domId: '_Tips-Control-Response-Refuse' } + }, + // 非常站控 大铁线路 + requestVeryControl:{ + menu: { + operation: '206', + domId: '_Tips-Request-Very-Control-Menu' + }, + menuButton: { + operation: '2061', + domId: '_Tips-Request-Very-Control-Menu-Button{BOTTOM}' + } } }, From 90e26a800c18d87c1db2160e4485061042067f68 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 18 May 2022 17:09:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20=E4=B8=8A=E7=94=B5=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/datie_02/menus/menuButton.vue | 55 +++++++++++++------ src/scripts/cmdPlugin/CommandEnum.js | 5 +- src/scripts/cmdPlugin/OperationHandler.js | 7 +++ 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue index b8d1f923d..ccd499234 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue @@ -86,9 +86,9 @@
S引导总锁
- @@ -98,9 +98,10 @@
辅助菜单
- @@ -206,12 +207,12 @@ export default { Command() { return OperationEvent.Command; }, - sGuideMasterLock() { - return this.$store.state.map.stationSGuideMasterLock; - }, - xGuideMasterLock() { + sGuideMasterLock() { + return this.$store.state.map.stationSGuideMasterLock; + }, + xGuideMasterLock() { return this.$store.state.map.stationXGuideMasterLock; - }, + }, isShowBtn() { return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10'; }, @@ -271,12 +272,12 @@ export default { this.deviceList = []; } }, - '$store.state.map.showCentralizedStationCode': function(val) { - if (val){ - const station = this.$store.getters['map/getDeviceByCode'](val); - this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock); - } - }, + '$store.state.map.showCentralizedStationCode': function(val) { + if (val) { + const station = this.$store.getters['map/getDeviceByCode'](val); + this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock); + } + } }, beforeDestroy() { this.routeDataMap = null; @@ -338,6 +339,26 @@ export default { } } }, + // 上电解锁 大铁线路 + powerOnUnlockRailroad() { + const operate = { + over:true, + operation:this.Station.powerOnUnlockRailroad.menuButton.operation, + cmdType:CMD.Station.CMD_STATION_POWER_ON_UNLOCK_RAILROAD, + code:this.$store.state.map.showCentralizedStationCode, + param:{stationCode: this.$store.state.map.showCentralizedStationCode} + }; + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { + if (valid) { + this.clearOperate(); + } else { + this.$refs.noticeInfo.doShow(); + } + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, // S引导总锁按钮点击 guideLockLeftButtonDown() { const operate = { @@ -346,7 +367,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { // 引导总锁弹出 调用取消引导总锁指令 - operate.nextCmdType = this.sGuideMasterLock? CMD.Station.CMD_STATION_MASTER_UNLOCK:CMD.Station.CMD_STATION_MASTER_LOCK; + operate.nextCmdType = this.sGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK; operate.param = {throat: 'S', stationCode: this.$store.state.map.showCentralizedStationCode}; this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); operate['operateNext'] = this.Command.close.password.operation; @@ -362,7 +383,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { // 引导总锁弹出 调用取消引导总锁指令 - operate.nextCmdType = this.xGuideMasterLock? CMD.Station.CMD_STATION_MASTER_UNLOCK:CMD.Station.CMD_STATION_MASTER_LOCK; + operate.nextCmdType = this.xGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK; operate.param = {throat: 'X', stationCode: this.$store.state.map.showCentralizedStationCode}; this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); operate['operateNext'] = this.Command.close.password.operation; diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 301f06022..c127f1307 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -292,7 +292,10 @@ export default { /** 引导总锁 */ CMD_STATION_MASTER_LOCK: {value: 'Station_Master_Lock', label: '设置引导总锁'}, /** 取消引导总锁 */ - CMD_STATION_MASTER_UNLOCK: {value: 'Station_Master_Unlock', label: '取消引导总锁'} + CMD_STATION_MASTER_UNLOCK: {value: 'Station_Master_Unlock', label: '取消引导总锁'}, + /** 上电解锁 大铁线路 */ + CMD_STATION_POWER_ON_UNLOCK_RAILROAD:{value:'Station_Power_On_Unlock_Railroad', label: '上电解锁(大铁)'} + }, Train: { /** 人工限速行驶 */ diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index fa99f3f2a..53ed8fcb5 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -2987,6 +2987,13 @@ export const OperationEvent = { operation: '6212', domId: '_Tips-Station-stationMasterLock-rightButton' } + }, + // 上电解锁 大铁线路 Station_Power_On_Unlock_Railroad + powerOnUnlockRailroad:{ + menuButton: { + operation: '622', + domId: '_Tips-Station-powerOnUnlockRailroad' + }, } }, From fc8359273de44d1bb174412379f8eb88bd357eb5 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 18 May 2022 17:42:16 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=86=E8=B7=AF=E4=B8=8D=E8=89=AF=20?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/menuButton.vue | 8 +++++--- src/scripts/cmdPlugin/CommandEnum.js | 5 ++++- src/scripts/cmdPlugin/OperationHandler.js | 14 +++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue index ccd499234..84311dcd2 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue @@ -98,8 +98,7 @@
辅助菜单
- -