Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

src/jmapNew/config/skinCode/bejing_01.js

@@ -135,6 +135,9 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: false,                                  // 区段特殊显示
+            },
+            trainPosition:{
+                display: false                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/config/skinCode/chengdu_01.js

@@ -135,6 +135,9 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: false,                                  // 区段特殊显示
+            },
+            trainPosition:{
+                display: true                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/config/skinCode/chengdu_03.js

@@ -138,6 +138,9 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: false,                                  // 区段特殊显示
+            },
+            trainPosition:{
+                display: false                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -128,6 +128,9 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: false,                                  // 区段特殊显示
+            },
+            trainPosition:{
+                display: false                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/config/skinCode/haerbin_01.js

@@ -128,6 +128,9 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: true,                                  // 区段特殊显示
+            },
+            trainPosition:{
+                display: false                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/config/skinCode/ningbo_01.js

@@ -136,6 +136,9 @@ class SkinCode extends defaultStyle {
             block: {
                 special: false,                                  // 区段特殊显示
                 blockGlint: true,                           // 区段封锁闪烁显示
+            },
+            trainPosition:{
+                display: false                                   // 列车实时位置显示
             }
         };
 

src/jmapNew/painter.js

@@ -148,7 +148,7 @@ class Painter {
             try {
                 if (device._dispose) {
                     this.delete(device);
-                } else if (deviceType.Train == device._type) {
+                } else if (deviceType.Train.toUpperCase() == device.deviceType) {
                     this.updateTrain(device);
                 } else {
                     const instance = device.instance;

src/jmapNew/shape/Train/index.js

@@ -3,6 +3,8 @@ import TrainHead from './TrainHead';
 import TrainBody from './TrainBody';
 import BoundingRect from 'zrender/src/core/BoundingRect';
 import Rect from 'zrender/src/graphic/shape/Rect';
+import { deepAssign } from '@/utils/index';
+import store from '@/store';
 
 /** 列车 */
 export default class Train extends Group {
@@ -115,6 +117,18 @@ export default class Train extends Group {
     getShapeTipPoint() {
     }
 
+    updateSection() {
+        const train = this.model;
+        if (train.physicalCode && train.offsetp) {
+            const data = train.physicalCode;
+            const oldmodel = store.getters['map/getDeviceByCode'](data);
+            let models = [];
+            const model = deepAssign(oldmodel, {_type: 'Section'}); // 修改元素model
+            models = [model];
+            store.dispatch('map/updateMapDevices', models);
+        }
+    }
+
     // 恢复颜色状态
     recover() {
         this.trainB && this.trainB.setHShow(false);
@@ -309,6 +323,11 @@ export default class Train extends Group {
             this.setCommunicationStatus(model.runLevel);
             // this.setTrainTypeStatus(model.type); 配合早晚点设置
             this.setDoorStatus(model.doorCloseLock);
+
+            const style = this.style;
+            if (style.Section.trainPosition.display) {
+                this.updateSection();
+            }
         }
         // let points = [];
         // if (model) {

src/jmapNew/theme/beijing_01/menus/menuSignal.vue

@@ -153,7 +153,6 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            debugger;
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {

src/jmapNew/theme/beijing_01/menus/menuSwitch.vue

@@ -191,7 +191,6 @@ export default {
                 break;
             }
             case OperationEvent.Switch.lock.button.operation: {
-                debugger;
                 // 道岔单锁
                 if (!selectType.singleLock) {
                     this.lock(selectType);

src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue

@@ -388,7 +388,6 @@ export default {
                         this.stationName = station.name;
                     }
                 }
-                debugger;
                 if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation || this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
                     this.radio = selected.direction;
                 } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {