From 1c76b265417f3d370329562e8b321c9a3686e18e Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 26 Oct 2023 13:10:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B6?= =?UTF-8?q?=E8=80=81=E5=B8=88=E9=97=AE=E9=A2=98=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/nanjing_02.js | 2 +- src/jmapNew/map.js | 2 ++ .../nanjing_02/menus/localWorkMenuButton.vue | 29 ++++++++++++++++--- src/views/system/configLine/config.vue | 12 ++++++-- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index c1d5a8552..5cda4b08b 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -561,7 +561,7 @@ class SkinCode extends defaultStyle { this[deviceType.Switch] = { shapeFlash: true, // 道岔转动失去表示 道岔遮罩删除 - faultNoHandle: true, // 南京二 道岔长闪 道岔无状态 道岔区段 bc 闪烁 + faultNoHandle: false, // 南京二 道岔长闪 道岔无状态 道岔区段 bc 闪烁 （南京叶老师要求有短闪） text: { show: true, // 道岔名称显示 position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index eefb82d23..6425bea74 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -13,6 +13,7 @@ import { deepAssign } from '@/utils/index'; import * as adapter from '@/jmapNew/utils/adapter'; import store from '@/store/index'; import Vue from 'vue'; +import {EventBus} from '../scripts/event-bus'; // import {createDevice} from './parser/parser-graph'; const renderer = 'canvas'; @@ -547,6 +548,7 @@ class Jlmap { if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态 store.dispatch('map/updateRouteState', elem); + EventBus.$emit('setRouteResult', elem); const route = this.logicData.routeData[code]; if (route.automaticRouteCode) { const automaticRoute = this.mapDevice[route.automaticRouteCode]; diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue index a2e6cd6b6..8bc2a680e 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue @@ -910,7 +910,7 @@ export default { step.over = true; step.cmdType = this.cmdType; } - + console.log(this.param, '======', this.route, this.cmdType); EventBus.$emit('sendMsg', {}); this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid && this.securityCommand) { @@ -922,12 +922,31 @@ export default { } else if (valid) { this.doClose(); this.handleClose(); - EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); + if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { + EventBus.$on('setRouteResult', (route)=> { + console.log(route, this.route); + if (route.code === this.route.code) { + EventBus.$emit('sendMsg', {message: '进路排列成功'}); + EventBus.$off('setRouteResult'); + this.cmdType = ''; + } + }); + } else { + EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); + } } }).catch((error) => { this.doClose(); this.handleClose(); - if (error && error.code == '10017') { + if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { + EventBus.$on('setRouteResult', (route)=> { + if (route.code === this.route.code) { + EventBus.$emit('sendMsg', {message: '进路排列失败'}); + EventBus.$off('setRouteResult'); + this.cmdType = ''; + } + }); + } else if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`}); @@ -1005,7 +1024,9 @@ export default { this.deviceHighLight(this.oldDevice, false); // 当前选中 this.changeShowMode('cmd'); this.operate = ''; // 清空指令 - this.cmdType = ''; + if (this.cmdType !== CMD.Signal.CMD_SIGNAL_SET_ROUTE) { + this.cmdType = ''; + } this.securityCommand = ''; this.speedLimitValue = ''; this.secondConfirm = false; diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue index 63202bde4..dd15ebfc0 100644 --- a/src/views/system/configLine/config.vue +++ b/src/views/system/configLine/config.vue @@ -118,7 +118,9 @@ export default { 'updateTripPlanByServiceNumber', 'railway', 'SFUCanOnlyApplyForFaultLockSection', - 'signalBolckOptReflectSignal' + 'signalBolckOptReflectSignal', + 'routeCanSetWhenSwitchFault', + 'manualTrainDefaultStop' ], selectList: ['runMode', 'singleApproachLockCancelRoute'], generalConfig: [ @@ -170,7 +172,9 @@ export default { 'updateTripPlanByServiceNumber', 'railway', 'SFUCanOnlyApplyForFaultLockSection', - 'signalBolckOptReflectSignal' + 'signalBolckOptReflectSignal', + 'routeCanSetWhenSwitchFault', + 'manualTrainDefaultStop' ], rangeList: ['noParkingSM', 'parkingSM'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'], @@ -228,7 +232,9 @@ export default { updateTripPlanByServiceNumber: '根据服务号更新车次计划', railway: '大铁线路', SFUCanOnlyApplyForFaultLockSection: '区故解只能应用于故障锁闭区段', - signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示' + signalBolckOptReflectSignal:'对信号机封锁操作，是否影响信号显示', + routeCanSetWhenSwitchFault: '道岔故障时可以办理进路（由远及近锁闭，到故障处终止）', + manualTrainDefaultStop: '人工驾驶模式（CM/RM/NRM）下的列车默认是停车等待命令状态' } }; }, From 4ba24892fcc6f9c4d11cd70d94174edc280fb6fb Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 26 Oct 2023 15:40:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E5=8F=B6?= =?UTF-8?q?=E8=80=81=E5=B8=88=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/loadSpareTrain.vue | 25 ++++++++++++++++--- .../components/menus/dialog/setFault.vue | 2 +- .../menus/dispatchWorkMenuButton.vue | 19 +++++++++++--- .../nanjing_02/menus/localWorkMenuButton.vue | 17 +++---------- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue index 38d450976..33a814d14 100644 --- a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue +++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue @@ -33,6 +33,16 @@ + + 预选模式 + + + + + + + + 确定 @@ -71,10 +81,18 @@ export default { addModel: { groupNumber: '', right: '', - sectionCode: '' + sectionCode: '', + preselectionMode: 'RM' }, dialogShow: false, - loading: false + loading: false, + modeList: [ + { value: 'AM_C', label: 'AM-C模式' }, + { value: 'SM_C', label: 'SM-C模式' }, + { value: 'AM_I', label: 'AM-I模式'}, + { value: 'SM_I', label: 'SM-I模式' }, + { value: 'RM', label: 'RM模式' } + ] }; }, computed: { @@ -133,7 +151,8 @@ export default { const params = { groupNumber: this.addModel.groupNumber, sectionCode: this.addModel.sectionCode, - right: this.addModel.right + right: this.addModel.right, + preselectionMode: this.addModel.preselectionMode }; this.messageTip1 = ''; this.loading = true; diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index bf9219376..618f891fc 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -24,7 +24,7 @@ - + 越红灯行驶
越引导行驶
运行至前方车站
diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue index 65b092c98..4d8d372f3 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue @@ -846,17 +846,26 @@ export default { } else if (valid) { this.doClose(); this.handleClose(); - EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); + if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { + EventBus.$on('setRouteResult', (route)=> { + if (route.code === this.route.code && route.hasOwnProperty('setSuccess')) { + EventBus.$emit('sendMsg', {message:route.setSuccess ? '进路排列成功' : '进路排列失败'}); + EventBus.$off('setRouteResult'); + this.cmdType = ''; + } + }); + } else { + EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); + } } }).catch((error) => { this.doClose(); this.handleClose(); + this.cmdType = ''; if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); - this.$refs.noticeInfo.doShow(error.message); } else { EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`}); - this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`); } }); }, @@ -927,7 +936,9 @@ export default { this.deviceHighLight(this.oldDevice, false); // 当前选中 this.changeShowMode('cmd'); this.operate = ''; // 清空指令 - this.cmdType = ''; + if (this.cmdType !== CMD.Signal.CMD_SIGNAL_SET_ROUTE) { + this.cmdType = ''; + } this.securityCommand = ''; this.speedLimitValue = ''; this.secondConfirm = false; diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue index 8bc2a680e..b185260f1 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue @@ -910,7 +910,6 @@ export default { step.over = true; step.cmdType = this.cmdType; } - console.log(this.param, '======', this.route, this.cmdType); EventBus.$emit('sendMsg', {}); this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid && this.securityCommand) { @@ -924,9 +923,8 @@ export default { this.handleClose(); if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { EventBus.$on('setRouteResult', (route)=> { - console.log(route, this.route); - if (route.code === this.route.code) { - EventBus.$emit('sendMsg', {message: '进路排列成功'}); + if (route.code === this.route.code && route.hasOwnProperty('setSuccess')) { + EventBus.$emit('sendMsg', {message:route.setSuccess ? '进路排列成功' : '进路排列失败'}); EventBus.$off('setRouteResult'); this.cmdType = ''; } @@ -938,15 +936,8 @@ export default { }).catch((error) => { this.doClose(); this.handleClose(); - if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { - EventBus.$on('setRouteResult', (route)=> { - if (route.code === this.route.code) { - EventBus.$emit('sendMsg', {message: '进路排列失败'}); - EventBus.$off('setRouteResult'); - this.cmdType = ''; - } - }); - } else if (error && error.code == '10017') { + this.cmdType = ''; + if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`}); From a5d260a340e7ff074c4f98ff60ed7bb597610175 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 26 Oct 2023 16:23:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=87=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue index 33a814d14..8b4e68996 100644 --- a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue +++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue @@ -137,7 +137,8 @@ export default { this.addModel = { groupNumber: '', right: '', - sectionCode: '' + sectionCode: '', + preselectionMode: 'RM' }; this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('map/setTrainWindowShow', false); From c98c50f401b31c8c82d4102d6aafcf990ba6a54d Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 30 Oct 2023 09:50:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=BD=A6=E8=BF=9B=E8=B7=AF=E5=B1=9E=E6=80=A7?= =?UTF-8?q?&=E5=8F=96=E6=B6=88=E8=BF=9B=E8=B7=AF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=9B=B4=E6=96=B0=E6=89=A7=E8=A1=8C=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/map.js | 2 -- .../nanjing_02/menus/dispatchWorkMenuButton.vue | 17 ++--------------- .../nanjing_02/menus/localWorkMenuButton.vue | 17 ++--------------- .../dataRelation/routeoperate/detail.vue | 6 ++++++ .../dataRelation/routeoperate/route.vue | 7 +++++++ 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 6425bea74..eefb82d23 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -13,7 +13,6 @@ import { deepAssign } from '@/utils/index'; import * as adapter from '@/jmapNew/utils/adapter'; import store from '@/store/index'; import Vue from 'vue'; -import {EventBus} from '../scripts/event-bus'; // import {createDevice} from './parser/parser-graph'; const renderer = 'canvas'; @@ -548,7 +547,6 @@ class Jlmap { if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态 store.dispatch('map/updateRouteState', elem); - EventBus.$emit('setRouteResult', elem); const route = this.logicData.routeData[code]; if (route.automaticRouteCode) { const automaticRoute = this.mapDevice[route.automaticRouteCode]; diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue index 4d8d372f3..151d168cd 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue @@ -846,22 +846,11 @@ export default { } else if (valid) { this.doClose(); this.handleClose(); - if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { - EventBus.$on('setRouteResult', (route)=> { - if (route.code === this.route.code && route.hasOwnProperty('setSuccess')) { - EventBus.$emit('sendMsg', {message:route.setSuccess ? '进路排列成功' : '进路排列失败'}); - EventBus.$off('setRouteResult'); - this.cmdType = ''; - } - }); - } else { - EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); - } + EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { this.doClose(); this.handleClose(); - this.cmdType = ''; if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { @@ -936,9 +925,7 @@ export default { this.deviceHighLight(this.oldDevice, false); // 当前选中 this.changeShowMode('cmd'); this.operate = ''; // 清空指令 - if (this.cmdType !== CMD.Signal.CMD_SIGNAL_SET_ROUTE) { - this.cmdType = ''; - } + this.cmdType = ''; this.securityCommand = ''; this.speedLimitValue = ''; this.secondConfirm = false; diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue index b185260f1..ea192c4c3 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue @@ -921,22 +921,11 @@ export default { } else if (valid) { this.doClose(); this.handleClose(); - if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) { - EventBus.$on('setRouteResult', (route)=> { - if (route.code === this.route.code && route.hasOwnProperty('setSuccess')) { - EventBus.$emit('sendMsg', {message:route.setSuccess ? '进路排列成功' : '进路排列失败'}); - EventBus.$off('setRouteResult'); - this.cmdType = ''; - } - }); - } else { - EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); - } + EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { this.doClose(); this.handleClose(); - this.cmdType = ''; if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { @@ -1015,9 +1004,7 @@ export default { this.deviceHighLight(this.oldDevice, false); // 当前选中 this.changeShowMode('cmd'); this.operate = ''; // 清空指令 - if (this.cmdType !== CMD.Signal.CMD_SIGNAL_SET_ROUTE) { - this.cmdType = ''; - } + this.cmdType = ''; this.securityCommand = ''; this.speedLimitValue = ''; this.secondConfirm = false; diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue index b82ce9c12..8d2c061e7 100644 --- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue @@ -140,6 +140,12 @@ export default { type: 'tag', prop: 'arc' }, + { + title: '是否单列车进路', + edit: true, + type: 'tag', + prop: 'singleTrain' + }, { title: '自排', edit: true, diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue index e71fb13ed..3cf7e401c 100644 --- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue @@ -32,6 +32,12 @@ {{ $t('map.deny') }} + + + 是 + 否 + + Date: Mon, 30 Oct 2023 16:26:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B2=94=E8=8A=AF=E8=BE=B9=E7=BC=98?= =?UTF-8?q?=E9=81=93=E5=B2=94=E5=8C=BA=E6=AE=B5=E5=85=B3=E8=81=94=E9=81=93?= =?UTF-8?q?=E5=B2=94=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index b7e4a3583..2bf166ed1 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -483,6 +483,9 @@ export default class Section extends Group { // 哈尔滨线路 南京二 道岔相关区段设置 默认颜色 if (this.style.Switch.sectionAction.flag && model.relSwitchCode && !flag) { const switchModel = this.mapDevice[model.relSwitchCode]; + if (!switchModel) { + return; + } const sectionB = switchModel.sectionBCode === model.code ? this.mapDevice[switchModel.sectionBCode] : null; const sectionC = switchModel.sectionCCode === model.code ? this.mapDevice[switchModel.sectionCCode] : null; const sectionA = this.mapDevice[switchModel.sectionACode]; From 0867248df305f98c0f2b53c49134620a0f6b5aab Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 30 Oct 2023 17:13:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E2=80=9C=E6=97=A0=E2=80=9D&=E5=8D=97?= =?UTF-8?q?=E4=BA=AC=E4=BA=8C=E5=A2=9E=E5=8A=A0NRM=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E5=81=9C=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menus/dialog/setFault.vue | 3 +-- .../theme/nanjing_02/menus/menuTrain.vue | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue index 618f891fc..b2cf9e71c 100644 --- a/src/jmapNew/theme/components/menus/dialog/setFault.vue +++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue @@ -28,8 +28,7 @@ 越红灯行驶
越引导行驶
运行至前方车站
- 进路闭塞法行车
- 无 + 进路闭塞法行车 diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue index 96d96ed8d..dafa52a83 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue @@ -80,6 +80,10 @@ export default { label: '回库', handler: this.setInbound }, + { + label: '停车', + handler: this.handleParkingTrain + }, { label: '切换驾驶模式', children: [ @@ -104,6 +108,10 @@ export default { handler: this.handlerApplyRmMode } ] + }, + { + label: '转NRM模式', + handler: this.handlerApplyNrmMode } ], menuSpeed: [ @@ -301,6 +309,21 @@ export default { console.error(error); this.$refs.noticeInfo.doShow(); }); + }, + // 转NRM模式 + handlerApplyNrmMode() { + commitOperate(menuOperate.Driver.applyNrm, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); + }, + handleParkingTrain() { + commitOperate(menuOperate.Train.driverStop, { groupNumber: this.selected.code }, 3).then(({ valid, operate }) => { + }).catch((error) => { + console.error(error); + this.$refs.noticeInfo.doShow(); + }); } } }; From 597d4ea7d160c302c4ed0c505cded7aad726f598 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 31 Oct 2023 16:46:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8CATP=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E7=81=AF=E6=9F=B1=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?&CR2=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=AF=95=E4=BA=A4=E4=BA=92?= =?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/config/skinCode/nanjing_02.js | 1 + src/jmapNew/shape/graph/Signal/index.js | 4 ++-- .../theme/nanjing_02/menus/dispatchWorkMenuButton.vue | 10 ++++------ .../theme/nanjing_02/menus/localWorkMenuButton.vue | 9 +++------ 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/config/skinCode/nanjing_02.js b/src/jmapNew/config/skinCode/nanjing_02.js index 5cda4b08b..1112055f2 100644 --- a/src/jmapNew/config/skinCode/nanjing_02.js +++ b/src/jmapNew/config/skinCode/nanjing_02.js @@ -192,6 +192,7 @@ class SkinCode extends defaultStyle { closeSignalVerColor: '#FF1F10', // 关闭信号 灯柱竖柱颜色 level 1 guideSignalVerColor: '#FFFF00', // 引导信号控制级 灯柱竖柱颜色 level 2 autoRouteVerColor: '#9DFF6E', // 联锁自动进路颜色 + atpLevelColor: '#009600', // ATP级别灯柱颜色 standardVerticalShape: '8', // 灯柱 竖杆 8边型 standardLength: 12, // 高柱长度 standardHeight: 5, // 灯柱高度 diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index b74acd722..07899588e 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -1188,8 +1188,8 @@ class Signal extends Group { this.sigPost.setVerColor(this.style.Signal.post.closeSignalVerColor); } else if (model.level === 1 && this.style.Signal.post.guideSignalVerColor && !model.fleetMode) { this.sigPost.setVerColor(this.style.Signal.post.guideSignalVerColor); - } else if (model.level === 2 && this.style.Signal.post.autoRouteVerColor && !model.fleetMode) { - this.sigPost.setVerColor(this.style.Signal.post.autoRouteVerColor); + } else if (model.level === 2 && this.style.Signal.post.atpLevelColor && !model.fleetMode) { + this.sigPost.setVerColor(this.style.Signal.post.atpLevelColor); } if (this.style.Signal.lamp.special) { diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue index 151d168cd..8f1143174 100644 --- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue @@ -893,15 +893,10 @@ export default { this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid) { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); + if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); this.$refs.noticeInfo.doShow(error.message); @@ -910,6 +905,9 @@ export default { this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`); } }); + this.doClose(); + this.handleDeviceMenu(); + this.handleClose(); }, handleRightClickClose() { this.rightClickDialogVisible = false; diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue index ea192c4c3..3e67306f9 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue @@ -966,21 +966,18 @@ export default { this.$store.dispatch('trainingNew/next', step).then(({ valid }) => { if (valid) { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`}); } }).catch((error) => { - this.doClose(); - this.handleDeviceMenu(); - this.handleClose(); if (error && error.code == '10017') { EventBus.$emit('sendMsg', {message: error.message}); } else { EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`}); } }); + this.doClose(); + this.handleDeviceMenu(); + this.handleClose(); }, handleRightClickClose() { this.rightClickDialogVisible = false;