南京二叶老师问题调整

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 对称

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];

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;

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）下的列车默认是停车等待命令状态'
             }
         };
     },