From ddfddfa292713428e6e1e89be6db95917eeb9085 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 14 May 2021 15:05:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=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/map.js | 1 - src/jmapNew/painter.js | 5 +- src/jmapNew/shape/Train/index.js | 1 - .../theme/haerbin_01/menus/menuButton.vue | 108 ++++---- .../nanjing_02/menus/dialog/mapVisual.vue | 255 ++++++++++++++++++ .../theme/nanjing_02/menus/dialog/rps.vue | 95 +++++++ .../theme/nanjing_02/menus/menuBar.vue | 125 ++++++--- .../theme/nanjing_02/menus/menuButton.vue | 160 +++++++---- src/scripts/cmdPlugin/CommandEnum.js | 8 +- src/scripts/cmdPlugin/OperationHandler.js | 12 + src/store/modules/map.js | 3 + src/utils/baseUrl.js | 4 +- .../newMap/mapsystemNew/common/index.vue | 16 +- 13 files changed, 637 insertions(+), 156 deletions(-) create mode 100644 src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue create mode 100644 src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 6a24d028d..8bd2b7f69 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -500,7 +500,6 @@ class Jlmap { oDevice['cutOff'] = sectionA.cutOff; } } - this.$painter.update(oDevice); } else if (elem.deviceType == 'SECTION') { const oDevice = this.mapDevice[code]; diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js index 5f0c5edd2..5f8c3c671 100644 --- a/src/jmapNew/painter.js +++ b/src/jmapNew/painter.js @@ -6,6 +6,7 @@ import transitionDeviceStatus from './constant/stateTransition'; import shapefactory from './shape/factory'; import TransformHandle from './transformHandle'; import TransformHandleScreen from './transformHandleScreen'; +import deviceRender from './constant/deviceRender'; class Painter { constructor(jmap) { @@ -136,6 +137,8 @@ class Painter { const overlapTrainList = this.checkTrainOverlap(device); overlapTrainList.forEach((item, index) => { const trainDevice = this.$jmap.getDeviceByCode(item); + trainDevice._type = deviceRender['Train']._type; + trainDevice.zlevel = deviceRender['Train'].zlevel; trainDevice.overLapIndex = index; trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance); this.add(trainDevice); @@ -223,7 +226,7 @@ class Painter { getShapeTipPoint(instance, opts) { if (instance) { var point = instance.getShapeTipPoint(opts); - if (point) { + if (point) { // 矩阵变换 var transPoint = instance.transformCoordToGlobal(point.x, point.y); return { diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index 477a0ef64..db5c0e5bf 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -60,7 +60,6 @@ export default class Train extends Group { this._computed(); const model = this.model; const style = this.style; - if (this.point) { this.trainB = new TrainBody({ zlevel: this.zlevel, diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 411b27c86..38b15bb1f 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -76,9 +76,9 @@
- 车次号修改 - 车次号删除 - 车次号创建 + 车次号修改 + 车次号删除 + 车次号创建 车次号步进
@@ -100,22 +100,29 @@
车次号 - + + + + 轨道号 - + 新车次号 + + 新车组号 + +
- 执行 + 执行 退出
@@ -200,7 +207,9 @@ export default { formModelTripNum: '', formModelSectionName: '', formModelNewTrip: '', - speedShowCon: false + formModelNewGroup: '', + speedShowCon: false, + trainOperateType: '' }; }, computed: { @@ -225,6 +234,10 @@ export default { }, speedShow() { return (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) && this.speedShowCon; + }, + trainCommitDisabled() { + return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) || + (this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete'); } }, watch: { @@ -363,6 +376,9 @@ export default { } } }, + handleTrainOperate(type) { + this.trainOperateType = type; + }, getStationControl(selected) { let control; if (selected._type == 'StationStand') { @@ -641,15 +657,7 @@ export default { this.param.routeCodeList = routeCodeList; } if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) { - if (this.selectedObj.centralized) { - this.param = { stationCode: this.selectedObj.code }; - } else { - this.stationList.forEach(station => { - if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) { - this.param = { stationCode: station.code }; - } - }); - } + this.param = { stationCode: this.selectedObj.code }; } if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) { this.param.speedLimitValue = this.speedLimitValue; @@ -745,19 +753,16 @@ export default { handleTrainParam() { if (this.selectedObj.type === '01') { this.formModelSectionName = this.selectedObj.name; + this.trainOperateType = ''; 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)); + if (trainModel && trainModel.sectionCode === this.selectedObj.code) { + this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); this.trainModel = trainModel; this.formModelNewTrip = ''; } }); } - // this.trainModel = this.selectedObj; physicalCode - // this.formModelTripNum = this.trainModel.destinationCode + this.trainModel.serviceNumber + this.trainModel.tripNumber; - // this.formModelSectionName = this.trainModel.sectionModel.name; - // this.formModelNewTrip = ''; }, setSpeedLimitValue(val) { this.speedLimitValue = val; @@ -768,34 +773,47 @@ export default { this.formModelTripNum = ''; this.formModelSectionName = ''; this.formModelNewTrip = ''; + this.formModelNewGroup = ''; + this.trainOperateType = ''; this.trainOperationShow = flag; } }, trainCommit() { - if (this.formModelNewTrip && this.formModelNewTrip.length === 9) { - const params = { - groupNumber: this.trainModel.groupNumber, - tripNumber: this.formModelNewTrip.slice(6, 9), - serviceNumber: this.formModelNewTrip.slice(3, 6) - }; - const step = { - over: true, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN, - operation: OperationEvent.Train.setPlanTrainId.menu.operation, - param: params - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.changeShowMode(true); - } - }).catch((error) => { - console.error(error); - this.$refs.noticeInfo.doShow(); - }); - } else { - this.$refs.noticeInfo.doShow('请输入正确的车次号'); + const params = {}; + const step = { + over: true + }; + if (this.trainOperateType === 'update') { + params.groupNumber = this.trainModel.groupNumber; + params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 5); + params.tripNumber = '0' + this.formModelNewTrip.slice(5, 7); + step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN; + step.operation = OperationEvent.Train.setPlanTrainId.menu.operation; + step.param = params; + } else if (this.trainOperateType === 'create') { + params.sectionCode = this.selectedObj.code; + params.groupNumber = this.formModelNewGroup; + params.dn = this.formModelNewTrip.slice(0, 3); + params.sn = '0' + this.formModelNewTrip.slice(3, 5); + params.tn = '0' + this.formModelNewTrip.slice(5, 7); + step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE; + step.operation = OperationEvent.Train.addTrainId.menu.operation; + step.param = params; + } else if (this.trainOperateType === 'delete') { + params.groupNumber = this.trainModel.groupNumber; + step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE; + step.operation = OperationEvent.Train.delTrainId.menu.operation; + step.param = params; } + this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.changeShowMode(true); + } + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); }, initMenus() { this.basicParamList = this.$store.state.training.prdType === '01' ? [ diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue new file mode 100644 index 000000000..9f1c44d2c --- /dev/null +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/mapVisual.vue @@ -0,0 +1,255 @@ + + + + diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue new file mode 100644 index 000000000..a3d4b8efd --- /dev/null +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue @@ -0,0 +1,95 @@ + + + + diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue index ca79345ce..e16619f31 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue @@ -62,8 +62,8 @@ - -
+ +
{{ `${tipContent[0].level}` }}
@@ -81,53 +81,86 @@
{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}
 - -
系统
-
联锁
-
列监
-
站控
-
车场
-
编表
-
车辆段
- - -
轨道
-
调度
-
录放
-
管理
-
列车信息
-
职权
-
- +
+ + + + + + + +
+
背投
+
车场
+
轨道
+
系统
+
列车
+
+
+
联锁
+
列监
+
运图
+
时刻表
+
编表
+
调度
+
站控
+
计划
+
+
+
SDM
+
+
+
管理员
+
职权
+
+
+
拷屏
+
录放
+
布局
+
+
+ + + + + + + + +
- +
- -
A
-
B
-
C
- - - -
报警
-
运图
+ + + +
A
+
B
+
C
+ + + +
报警
+
运图
+ + + +
静音
+ -
报表
-
时刻表
+
档案
+
归档
+
统计
- - - -
考评
-
日志
- + + -
锁屏
-
退出
+
锁屏
+
退出
 @@ -136,6 +169,7 @@ + @@ -151,6 +185,7 @@ import BuzzerAudio from '@/assets/buzzer.mp3'; import AlarmTableHmi from './menuDialog/alarmTableHmi'; import AlarmTableLow from './menuDialog/alarmTableLow'; import TrainControl from './dialog/trainControl'; +import RpsDialog from './dialog/rps'; import LogDetail from './menuDialog/logDetail'; export default { @@ -159,7 +194,8 @@ export default { AlarmTableLow, AlarmTableHmi, TrainControl, - LogDetail + LogDetail, + RpsDialog }, props: { selected: { @@ -443,6 +479,9 @@ export default { trainControlShow() { this.$refs.trainControl.doShow(); }, + rpsClick() { + this.$refs.rpsDialog.doShow(); + }, controlAudio(val) { const audio = document.getElementById('buzzer'); this.sound = val; @@ -665,9 +704,9 @@ export default { width: 80px; } .tip-content-box{ - height: 20px; + height: 30px; width: 100%; - line-height: 20px; + line-height: 30px; background: #001528; color: #C20F29; font-size: 14px; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 5830075d5..591cd191e 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -49,7 +49,7 @@ 取消
-
+
{{ el.commandTip || el.name }}
@@ -59,9 +59,9 @@
- 车次号修改 - 车次号删除 - 车次号创建 + 车次号修改 + 车次号删除 + 车次号创建 车次号步进
@@ -83,22 +83,29 @@
车次号 - + + + + 轨道号 - + 新车次号 + + 新车组号 + +
- 执 行 + 执 行 取 消
@@ -267,6 +274,7 @@ export default { selectedObj: null, oldClickObj: null, // 上一次点击对象 route: null, // 进路对象 + overlap: null, // 延续保护 selectRouteList: [], menuCmdList: new Array(15).fill({}), ciStationParamList: [], @@ -290,6 +298,8 @@ export default { formModelTripNum: '', formModelSectionName: '', formModelNewTrip: '', + formModelNewGroup: '', + trainOperateType: '', dialogVisible: false, tipList: [], modeMatch: false, @@ -312,7 +322,9 @@ export default { ...mapGetters('map', [ 'routeList', 'stationList', - 'routeData' + 'routeData', + 'overlapList', + 'overlapData' ]), commandId() { return OperationEvent.Command.commandHaerbin.confirm.domId; @@ -349,6 +361,10 @@ export default { }, menuPosition() { return this.$store.state.menuOperation.menuPosition; + }, + trainCommitDisabled() { + return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) || + (this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete'); } }, watch: { @@ -449,6 +465,9 @@ export default { } } }, + handleTrainOperate(type) { + this.trainOperateType = type; + }, initCentralizedStationList(list) { const stationContorl = this.stationContorl; this.menuCmdList = new Array(15).fill({}); @@ -577,13 +596,25 @@ export default { return control; }, selectRouteParam(code) { - this.route = this.routeData[code]; - if (this.route) { - this.param = { - routeCode: this.route.code - }; + if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) { + this.overlap = this.overlapData[code]; + if (this.overlap) { + this.param = { + signalCode: this.selectedObj.code, + overlapCode: this.overlap.code + }; + this.canCommand = false; + } + } else { + this.route = this.routeData[code]; + if (this.route) { + this.param = { + routeCode: this.route.code + }; + } + this.initCentralizedStationList(this.routeParamList); } - this.initCentralizedStationList(this.routeParamList); + }, handleSwicthMenu() { // 转换底部道岔菜单栏 // 获取道岔相关区段显示高亮 @@ -783,11 +814,20 @@ export default { if (row.commandTip) { EventBus.$emit('sendMsg', {message: row.commandTip}); } + if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) { + const overlapList = []; + this.overlapList.forEach(item => { + if (item.signalCode === this.selectedObj.code) { + overlapList.push(item); + } + }); + this.tempData = [...overlapList]; + } if (this.tempData.length) { this.operate = row.operate.operation; this.cmdType = row.cmdType; - this.canCommand = false; + this.canCommand = row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP; step.operation = this.operate; if (row.next) { @@ -921,6 +961,7 @@ export default { this.securityCommand = ''; this.speedLimitValue = ''; this.secondConfirm = false; + this.overlap = null; this.cr1Confrim = false; if (this.oldClickObj) { this.deviceHighLight(this.oldClickObj, false); @@ -948,14 +989,15 @@ 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.trainOperateType = ''; + this.$store.state.map.activeTrainList.forEach(trainCode => { + const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); + if (trainModel && trainModel.sectionCode === this.selectedObj.code) { + this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); + this.trainModel = trainModel; + this.formModelNewTrip = ''; + } + }); } }, pushTempData(list) { @@ -970,38 +1012,50 @@ export default { this.formModelTripNum = ''; this.formModelSectionName = ''; this.formModelNewTrip = ''; + this.formModelNewGroup = ''; + this.trainOperateType = ''; this.trainOperationShow = flag; } }, trainCommit() { - if (this.formModelNewTrip && this.formModelNewTrip.length === 9) { - const params = { - groupNumber: this.trainModel.groupNumber, - tripNumber: this.formModelNewTrip.slice(6, 9), - serviceNumber: this.formModelNewTrip.slice(3, 6) - }; - const step = { - over: true, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN, - operation: OperationEvent.Train.setPlanTrainId.menu.operation, - param: params - }; - this.$store.dispatch('training/nextNew', step).then(({ valid }) => { - if (valid) { - this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.changeShowMode(true); - } - }).catch((error) => { - console.error(error); - if (error && error.code == '10017') { - EventBus.$emit('sendMsg', {message: error.message}); - } else { - EventBus.$emit('sendMsg', {message: '命令执行失败！'}); - } - }); - } else { - EventBus.$emit('sendMsg', {message: '请输入正确的车次号'}); + const params = {}; + const step = { + over: true + }; + if (this.trainOperateType === 'update') { + params.groupNumber = this.trainModel.groupNumber; + params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 5); + params.tripNumber = '0' + this.formModelNewTrip.slice(5, 7); + step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN; + step.operation = OperationEvent.Train.setPlanTrainId.menu.operation; + step.param = params; + } else if (this.trainOperateType === 'create') { + params.sectionCode = this.selectedObj.code; + params.groupNumber = this.formModelNewGroup; + params.dn = this.formModelNewTrip.slice(0, 3); + params.sn = '0' + this.formModelNewTrip.slice(3, 5); + params.tn = '0' + this.formModelNewTrip.slice(5, 7); + step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE; + step.operation = OperationEvent.Train.addTrainId.menu.operation; + step.param = params; + } else if (this.trainOperateType === 'delete') { + params.groupNumber = this.trainModel.groupNumber; + step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE; + step.operation = OperationEvent.Train.delTrainId.menu.operation; + step.param = params; } + this.$store.dispatch('training/nextNew', step).then(({ valid }) => { + if (valid) { + this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); + this.changeShowMode(true); + } + }).catch((error) => { + if (error && error.code == '10017') { + EventBus.$emit('sendMsg', {message: error.message}); + } else { + EventBus.$emit('sendMsg', {message: '命令执行失败！'}); + } + }); }, stationToCommand() { const step = { @@ -1067,7 +1121,7 @@ export default { this.basicParamList = this.$store.state.training.prdType === '01' ? [ { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, - { name: '释放指令', commandTip: '释放指令', cmdType: '', operate: '', fillStationCode: true, disabledCb: (stationControl) => true }, + { name: '释放指令', commandTip: '释放指令', cmdType: CMD.Station.CMD_STATION_RELEASE, operate: OperationEvent.Station.stationRelease.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, { name: '重启令解', commandTip: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate: OperationEvent.Station.stationRestart.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, @@ -1144,7 +1198,7 @@ export default { { name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl) => !this.modeMatch }, - { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ] : [ { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl) => !this.modeMatch }, @@ -1160,7 +1214,7 @@ export default { { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }, { name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, - { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch }, + { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch } ]; this.stationParamList = this.$store.state.training.prdType === '01' ? [ diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 7b9b1f3ff..ddcb79fa9 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -124,7 +124,9 @@ export default { /** 取消自动折返 */ CMD_SIGNAL_CANCEL_AUTO_TURN_BACK: {value: 'Signal_Cancel_Auto_Turn_Back', label: '取消自动折返'}, /** 信号机总取消 */ - CMD_SIGNAL_TOTAL_CANCLE:{value:'Signal_Total_Cancel', label: '信号机总取消'} + CMD_SIGNAL_TOTAL_CANCLE:{value:'Signal_Total_Cancel', label: '信号机总取消'}, + /** 设置保护 */ + CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'} }, // 物理区段操作 @@ -263,7 +265,9 @@ export default { /** 取消计轴预复位 */ CMD_STATION_CANCEL_PRE_RESET: {value: 'Station_Cancel_Pre_Reset', label: '取消计轴预复位'}, /** 重启联锁机 */ - CMD_STATION_RESTART_INTERLOCK_MACHINE: {value: 'Station_Restart_Interlock_Machine', label: '重启联锁机'} + CMD_STATION_RESTART_INTERLOCK_MACHINE: {value: 'Station_Restart_Interlock_Machine', label: '重启联锁机'}, + /** 释放指令 */ + CMD_STATION_RELEASE : {value:'Station_Release', label: '释放指令' } }, // 列车 diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index f90e03a79..ef179e472 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -1697,6 +1697,12 @@ export const OperationEvent = { operation: '3201', domId: '_Tips-Signal-cancelinterlock-Menu{BOTTOM}' } + }, + setOverlap: { + menuButton: { + operation: '3211', + domId: '_Tips-Signal-setOverlap-Menu{BOTTOM}' + } } }, @@ -2761,6 +2767,12 @@ export const OperationEvent = { operation: '619', domId: '_Tips-Station-restartInterlockMachine-Menu' } + }, + stationRelease: { + menuButton: { + operation: '620', + domId: '_Tips-Station-stationRelease' + } } }, diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 0d10ac1a8..2f9956cc3 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -261,6 +261,9 @@ const map = { routeData: (state) => { return state.routeData; }, + overlapList: (state) => { + return state.overlapList; + }, overlapData: (state) => { return state.overlapData; }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 11702c286..aa7bf7e1b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 - // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 + BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 // BASE_API = 'http://192.168.3.120:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index aa54917f4..2e66ecdf4 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -136,8 +136,8 @@ export default { menu = getDeviceMenuByDeviceType('StationControl'); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); this.$store.dispatch('training/emitTipFresh'); - device = this.getDeviceByEm(em); - this.selected = { ...device, _event: MouseEvent.Right}; + device = this.getDeviceByEm(em); + this.selected = { ...device, _event: MouseEvent.Right}; return; } else if (em.subType == 'light' && em.deviceType == 'Station') { // 宁波一号线右键显示强制点灯 const equipment = this.getDeviceByEm(em); @@ -145,8 +145,8 @@ export default { menu = getDeviceMenuByDeviceType('StationLight'); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); this.$store.dispatch('training/emitTipFresh'); - device = this.getDeviceByEm(em); - this.selected = { ...device, _event: MouseEvent.Right}; + device = this.getDeviceByEm(em); + this.selected = { ...device, _event: MouseEvent.Right}; return; } else if (em.subType == 'preReset' && em.deviceType == 'Station') { // 宁波一号线右键显示计轴复位 const equipment = this.getDeviceByEm(em); @@ -154,19 +154,19 @@ export default { menu = getDeviceMenuByDeviceType('StationPreReset'); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); this.$store.dispatch('training/emitTipFresh'); - device = this.getDeviceByEm(em); - this.selected = { ...device, _event: MouseEvent.Right}; + device = this.getDeviceByEm(em); + this.selected = { ...device, _event: MouseEvent.Right}; return; } else if (em.subType == 'enabled' && em.deviceType == 'Switch') { menu = getDeviceMenuByDeviceType('Enabled'); - this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); + this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); device = this.getDeviceByEm(em); this.selected = { ...device, _event: MouseEvent.Right}; return; } else if (em.subType === 'enabled' && em.deviceType === 'Signal') { menu = getDeviceMenuByDeviceType('Enabled'); - this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); + this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu}); device = this.getDeviceByEm(em); this.selected = { ...device, _event: MouseEvent.Right}; From 69c65265160cbca9987f12e13927523c5d9c326b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 14 May 2021 15:59:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Bug260=20=E3=80=81Bug261=E3=80=81=E9=83=91?= =?UTF-8?q?=E5=B7=9E=E5=85=B1=E8=B5=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 --- .../theme/haerbin_01/menus/menuButton.vue | 22 +++++++++---------- .../theme/nanjing_02/menus/menuButton.vue | 22 +++++++++---------- src/scripts/ProjectConfig.js | 18 ++++++++++++--- src/views/drts/scene/trainingResult.vue | 7 +----- .../newMap/mapsystemNew/common/index.vue | 2 ++ 5 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index 38b15bb1f..a8a0d65cf 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -751,18 +751,16 @@ export default { this.clearAllMenuShow(); }, handleTrainParam() { - if (this.selectedObj.type === '01') { - this.formModelSectionName = this.selectedObj.name; - this.trainOperateType = ''; - this.$store.state.map.activeTrainList.forEach(trainCode => { - const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); - if (trainModel && trainModel.sectionCode === this.selectedObj.code) { - this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); - this.trainModel = trainModel; - this.formModelNewTrip = ''; - } - }); - } + this.formModelSectionName = this.selectedObj.name; + this.trainOperateType = ''; + this.$store.state.map.activeTrainList.forEach(trainCode => { + const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); + if (trainModel && trainModel.sectionCode === this.selectedObj.code) { + this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); + this.trainModel = trainModel; + this.formModelNewTrip = ''; + } + }); }, setSpeedLimitValue(val) { this.speedLimitValue = val; diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 591cd191e..4b04009c2 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -987,18 +987,16 @@ export default { this.allowDetain = true; }, handleTrainParam() { - if (this.selectedObj.type === '01') { - this.formModelSectionName = this.selectedObj.name; - this.trainOperateType = ''; - this.$store.state.map.activeTrainList.forEach(trainCode => { - const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); - if (trainModel && trainModel.sectionCode === this.selectedObj.code) { - this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); - this.trainModel = trainModel; - this.formModelNewTrip = ''; - } - }); - } + this.formModelSectionName = this.selectedObj.name; + this.trainOperateType = ''; + this.$store.state.map.activeTrainList.forEach(trainCode => { + const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode); + if (trainModel && trainModel.sectionCode === this.selectedObj.code) { + this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1)); + this.trainModel = trainModel; + this.formModelNewTrip = ''; + } + }); }, pushTempData(list) { this.tempData = []; diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index aef4dfb15..12f846df8 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -33,6 +33,15 @@ export const loginInfo = { navigationMarginLeft: '60px', systemType: '013' }, + zzww: { + title: '共赢列车仿真驾驶系统', + loginPath: '/login?project=zzww', + loginParam: 'ZZWW', + titleDistance: '-150px', + navigationLogoWidth: '40px', + navigationMarginLeft: '60px', + systemType: '011' + }, bjd: { title: '城市轨道交通列车运行智慧辅助系统', loginPath: '/login?project=bjd', @@ -419,6 +428,7 @@ export const loginInfo = { export const ProjectIcon = { xty: FaviconXty, + zzww: FaviconXty, login: Favicon, design: Favicon, designxty: FaviconXty, @@ -462,6 +472,7 @@ export const ProjectCode = { design: 'DEFAULT', xty: 'XTY', designxty: 'XTY', + zzww: 'ZZWW', gzb: 'GZB', designgzb: 'GZB', heb: 'HEB', @@ -485,12 +496,12 @@ export const ProjectCode = { designcgy: 'CGY' }; export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 底部栏仅展示公司信息不展示备案号 -export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy']; // 实训设计平台通过项目code获取地图列表的项目 +export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角版本开发基于不展示 export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy']; // 登录页右下角主体不展示 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', - 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy']; // 登录页样式 + 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl']; export const NoSimulationQrCodeList = ['heb', 'bjd']; export const RegisterCodeList = ['cgy', 'designcgy']; @@ -543,7 +554,8 @@ export const ProjectList = [ {value: 'urtss', label: '陪标项目'}, {value: 'sdy', label: '苏电院'}, {value: 'cgy', label: '成都工业'}, - {value: 'wjls', label: '微机联锁'} + {value: 'wjls', label: '微机联锁'}, + {value: 'zzww', label: '郑州共赢'} ]; export const localPackageProject = { localdesign: 'designheb', diff --git a/src/views/drts/scene/trainingResult.vue b/src/views/drts/scene/trainingResult.vue index e9cdf59a3..4289d7431 100644 --- a/src/views/drts/scene/trainingResult.vue +++ b/src/views/drts/scene/trainingResult.vue @@ -4,7 +4,7 @@
场景语音训练结果
 - + 用户： @@ -108,13 +108,8 @@ export default { }, methods: { async initFunction() { - this.loading = true; const userListData = await getHavaAudoUserList(this.$route.query.sceneId); this.userList = userListData.data; - if (this.userList.length) { - this.userId = this.userList[0].id; - this.queryData(); - } const scriptData = await getScriptByIdNew(this.$route.query.scriptId); const dispatcher = scriptData.data.memberList.find(member => member.type === 'DISPATCHER'); this.actionList = scriptData.data.actionList.filter(action => { diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 2e66ecdf4..3a2d5dc0f 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -159,6 +159,7 @@ export default { return; } else if (em.subType == 'enabled' && em.deviceType == 'Switch') { menu = getDeviceMenuByDeviceType('Enabled'); + const equipment = this.getDeviceByEm(em); this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu }); device = this.getDeviceByEm(em); @@ -166,6 +167,7 @@ export default { return; } else if (em.subType === 'enabled' && em.deviceType === 'Signal') { menu = getDeviceMenuByDeviceType('Enabled'); + const equipment = this.getDeviceByEm(em); this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType }); this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu}); device = this.getDeviceByEm(em); From 666e85dec6467dadda20a039d8133ca2d91a2d3c Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 14 May 2021 16:49:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=B7=E6=AD=A5?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/haerbin_01/menus/menuButton.vue | 12 ++++++-- .../theme/nanjing_02/menus/dialog/rps.vue | 3 -- .../theme/nanjing_02/menus/menuButton.vue | 29 +++++++++++++++++-- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index a8a0d65cf..e18bbe945 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -209,7 +209,8 @@ export default { formModelNewTrip: '', formModelNewGroup: '', speedShowCon: false, - trainOperateType: '' + trainOperateType: '', + formModelNewSection: '' }; }, computed: { @@ -237,7 +238,8 @@ export default { }, trainCommitDisabled() { return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) || - (this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete'); + (this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') || + (this.trainOperateType === 'move' && this.formModelNewSection); } }, watch: { @@ -802,6 +804,12 @@ export default { step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE; step.operation = OperationEvent.Train.delTrainId.menu.operation; step.param = params; + } else if (this.trainOperateType === 'move') { + params.groupNumber = this.trainModel.groupNumber; + params.sectionCode = this.formModelNewSection; + step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE; + step.operation = OperationEvent.Train.moveTrainId.menu.operation; + step.param = params; } this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue index a3d4b8efd..61900f6da 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dialog/rps.vue @@ -14,10 +14,7 @@