From f62de1971f76c673d832fce6e7d670fefa49171d Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 16 Jun 2020 15:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=81=E6=B3=A2=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=20=E7=AB=99=E5=90=8E=E6=8A=98=E8=BF=94=E7=9A=AE?=
 =?UTF-8?q?=E8=82=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/ningbo_01.js   | 19 +++++++++++++++++++
 src/jmapNew/shape/StationTurnBack/index.js |  6 +++---
 src/utils/baseUrl.js                       |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 30b421e3c..7fc17dc75 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -376,6 +376,25 @@ class SkinCode extends defaultStyle {
             }
         };
 
+        this[deviceType.StationTurnBack] = {					// 站后折返
+            displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
+            lamp: {
+                fill: '#FFFF00', // 填充色
+                radiusR: 6									// 控制灯大小
+            },
+            text: {
+                fontWeight: 580,
+                fontSize: 12,
+                distance: 10
+            },
+            rect: {
+                fill: 'rgba(0,0,0,0)',
+                stroke: '#fff',
+                lineWidth: 2,
+                padding: 6
+            }
+        };
+
         this[deviceType.AutoTurnBack] = {
             // 是否显示
             visibleConditions: '01',
diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js
index 6fc922bf2..97842f76a 100644
--- a/src/jmapNew/shape/StationTurnBack/index.js
+++ b/src/jmapNew/shape/StationTurnBack/index.js
@@ -115,7 +115,7 @@ export default class StationTurnBack extends Group {
                 }
             });
         }
-        // console.log(model, '站后折返model')
+        // console.log(model, '站后折返model');
     }
 
     setShowMode() {
@@ -127,8 +127,8 @@ export default class StationTurnBack extends Group {
             this.eachChild(item => item.hide() );
         }
     }
-    setShowStation(flag) {
-        if (flag) {
+    setShowStation(stationCode) {
+        if (!stationCode || this.model.stationCode === stationCode) {
             this.eachChild(item => {
                 item.show();
             });
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c23cda8a4..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -6,7 +6,7 @@ export function getBaseUrl() {
         // 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://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛