调整道岔重置，调整宁波定义

src/jmapNew/shape/Switch/ESwLnversion.js

@@ -31,6 +31,8 @@ class ESwLnversion extends Group {
 
     hide() {
         this.relocShelter.hide();
+        this.relocShelter.setStyle({ fill: this.model.style.backgroundColor });
+        this.stopAnimation(false);
     }
 
     show() {
@@ -41,10 +43,6 @@ class ESwLnversion extends Group {
         this.relocShelter.setStyle({ fill: color });
     }
 
-    getSection() {
-        return this.section;
-    }
-
     stopAnimation(flag) {
         this.relocShelter.stopAnimation(flag);
     }

src/jmapNew/shape/Switch/ESwLocal.js

@@ -33,6 +33,8 @@ class ESwLocal extends Group {
 
     hide() {
         this.locShelter.hide();
+        this.locShelter.setStyle({ fill: this.model.style.backgroundColor });
+        this.stopAnimation(false);
     }
 
     show() {

src/jmapNew/shape/Switch/index.js

@@ -227,15 +227,18 @@ export default class Switch extends Group {
         this.lockRect.hide(); // 矩形包围框
         this.lockArc.hide(); // 圆形单锁框
         this.name.getNameText().stopAnimation(false);
-        this.sheltertriangle.hide();
+        this.sheltertriangle.hide(); // 直角梯形覆盖图形 隐藏
+        // this.sheltertriangle.stopAnimation(false);
         this.rhomboid.stopAnimation(false);
         this.releaseBackground.hide();
         this.setHasTextBorder(0);
+        this.locShelter.hide(); // 定位覆盖图形 隐藏
+        this.relocShelter.hide(); // 反位覆盖图形 隐藏
     }
 
     /** 定位*/
     setLocationAction() {
-        this.recover();
+        // this.recover();
         if (this.style.Switch.core.splice) {
             this.locShelter.hide();
         } else {
@@ -248,7 +251,7 @@ export default class Switch extends Group {
 
     /** 反位*/
     setInversionAction() {
-        this.recover();
+        // this.recover();
         this.setTextColor(this.style.Switch.text.inversionColor);
         if (this.style.Switch.core.splice) {
             this.relocShelter.hide();
@@ -262,7 +265,7 @@ export default class Switch extends Group {
 
     /** 失去*/
     setLossAction(nameFlicker) {
-        this.recover();
+        // this.recover();
         this.locShelter.show();
         this.relocShelter.show();
         this.rhomboid.hide();
@@ -324,7 +327,7 @@ export default class Switch extends Group {
     /** 封锁 */
     block() {
         if (this.style.Switch.jointImg.block) {
-            this.recover();
+            // this.recover();
             this.relocShelter.show();
             this.relocShelter.animateStyle(item => {
                 item.animateStyle(true)
@@ -422,6 +425,10 @@ export default class Switch extends Group {
 
     setState(model) {
         if (!this.isShowShape) return;
+        this.recover();
+        if (model.name == 'P021208') {
+            console.log(model);
+        }
         if (model.normalPosition) {
             this.setLocationAction(model); 	/** 定位*/
         } else if (model.reversePosition) {

src/jmapNew/theme/ningbo_01/operationConfig.js

@@ -234,7 +234,7 @@ export default {
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
                 { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' },
+                { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
                 { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' },
                 { deviceType: '03', orderNum: 5, operateCode: '4023', tip: '鼠标左键点击【关闭】按钮' }
             ]

src/scripts/cmdPlugin/ValidateHandler.js

@@ -51,6 +51,7 @@ class ValidateHandler {
         const steps = Handler.getSteps();
         const order = Handler.getOrder();
         let valid = false;
+
         if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
             if (operate && steps[0] &&
                 operate.code == steps[0].code &&

src/utils/baseUrl.js

@@ -2,11 +2,11 @@ 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.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康