From 9a2e007d3ffd970b733a72ae71961ffe01bc2549 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 3 Sep 2020 11:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=20=E6=89=A3=E8=BD=A6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=AB=99=E5=8F=B0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/fuzhou_01.js          |  5 +++--
 src/jmapNew/shape/StationStand/EDetain.js         |  2 +-
 .../theme/fuzhou_01/menus/menuStationStand.vue    | 15 ---------------
 .../scriptDisplay/scriptRecord/index.vue          |  3 ++-
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 98f19ce10..963255bca 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -222,11 +222,12 @@ class SkinCode extends defaultStyle {
             detainCar: { 										// 扣车
                 text: 'H', 										// 扣车显示内容
                 position: 1, 									// 扣车方向
-                offset: {x: -8, y: -6}, 						// 扣车偏移量
+                offset: {x: -8, y: 23}, 						// 扣车偏移量
                 trainColor: '#E4EF50', 							// 车站扣车颜色
                 centerTrainColor: '#FFFFFF', 					// 中心扣车颜色
                 andCenterTrainColor: '#F61107', 				// 车站+中心扣车颜色
-                detainTrainTextColor: '#E4EF50' 				// 车站扣除文字颜色
+                detainTrainTextColor: '#E4EF50', 				// 车站扣除文字颜色
+                circle: true 				 				 	// 空心圆环
             },
             stopTime: { 										// 停站时间
                 position: 1, 									// 运行时间方向
diff --git a/src/jmapNew/shape/StationStand/EDetain.js b/src/jmapNew/shape/StationStand/EDetain.js
index 35fbfe2f2..67acc3697 100644
--- a/src/jmapNew/shape/StationStand/EDetain.js
+++ b/src/jmapNew/shape/StationStand/EDetain.js
@@ -44,7 +44,7 @@ class EDetain extends Group {
                     style: {
                         fill: '#000',
                         lineWidth: 1,
-                        stroke: '#FFf'
+                        stroke: '#FFF'
                     }
                 });
                 this.add(this.circleDetain);
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index 1f238e9b4..72fbe3e66 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -81,21 +81,6 @@ export default {
                         handler: this.cancelJumpStop,
                         cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
                     },
-                    {
-                        label: this.$t('menu.menuStationStand.setRunLevel'),
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setBackStrategy'),
-                        handler: this.setBackStrategy,
-                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
-                    },
                     {
                         label: this.$t('menu.menuStationStand.getStationStandStatus'),
                         handler: this.detail,
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 90f3a3b3a..6c75e59be 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -149,10 +149,11 @@ export default {
                         });
                         if (drivers) {
                             driverList.push(drivers);
-                            this.memberData.push(drivers);
+
                         }
                     });
                 }
+                this.memberData = [...this.treeData[0].children, ...this.treeData[1].children, ...this.treeData[2].children, ...this.treeData[3].children, ...this.treeData[4].children];
                 this.treeData[2].children = driverList;
             } else {
                 this.activeTrainList = activeTrainList;