From 3e9835ff1553e0a8ef7e30270982b6840b30f199 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 11 Jun 2020 17:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/fuzhou_01.js | 4 ++--
 src/jmapNew/map.js                       | 2 +-
 src/jmapNew/shape/StationStand/index.js  | 2 +-
 src/store/modules/map.js                 | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 222c6b2ba..e863755a3 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -13,7 +13,7 @@ class SkinCode extends defaultStyle {
                 show: true,									// 物理区段名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
                 distance: 18,								// 文字离区段距离
-                fontSize: 11, 								// 字体大小
+                fontSize: 12, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
@@ -24,7 +24,7 @@ class SkinCode extends defaultStyle {
                 show: true, // 逻辑区段名称显示
                 position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
                 distance: 6,								// 文字离区段距离
-                fontSize: 8, 								// 字体大小
+                fontSize: 12, 								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
                 fontColor: '#FFFFFF', 						// 字体颜色
                 textAlign: 'center', 						// 水平对齐方式
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index aa06218a5..8fd829cb4 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -391,7 +391,7 @@ class Jlmap {
         (list || []).forEach((elem, index) => {
             const code = elem.code;
             const type = elem._type;
-            if (elem.deviceType === 'ROUTE') { // 处理进路数据状态
+            if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态
                 store.dispatch('map/updateRouteState', elem);
                 const route = this.logicData.routeData[code];
                 if (route.automaticRouteCode) {
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index 3de6cb70d..ea0f69831 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -489,7 +489,7 @@ class StationStand extends Group {
         if (!this.isShowShape) return;
         // 新版地图使用新版状态变更方式
         this.recover();
-        model.free && this.spare(); /** 空闲*/
+        !model.trainParking && this.spare(); /** 空闲*/
         model.trainParking && this.stop(); /** 列车停站*/
         model.emergencyClosed && this.emergentClose(); /** 站台紧急关闭*/
 
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index d209d4301..8da36fb44 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -791,7 +791,9 @@ const map = {
             state.autoReentryData[status.code] = deepAssign(state.autoReentryData[status.code], status);
         },
         updateTrainState:(state, status) =>{
-            state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
+            if (state.map.trainList) {
+                state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
+            }
         },
         updateStationStand: (state, status) => {
             const holdIndex = state.holdStandList.indexOf(status.code);