From 0a58b253e1f9d499b09d446b4b1a42ca5290dc03 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 11 Jun 2020 11:11:47 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=98=E5=9B=BE?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=9A=AE=E8=82=A4=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopMenu/item.vue           | 17 +++++++----------
 src/jmapNew/config/skinCode/bejing_01.js  |  2 +-
 src/jmapNew/config/skinCode/chengdu_01.js |  2 +-
 src/jmapNew/config/skinCode/chengdu_03.js |  2 +-
 src/jmapNew/config/skinCode/foshan_01.js  |  2 +-
 src/jmapNew/config/skinCode/fuzhou_01.js  |  3 +--
 src/jmapNew/config/skinCode/haerbin_01.js |  2 +-
 src/jmapNew/config/skinCode/ningbo_01.js  |  2 +-
 src/jmapNew/config/skinCode/xian_01.js    |  2 +-
 src/jmapNew/config/skinCode/xian_02.js    |  2 +-
 src/jmapNew/map.js                        | 17 +++++++++--------
 11 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/components/PopMenu/item.vue b/src/components/PopMenu/item.vue
index 6280a3fad..ab24713ae 100644
--- a/src/components/PopMenu/item.vue
+++ b/src/components/PopMenu/item.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="container">
     <li v-if="option.children && option.children.length" class="menu-item" :class="popClass" @mouseenter="enter($vnode.key)" @mouseleave="leave">
-      <div class="flex-box">
+      <div ref="flexBox" class="flex-box">
         <el-button type="text" class="item" :disabled="checkDisabled(option)">
           <el-link v-if="option.tipsType" :type="option.tipsType" :underline="false">{{ option.label }}</el-link>
           <span v-else :style="{color: textColor(option) }">{{ option.label }}</span>
         </el-button>
-        <i class="el-icon-caret-right" />
+        <i class="el-icon-arrow-right" />
       </div>
-      <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table'}">
+      <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}">
         <div class="menu-pop">
           <div v-show="isShow" class="arrow  el-icon-arrow-down" />
           <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" @close="close" />
@@ -66,6 +66,9 @@ export default {
         },
         isShow() {
             return this.option.children.length > 12;
+        },
+        marginLeft() {
+            return this.$refs.flexBox.offsetWidth;
         }
     },
     methods: {
@@ -123,7 +126,6 @@ export default {
     $item-border: #909399;
     $item-disabled: #cccccc;
     $item-height: 30px;
-    $item-width: 180px;
 
     /deep/ {
         .el-button--text {
@@ -137,10 +139,8 @@ export default {
 		.menu {
 			padding: 0;
 			position: absolute;
-			margin-left: $item-width - 2;
 			margin-top: -$item-height - 1;
 			max-height: 360px;
-			min-width: 800px;
 			overflow: auto;
 
 			&-pop {
@@ -162,15 +162,12 @@ export default {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			padding-right: 3px;
 		}
 
 		.menu-item {
 			background: $bg;
 			list-style: none;
-			width: $item-width;
-			// display: flex;
-			// justify-content: space-between;
-			// align-items: center;
 		}
 
 		.menu-item:hover {
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 5d0946cb2..6c6afa69b 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -253,7 +253,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index bfebe98e2..9c01e1b09 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -366,7 +366,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 66fb05c03..8983f55ed 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -203,7 +203,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index 3243b4931..c36e3c2d2 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -386,7 +386,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 5318d06ac..222c6b2ba 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -421,8 +421,7 @@ class SkinCode extends defaultStyle {
         };
         // 供电线路
         this[deviceType.Power] = {
-            lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 8										// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 596e78a5d..b0ab0e95d 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -395,7 +395,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 90c2b2f8a..44f653d35 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -415,7 +415,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 42c952dd8..24536bca1 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -390,7 +390,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 761d2b945..21a84dd77 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -514,7 +514,7 @@ class SkinCode extends defaultStyle {
         // 供电线路
         this[deviceType.Power] = {
             lineColor: '#FFFFFF',								// 线条颜色
-            strokeColor: '#ccc',								// 线条颜色
+            strokeColor: 'red',								// 线条颜色
             extendLength: 10									// 延伸长度
         };
 
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 0518aed82..aa06218a5 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -167,9 +167,10 @@ class Jlmap {
         const arr = [];
         const rectList = [];
         let rect = '';
+        // console.log(this.mapDevice);
         for (const i in this.mapDevice) {
             const element = this.mapDevice[i];
-            if (element.instance) {
+            if (element.instance && element._type == 'Section') {
                 if (!rect) {
                     rect = element.instance.getBoundingRect().clone();
                 } else {
@@ -187,8 +188,8 @@ class Jlmap {
         const scaleHeight = Math.floor(((opts.height - 100) / (rect.height * num)) * 100) / 100;
         const scale = Math.min(scaleWidth, scaleHeight);
 
-        // const offsetHeight = (offsetY - (rect.height * scale)) / 2 + Math.abs(rect.x); // 高度差
-        // console.log(offsetHeight, opts.height, screenSplit, offsetY, rect);
+        // const offsetHeight = (offsetY - (rect.height * scale)) + Math.abs(rect.x * scale); // 高度差
+        // console.log(offsetHeight, opts.height, screenSplit, offsetY, rect, '缩放对比>', scaleWidth, scaleHeight);
 
         for (let i = 0; i < splitList.length; i++) {
             let offsetX = '';
@@ -198,11 +199,11 @@ class Jlmap {
                 const dx = (opts.width - (splitList[i] - splitList[i - 1]) * scale) / 2; // 居中计算偏移值
                 offsetX = splitList[i - 1] * scale - dx;
             }
-            // const param = { scaleRate: scale, offsetX: offsetX, offsetY: -offsetHeight - (offsetY * i) };
-            const param = { scaleRate: scale, offsetX: offsetX, offsetY: -120 - (offsetY * i) };
-            if (i == 0) {
-                param.offsetY = -160 - (opts.offsetY || 0);
-            }
+            // const param = { scaleRate: scale, offsetX: offsetX, offsetY: -(offsetY * i) - offsetHeight};
+            const param = { scaleRate: scale, offsetX: offsetX, offsetY: -160 - (offsetY * i) };
+            // if (i == 0) {
+            //     param.offsetY -= -100;
+            // }
             arr.push(param);
             const rect = {x: 0, y: 0, width: Number(splitList[i]) + 5, height: opts.height};
             rectList.push(rect);

From 7d7583a7e2a4159339ccd9202b5f7d1a9b9f0dda Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Jun 2020 11:26:41 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86&=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=94=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/schedulesChild/schedulesManage.vue    | 157 ++++++++++++++++--
 src/views/system/configLine/config.vue        |   7 +-
 2 files changed, 143 insertions(+), 21 deletions(-)

diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
index 86e17e9c2..9386a5cbc 100644
--- a/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
@@ -1,33 +1,119 @@
 <template>
   <div style="width: 100%;display: flex;justify-content: center;">
     <div>
-      <div class="top-content-box">
+      <div class="content-box">
         <div style="width: 950px;font-size: 18px;color: #56E5DE;margin: 10px;">全线车站时间表</div>
         <div style="width: 100%;display: flex;justify-content: center;">
-          <div style="width: 240px;height: 300px;background: #FFF;">
+          <div style="width: 240px;height: 280px;background: #FFF;">
             <el-row>
               <div style="background: #43388A;font-size: 14px;height: 30px;line-height: 30px;color: #FFF;text-align: center;">公用时间列表</div>
             </el-row>
           </div>
           <div style="width: 120px;margin-left: 10px;">
-            <div style="font-size: 18px;color: #56E5DE;width: 100%;text-align: center;margin: 85px 0;">增加时间表名</div>
+            <div style="font-size: 18px;color: #56E5DE;width: 100%;text-align: center;margin: 75px 0;">增加时间表名</div>
             <el-input v-model="tableName" size="mini" />
             <div class="button-box" style="text-align: center;padding: 5px 0;margin: 10px 0;">增加</div>
             <div class="button-box" style="text-align: center;padding: 5px 0">删除</div>
           </div>
-          <div style="width: 110px;height: 300px;padding: 0 15px;border-right: 2px solid #2B5932;margin-left: 40px;">
+          <div style="width: 110px;height: 280px;padding: 0 15px;border-right: 2px solid #2B5932;margin-left: 40px;">
             <div style="font-size: 18px;color: #56E5DE;width: 100%;text-align: center;">下载选择</div>
-            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 256px;">立即下发</div>
+            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 236px;">立即下发</div>
           </div>
-          <div style="width: 110px;height: 300px;margin-left: 15px;">
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期一</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期二</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期三</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期四</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期五</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期六</div>
-            <div style="color: #56E5DE;font-size: 13px;"><div class="check-box" />星期日</div>
-            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 100px;">排定下发</div>
+          <div style="width: 70px;height: 280px;margin-left: 15px;">
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Mon')">
+              <div class="check-box" :style="{background: allStationDate.includes('Mon')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期一</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Tues')">
+              <div class="check-box" :style="{background: allStationDate.includes('Tues')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期二</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Wed')">
+              <div class="check-box" :style="{background: allStationDate.includes('Wed')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期三</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Thurs')">
+              <div class="check-box" :style="{background: allStationDate.includes('Thurs')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期四</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Fri')">
+              <div class="check-box" :style="{background: allStationDate.includes('Fri')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期五</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Sta')">
+              <div class="check-box" :style="{background: allStationDate.includes('Sta')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期六</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedAllStationDate('Sun')">
+              <div class="check-box" :style="{background: allStationDate.includes('Sun')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期日</div>
+            </div>
+            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 80px;">排定下发</div>
+          </div>
+        </div>
+      </div>
+      <div class="content-box">
+        <div style="width: 950px;font-size: 18px;color: #56E5DE;margin: 10px;">车站时间表</div>
+        <div style="width: 100%;display: flex;justify-content: center;">
+          <div style="width: 180px;height: 280px;background: #FFF;">
+            <el-row>
+              <div style="background: #43388A;font-size: 14px;height: 30px;line-height: 30px;color: #FFF;text-align: center;">车站选择</div>
+            </el-row>
+          </div>
+          <div class="border-box" style="width: 380px;height: 280px;display: flex;justify-content: center;padding: 10px;margin-left: 20px;">
+            <div style="width: 240px;height: 260px;background: #FFF;">
+              <el-row>
+                <div style="background: #43388A;font-size: 14px;height: 30px;line-height: 30px;color: #FFF;text-align: center;">车站时间列表</div>
+              </el-row>
+            </div>
+            <div style="width: 110px;height: 260px;margin-left: 10px;">
+              <div style="width: 100%;font-size: 18px;color: #56E5DE;">新时间表名</div>
+              <el-input v-model="newTableName" size="mini" style="margin: 10px 0;" />
+              <div class="button-box" style="padding: 5px 10px;width: 50px;text-align: center;font-size: 12px;">改名</div>
+              <div style="padding: 10px 0; border-top: 2px solid #2B5932;margin-top: 10px;display: flex;justify-content: center;">
+                <div class="button-box" style="width: 45px;font-size: 12px;height: 65px;text-align: center;line-height: 65px;margin-right: 10px;">删除</div>
+                <div class="button-box" style="width: 55px;font-size: 12px;height: 65px;text-align: center;padding-top: 18px;">增到共用时间表列</div>
+              </div>
+              <div style="display: flex;justify-content: center;">
+                <div class="button-box" style="width: 45px;font-size: 12px;height: 65px;text-align: center;margin-right: 10px;padding-top: 18px;">编辑时间表</div>
+                <div class="button-box" style="width: 55px;font-size: 12px;height: 65px;line-height: 65px;text-align: center;">查看</div>
+              </div>
+            </div>
+          </div>
+          <div style="width: 110px;height: 280px;padding: 0 15px;border-right: 2px solid #2B5932;margin-left: 40px;">
+            <div style="font-size: 18px;color: #56E5DE;width: 100%;text-align: center;">下载选择</div>
+            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 236px;">立即下发</div>
+          </div>
+          <div style="width: 70px;height: 280px;margin-left: 15px;">
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Mon')">
+              <div class="check-box" :style="{background: stationDate.includes('Mon')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期一</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Tues')">
+              <div class="check-box" :style="{background: stationDate.includes('Tues')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期二</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Wed')">
+              <div class="check-box" :style="{background: stationDate.includes('Wed')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期三</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Thurs')">
+              <div class="check-box" :style="{background: stationDate.includes('Thurs')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期四</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Fri')">
+              <div class="check-box" :style="{background: stationDate.includes('Fri')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期五</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Sta')">
+              <div class="check-box" :style="{background: stationDate.includes('Sta')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期六</div>
+            </div>
+            <div style="display: flex;align-items: center;cursor: pointer;" @click="selectedStationDate('Sun')">
+              <div class="check-box" :style="{background: stationDate.includes('Sun')?'#0F0':'#BFC1C1'}" />
+              <div class="check-text">星期日</div>
+            </div>
+            <div class="button-box" style="background: #3F8B66;text-align: center;margin-top: 80px;">排定下发</div>
           </div>
         </div>
       </div>
@@ -40,14 +126,35 @@ export default {
     name: 'SchedulesManage',
     data() {
         return {
-            tableName: ''
+            tableName: '',
+            newTableName: '',
+            stationDate: [],
+            allStationDate: []
         };
+    },
+    methods: {
+        selectedStationDate(day) {
+            const index = this.stationDate.indexOf(day);
+            if (index < 0) {
+                this.stationDate.push(day);
+            } else {
+                this.stationDate.splice(index, 1);
+            }
+        },
+        selectedAllStationDate(day) {
+            const index = this.allStationDate.indexOf(day);
+            if (index < 0) {
+                this.allStationDate.push(day);
+            } else {
+                this.allStationDate.splice(index, 1);
+            }
+        }
     }
 };
 </script>
 
 <style scoped>
-	.top-content-box {
+	.content-box {
 		width: 950px;
 		margin-top: 10px;
 		border-top: 2px solid #A4A3A0;
@@ -56,10 +163,24 @@ export default {
 		border-right: 2px solid #E5F1FE;
 		padding-bottom: 10px;
 	}
+	.border-box{
+		border-top: 2px solid #FFFFFE;
+		border-right: 2px solid #797977;
+		border-bottom: 2px solid #797977;
+		border-left: 2px solid #FFFFFE;
+	}
+	.check-text {
+		display: inline-block;
+		color: #56E5DE;
+		font-size: 13px;
+		height: 25px;
+		line-height: 25px;
+		margin-left: 5px;
+	}
 	.check-box {
 		display: inline-block;
-		height: 10px;
-		width: 10px;
+		height: 14px;
+		width: 14px;
 		background: #BFC1C1;
 		border-top: 2px solid #FFFFFE;
 		border-right: 2px solid #797977;
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index d4195cf65..2d94525ad 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -71,9 +71,9 @@ export default {
             height: 800,
             roadData: [],
             focus: false,
-            booleanList: ['lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute'],
+            booleanList: ['lockFirst', 'switchSingleHandle', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute', 'initSingleLockSwitch'],
             selectList: ['upDirection', 'runMode'],
-            generalConfig: ['lockFirst', 'switchSingleHandle', 'upDirection', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute', 'runMode'],
+            generalConfig: ['lockFirst', 'switchSingleHandle', 'upDirection', 'switchNRTurnChain', 'switchSingleLockChain', 'signalForceCancelRoute', 'runMode', 'initSingleLockSwitch'],
             numberList: [],
             optionsMap: {
                 upDirection: [{label: 'right', value: 'right'}, {label: 'left', value: 'left'}],
@@ -86,7 +86,8 @@ export default {
                 switchNRTurnChain:'道岔正/反操是否联动',
                 switchSingleLockChain:'道岔单解/锁是否联动',
                 signalForceCancelRoute:'是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路',
-                runMode:'列车控制模式/级别'
+                runMode:'列车控制模式/级别',
+                initSingleLockSwitch: '初始加载设备时是否默认单锁正线道岔'
             }
         };
     },

From dda8f39adfb90ed11fff329670efb55c63dc00c5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 11 Jun 2020 13:29:06 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=B3=E9=94=AE=E6=93=8D=E4=BD=9C=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../childDialog/childDialog/noticeInfo.vue    | 132 ++++---
 .../beijing_01/menus/dialog/standControl.vue  | 300 --------------
 .../beijing_01/menus/menuStationStand.vue     |   8 +-
 .../childDialog/childDialog/noticeInfo.vue    |  90 +++++
 .../menus/dialog/standControl.vue             |  14 +-
 .../menus/dialog/standJumpStopControl.vue     |  18 +-
 .../theme/components/utils/menuOperate.js     | 251 ++++++++++++
 .../foshan_01/menus/dialog/standControl.vue   | 366 ------------------
 .../menus/dialog/standJumpStopControl.vue     | 355 -----------------
 .../foshan_01/menus/menuStationStand.vue      |   8 +-
 .../menus/dialog/standJumpStopControl.vue     | 327 ----------------
 .../ningbo_01/menus/menuStationStand.vue      |   8 +-
 src/views/newMap/displayNew/index.vue         |   5 +-
 src/views/newMap/displayNew/menuLesson.vue    |   3 +-
 14 files changed, 448 insertions(+), 1437 deletions(-)
 delete mode 100644 src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
 create mode 100644 src/jmapNew/theme/components/menus/childDialog/childDialog/noticeInfo.vue
 rename src/jmapNew/theme/{ningbo_01 => components}/menus/dialog/standControl.vue (96%)
 rename src/jmapNew/theme/{beijing_01 => components}/menus/dialog/standJumpStopControl.vue (96%)
 create mode 100644 src/jmapNew/theme/components/utils/menuOperate.js
 delete mode 100644 src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
 delete mode 100644 src/jmapNew/theme/foshan_01/menus/dialog/standJumpStopControl.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/standJumpStopControl.vue

diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
index b0906c922..7d522d028 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -1,72 +1,82 @@
 <template>
-    <el-dialog class="beijing-01__systerm notice-info" :title="title" :visible.sync="show" width="360px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div class="context">
-            <template v-for="(message, index) in messages">
-                <div :key="index">{{message}}</div>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="8">
-                <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
-            </el-col>
-        </el-row>
-        </span>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message, index) in messages">
+        <div :key="index">{{ message }}</div>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'NoticeInfo',
-        data() {
-            return {
-                dialogShow: false,
-                messages: ['命令下达失败'],
-                operate: null
+export default {
+    name: 'NoticeInfo',
+    data() {
+        return {
+            dialogShow: false,
+            messages: ['命令下达失败'],
+            operate: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '提示';
+        },
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, messages) {
+            this.operate = operate || {};
+            this.dialogShow = true;
+            this.messages = ['命令下达失败'];
+            if (messages && messages != 'null') {
+                this.messages.push(messages);
             }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '提示';
-            },
-            domIdSure() {
-                return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, messages) {
-                this.operate = operate || {};
-                this.dialogShow = true;
-                this.messages = ['命令下达失败'];
-                if (messages && messages != 'null') {
-                     this.messages.push(messages);
-                }
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.doClose();
-            },
-            cancel() {
-                this.doClose();
-            }
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.doClose();
+        },
+        cancel() {
+            this.doClose();
         }
     }
+};
 
 </script>
 <style>
@@ -74,4 +84,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
deleted file mode 100644
index 16914ffe9..000000000
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standControl.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="beijing-01__systerm stand-detain-train"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="10"><span>集中站</span></el-col>
-      <el-col :span="10" :offset="2"><span>站台</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="10">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <el-input v-model="standName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div v-if="!earlyDepar">
-      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio"
-              label="1"
-              :disabled="radio == 2"
-              style="display: block; text-align: left;"
-            >
-              本站台上行</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio"
-              label="2"
-              :disabled="radio == 1"
-              style="display: block; text-align: left;"
-            >
-              本站台下行</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio1"
-              label="1"
-              :disabled="radio1 == '2'"
-              style="display: block; text-align: left;"
-            >
-              扣车</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio1"
-              label="2"
-              :disabled="radio1 == '1'"
-              style="display: block; text-align: left;"
-            >
-              取消扣车</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div v-if="earlyDepar">
-      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              :id="upRadioId"
-              v-model="radio2"
-              label="1"
-              style="display: block; text-align: left;"
-              @change="changeRadio"
-            >
-              本站台上行</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              :id="downRadioId"
-              v-model="radio2"
-              label="2"
-              style="display: block; text-align: left;"
-              @change="changeRadio"
-            >
-              本站台下行</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import { mouseCancelState } from '../utils/menuItemStatus';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '../utils/menuOperate';
-
-export default {
-    name: 'StandDetainTrain',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            stationName: '',
-            selected: null,
-            operation: null,
-            radio: '1',
-            radio1: '1',
-            radio2: '1',
-            earlyDepar: false
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        upRadioId() {
-            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.upSelect.domId : '';
-        },
-        downRadioId() {
-            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.downSelect.domId : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                return '扣车';
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                return '取消扣车';
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                return '提前发车';
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected) {
-                    this.standName = selected.name;
-                }
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-
-                this.operation = operate.operation;
-            }
-            this.dialogShow = true;
-
-            this.earlyDepar = false;
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                if (this.selected.right) {
-                    this.radio = '1';
-                } else {
-                    this.radio = '2';
-                }
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                if (this.selected.right) {
-                    this.radio = '1';
-                } else {
-                    this.radio = '2';
-                }
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                this.earlyDepar = true;
-                if (this.selected.right) {
-                    this.radio2 = '1';
-                } else {
-                    this.radio2 = '2';
-                }
-            }
-
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
-        },
-        changeRadio(val) {
-            const operate = {
-                operation: '',
-                val: val
-            };
-            if (val == 1) {
-                operate.operation = OperationEvent.StationStand.earlyDeparture.upSelect.operation;
-            } else if (val == 2) {
-                operate.operation = OperationEvent.StationStand.earlyDeparture.downSelect.operation;
-            }
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                console.log(error);
-            });
-        },
-        commit() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                /** 设置扣车*/
-                this.setDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                /** 取消扣车*/
-                this.cancelDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                /** 提前发车*/
-                this.earlyDeparture();
-            }
-        },
-        // 设置扣车
-        setDetainTrain() {
-            this.sendCommand(menuOperate.StationStand.setDetainTrain);
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
-        },
-
-        // 提前发车
-        earlyDeparture() {
-            this.sendCommand(menuOperate.StationStand.earlyDeparture);
-        },
-        sendCommand(operate) { // 发送指令
-            this.loading = true;
-            commitOperate(operate, {}, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
index 948dea0c8..da4655da8 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" />
-    <stand-jump-stop-control ref="standJumpStopControl" />
+    <stand-control ref="standControl" system-name="beijing-01__systerm" />
+    <stand-jump-stop-control ref="standJumpStopControl" system-name="beijing-01__systerm" />
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
     <stand-stop-time ref="standStopTime" />
@@ -13,8 +13,8 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StandControl from './dialog/standControl';
-import StandJumpStopControl from './dialog/standJumpStopControl';
+import StandControl from '@/jmapNew/theme/components/menus/dialog/standControl';
+import StandJumpStopControl from '@/jmapNew/theme/components/menus/dialog/standJumpStopControl';
 import StandBackStrategy from './dialog/standBackStrategy';
 import StandDetail from './dialog/standDetail';
 import StandRunLevel from './dialog/standRunLevel';
diff --git a/src/jmapNew/theme/components/menus/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/components/menus/childDialog/childDialog/noticeInfo.vue
new file mode 100644
index 000000000..12eabba26
--- /dev/null
+++ b/src/jmapNew/theme/components/menus/childDialog/childDialog/noticeInfo.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :class="systemName+' notice-info'"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message, index) in messages">
+        <div :key="index">{{ message }}</div>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import {OperationEvent } from '@/scripts/ConstDic';
+export default {
+    name: 'NoticeInfo',
+    props:{
+        systemName:{
+            type:String,
+            required:true
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            messages: ['命令下达失败']
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '提示';
+        },
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(messages) {
+            this.dialogShow = true;
+            this.messages = ['命令下达失败'];
+            if (messages && messages != 'null') {
+                this.messages.push(messages);
+            }
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.doClose();
+        },
+        cancel() {
+            this.doClose();
+        }
+    }
+};
+
+</script>
+<style>
+    .notice-info .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
similarity index 96%
rename from src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
rename to src/jmapNew/theme/components/menus/dialog/standControl.vue
index 314fa53e5..c8577b263 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag class="ningbo-01__systerm stand-detain-train" :title="title" :visible.sync="show" width="320px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :class="systemName+' stand-detain-train'" :title="title" :visible.sync="show" width="320px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row class="header">
       <el-col :span="10"><span>集中站</span></el-col>
       <el-col :span="10" :offset="2"><span>站台</span></el-col>
@@ -121,21 +121,27 @@
         <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo" />
+    <notice-info ref="noticeInfo" :system-name="systemName" />
   </el-dialog>
 </template>
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '../utils/menuOperate';
+import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '../../utils/menuOperate';
 
 export default {
     name: 'StandDetainTrain',
     components: {
         NoticeInfo
     },
+    props:{
+        systemName:{
+            type:String,
+            required:true
+        }
+    },
     data() {
         return {
             dialogShow: false,
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
similarity index 96%
rename from src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
rename to src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
index 9c1ac42ef..7a17f6bb6 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-dialogDrag
-    class="beijing-01__systerm stand-detain-train"
+    :class="systemName+' stand-detain-train'"
     :title="title"
     :visible.sync="show"
     width="380px"
@@ -97,23 +97,29 @@
         <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo" />
+    <notice-info ref="noticeInfo" :system-name="systemName" />
   </el-dialog>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import { mouseCancelState } from '../utils/menuItemStatus';
+// import { mouseCancelState } from '../utils/menuItemStatus';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '../utils/menuOperate';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '../../utils/menuOperate';
 
 export default {
     name: 'StandDetainTrains',
     components: {
         NoticeInfo
     },
+    props:{
+        systemName:{
+            type:String,
+            required:true
+        }
+    },
     data() {
         return {
             dialogShow: false,
@@ -237,7 +243,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
-            mouseCancelState(this.selected);
+            // mouseCancelState(this.selected);
         },
         commit() {
             if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
new file mode 100644
index 000000000..183d9ba00
--- /dev/null
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -0,0 +1,251 @@
+import store from '@/store/index_APP_TARGET';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+
+// 操作
+export const menuOperate = {
+    Section:{
+        active:{
+            // 区段激活
+            operation: OperationEvent.Section.active.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_ACTIVE
+        },
+        alxeEffective:{
+            // 确认计轴有效
+            operation: OperationEvent.Section.alxeEffective.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
+        },
+        split:{
+            // 区段切除
+            operation: OperationEvent.Section.split.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+        },
+        setSpeed:{
+            // 设置速度
+            operation: OperationEvent.Section.setSpeed.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+        },
+        axlePreReset:{
+            // 区段计轴预复位
+            operation: OperationEvent.Section.axlePreReset.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
+        },
+        fault:{
+            // 区段故障解锁
+            operation: OperationEvent.Section.fault.menu.operation,
+            cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+        }
+    },
+    Signal:{
+        arrangementRoute:{
+            // 排列进路
+            operation: OperationEvent.Signal.arrangementRoute.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+        },
+        cancelTrainRoute:{
+            // 取消进路
+            operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+        },
+        humanTrainRoute:{
+            // 总人解
+            operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
+            cmdType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+        },
+        reopenSignal:{
+            // 信号重开
+            operation: OperationEvent.Signal.reopenSignal.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+        },
+        signalClose:{
+            // 信号关灯
+            operation: OperationEvent.Signal.signalClose.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
+        },
+        humanControl:{
+            // 进路交人工控
+            operation: OperationEvent.Signal.humanControl.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+        },
+        atsAutoControl:{
+            // 进路交自动控
+            operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+        },
+        setAutoInterlock:{
+            // 设置通过模式
+            operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+        },
+        cancelAutoInterlock:{
+            // 取消通过模式
+            operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
+            cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+        },
+        detail:{
+            // 查询进路状态
+            operation: OperationEvent.Signal.detail.menu.operation
+        }
+    },
+    Switch:{
+        lock:{
+            // 道岔单锁
+            operation: OperationEvent.Switch.lock.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+        },
+        unlock:{
+            // 道岔解锁
+            operation: OperationEvent.Switch.unlock.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+        },
+        turnoutForce:{
+            // 道岔强扳
+            operation: OperationEvent.Switch.turnoutForce.menu.operation
+        },
+        locate:{
+            // 单操到定位
+            operation: OperationEvent.Switch.locate.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
+        },
+        reverse:{
+            // 单操到反位
+            operation: OperationEvent.Switch.reverse.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
+        },
+        split:{
+            // 区段切除
+            operation: OperationEvent.Switch.split.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
+        },
+        active:{
+            // 区段激活
+            operation: OperationEvent.Switch.active.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
+        },
+        setSpeed:{
+            // 设置临时限速
+            operation: OperationEvent.Switch.setSpeed.menu.operation,
+            cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+        },
+        alxeEffective:{
+            // 确认计轴有效
+            operation: OperationEvent.Switch.alxeEffective.menu.operation,
+            cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
+        }
+
+    },
+    StationStand:{
+        setDetainTrain:{
+            // 设置扣车
+            operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+        },
+        cancelDetainTrain:{
+            // 取消扣车
+            operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+        },
+        setJumpStop:{
+            // 设置跳停
+            operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+        },
+        cancelJumpStop:{
+            // 取消跳停
+            operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+        },
+        setStopTime:{
+            // 停站时间控制
+            operation: OperationEvent.StationStand.setStopTime.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+        },
+        setRunLevel:{
+            // 运行时间控制
+            operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
+        },
+        earlyDeparture:{
+            // 设置提前发车
+            operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
+        },
+        setBackStrategy:{
+            // 设置折返策略
+            operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
+            cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
+        },
+        setDetainTrainAuto:{
+            // 区间列车数量限制
+            operation: OperationEvent.StationStand.setDetainTrainAuto.menu.operation,
+            cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
+        },
+        cancelDetainTrainAuto:{
+            // 取消区间列车数量限制
+            operation: OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation,
+            cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
+        },
+        detail:{
+            // 查询站台状态
+            operation: OperationEvent.StationStand.detail.menu.operation
+        }
+    },
+    StationControl:{
+        requestCentralControl:{
+            // 请求中控（遥控）
+            operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
+            cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
+        },
+        requestStationControl:{
+            // 请求站控
+            operation: OperationEvent.StationControl.requestStationControl.menu.operation,
+            cmdType:CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
+        },
+        emergencyStationControl:{
+            // 紧急站控
+            operation: OperationEvent.StationControl.emergencyStationControl.menu.operation,
+            cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
+        }
+    },
+    Common: {
+        setFault: {
+            operation: OperationEvent.MixinCommand.stoppage.menu.operation,
+            cmdType: CMD.Fault.CMD_SET_FAULT
+        },
+        cancelFault: {
+            operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
+            cmdType: CMD.Fault.CMD_CANCEL_FAULT
+        }
+    }
+};
+
+export function commitOperate(operate, paramList, over) {
+    const step = {
+        start: true,
+        operation: operate.operation,
+        param:{}
+    };
+    step.param = paramList;
+    // over 0为首次操作，1为中间操作，2为最后操作，3为直接一次性操作
+    if (over == 0 || over == 3) {
+        const codeList = Object.values(paramList);
+        step.code = codeList[0];
+    }
+    if (over != 0 && over != 3) {
+        delete step.start;
+    }
+    if (over == 2 || over == 3) {
+        step.over = true;
+        step.cmdType = operate.cmdType;
+    }
+    return new Promise(function(resolve, reject) {
+        store.dispatch('training/nextNew', step).then(({ valid }) => {
+            if (valid) {
+                store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            }
+            resolve({ valid: valid, operate: step });
+        }).catch(error=>{
+            reject(error);
+        });
+    });
+}
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
deleted file mode 100644
index 5abc1b81f..000000000
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standControl.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="foshan-01__systerm stand-detain-train" :title="title" :visible.sync="show" width="320px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <el-row class="header">
-      <el-col :span="10"><span>集中站</span></el-col>
-      <el-col :span="10" :offset="2"><span>站台</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="10">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <el-input v-model="standName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div v-if="buckle">
-      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio"
-              label="1"
-              :disabled="radio == 2"
-              style="display: block; text-align: left;"
-            >
-              本站台上行</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio"
-              label="2"
-              :disabled="radio == 1"
-              style="display: block; text-align: left;"
-            >
-              本站台下行</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio1"
-              label="1"
-              :disabled="radio1 == '2'"
-              style="display: block; text-align: left;"
-            >
-              扣车</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio1"
-              label="2"
-              :disabled="radio1 == '1'"
-              style="display: block; text-align: left;"
-            >
-              取消扣车</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div v-if="AutomaticBuckle">
-      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio v-model="autoRadio" label="1" style="display: block; text-align: left;">上行</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio v-model="autoRadio" label="2" style="display: block; text-align: left;">下行</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio v-model="autoRadio1" label="1" :disabled="autoRadio1 == '2'" style="display: block; text-align: left;">设置</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio v-model="autoRadio1" label="2" :disabled="autoRadio1 == '1'" style="display: block; text-align: left;">取消</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div v-if="earlyDepar">
-      <div style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">类型</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              :id="upRadioId"
-              v-model="radio2"
-              label="1"
-              style="display: block; text-align: left;"
-              :disabled="radio2 == 2"
-              @change="changeRadio"
-            >
-              本站台上行</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              :id="downRadioId"
-              v-model="radio2"
-              label="2"
-              style="display: block; text-align: left;"
-              :disabled="radio2 == 1"
-              @change="changeRadio"
-            >
-              本站台下行</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'StandDetainTrain',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            stationName: '',
-            selected: null,
-            operation: null,
-            radio: '1',
-            radio1: '1',
-            radio2: '1',
-            earlyDepar: false, // 提前发车
-            buckle: true, // 设置扣车
-            AutomaticBuckle: false, // 区间自动扣车
-            autoRadio: '1',
-            autoRadio1: '1'
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        upRadioId() {
-            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.upSelect.domId : '';
-        },
-        downRadioId() {
-            return this.dialogShow ? OperationEvent.StationStand.earlyDeparture.downSelect.domId : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                return '扣车';
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                return '取消扣车';
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                return '提前发车';
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected) {
-                    this.standName = selected.name;
-                }
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.deviceStationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.radio = '2';
-                if (!this.selected.right) { // 判断站台行驶方向
-                    this.radio = '1';
-                }
-
-                this.operation = operate.operation;
-                this.setDefaultItems();
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        setDefaultItems() { // 设置默认选项值
-            this.earlyDepar = false;
-            this.buckle = false;
-            this.AutomaticBuckle = false;
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                this.buckle = true;
-                this.radio1 = '1';
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                this.buckle = true;
-                this.radio1 = '2';
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                this.earlyDepar = true;
-                if (!this.selected.right) {
-                    this.radio2 = '2';
-                } else {
-                    this.radio2 = '1';
-                }
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.operation = '';
-            this.$store.dispatch('training/emitTipFresh');
-            this.mouseCancelState(this.selected);
-        },
-        changeRadio(val) { // 提前发车选择上下行
-            const operate = {
-                operation: '',
-                val: val
-            };
-            if (val == 1) {
-                operate.operation = OperationEvent.StationStand.earlyDeparture.upSelect.operation;
-            } else if (val == 2) {
-                operate.operation = OperationEvent.StationStand.earlyDeparture.downSelect.operation;
-            }
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch(error => {
-                console.log(error);
-            });
-        },
-        commit() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                /** 设置扣车*/
-                this.setDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                /** 取消扣车*/
-                this.cancelDetainTrain();
-            } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
-                /** 提前发车*/
-                this.earlyDeparture();
-            }
-        },
-        // 设置扣车
-        setDetainTrain() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
-                param: {
-                    leftDirection: this.radio == '2', // 1 上行 2 下行
-                    rightDirection: this.radio == '1'
-                }
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
-                param: {
-                    leftDirection: this.radio == '2', // 1 上行 2 下行
-                    rightDirection: this.radio == '1'
-                }
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                this.doClose();
-                if (!valid) {
-                    this.$refs.noticeInfo.doShow(operate);
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
-        },
-        // 提前发车
-        earlyDeparture() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(error => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standJumpStopControl.vue
deleted file mode 100644
index 57d1e7d9b..000000000
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standJumpStopControl.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="foshan-01__systerm stand-detain-train" :title="title" :visible.sync="show" width="380px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <el-row class="header">
-      <el-col :span="11"><span>集中站</span></el-col>
-      <el-col :span="11" :offset="2"><span>站台</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-input v-model="standName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-form label-width="70px" size="mini" style="">
-      <el-row style="margin-top: 20px;padding: 10px 5px; border: 1px solid lightgray;">
-        <span class="base-label" style="display:block; padding-left: 20px;">范围</span>
-        <el-radio-group :id="selfStationStandId" v-model="model.val1" @change="upAndDownStreamChangeVal1">
-          <div style="margin-bottom: 8px;">
-            <el-radio :label="upstream" :disabled="model.direction !== '02'">本站台上行跳停</el-radio>
-          </div>
-          <div style="margin-bottom: 8px;">
-            <el-radio :label="downstream" :disabled="model.direction !== '01'">本站台下行跳停</el-radio>
-          </div>
-        </el-radio-group>
-        <el-row>
-          <el-col :span="10">
-            <el-radio-group :id="otherStationStandId" v-model="model.val2" @change="upAndDownStreamChange">
-              <div style="margin-bottom: 8px;">
-                <el-radio :label="upstream" :disabled="model.direction !== '02'">指定列车上行跳停</el-radio>
-              </div>
-              <div style="margin-bottom: 8px;">
-                <el-radio :label="downstream" :disabled="model.direction !== '01'">指定列车下行跳停</el-radio>
-              </div>
-            </el-radio-group>
-          </el-col>
-          <el-col :span="11" align="top" :offset="2">
-            <span>车组号</span>
-            <el-select
-              :id="selectTrainId"
-              v-model="model.tripNumber"
-              style="width: 110px;"
-              size="mini"
-              :disabled="!model.val2"
-              @change="trainNoSelectChange"
-            >
-              <el-option
-                v-for="option in trainList"
-                :key="option.groupNumber"
-                :label="option.groupNumber"
-                :value="option.groupNumber"
-              />
-            </el-select>
-          </el-col>
-        </el-row>
-      </el-row>
-    </el-form>
-    <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-      <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
-      <el-row style="margin-top: -13px;">
-        <el-col :span="11">
-          <el-radio
-            v-model="radio1"
-            :label="JumpStopSet"
-            :disabled="radio1 == JumpStopCancel"
-            style="display: block; text-align: left;"
-          >
-            设置</el-radio>
-        </el-col>
-        <el-col :span="11" :offset="2">
-          <el-radio
-            v-model="radio1"
-            :label="JumpStopCancel"
-            :disabled="radio1 == JumpStopSet"
-            style="display: block; text-align: left;"
-          >
-            取消</el-radio>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'StandDetainTrains',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            stationName: '',
-            selected: null,
-            operation: null,
-            trainList: [],
-            radio1: '',
-            model: {
-                val1: '',
-                val2: '',
-                tripNumber: '',
-                direction: ''
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        selectTrainId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
-            }
-        },
-        selfStationStandId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.selfStationStand.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.selfStationStand.domId : '';
-            }
-        },
-        otherStationStandId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.otherStationStand.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.otherStationStand.domId : '';
-            }
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            return '跳停';
-        },
-        upstream() {
-            return '02'; // 上行
-        },
-        downstream() {
-            return '01'; // 下行
-        },
-        JumpStopSet() {
-            return OperationEvent.StationStand.setJumpStop.menu.operation;
-        },
-        JumpStopCancel() {
-            return OperationEvent.StationStand.cancelJumpStop.menu.operation;
-        }
-    },
-    watch: {
-        'model.val1'(val) {
-            if (val) this.model.val2 = '';
-        },
-        'model.val2'(val) {
-            if (val) this.model.val1 = '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.radio1 = '';
-                this.standName = '';
-                this.stationName = '';
-                if (selected) {
-                    this.standName = selected.name;
-                }
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.deviceStationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.model.direction = '01';
-                this.model.val1 = '01'; // 站台的上下行方向, 01:下行 /02:上行
-                if (!this.selected.right) {
-                    this.model.direction = '02';
-                    this.model.val1 = '02';
-                }
-                this.radio1 = operate.operation;
-
-                this.model.val2 = '';
-                this.model.tripNumber = '';
-
-                /** 加载列车数据*/
-                this.trainList = this.map.trainList;
-                this.operation = operate.operation;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                /** 设置跳停*/
-                this.setJumpStop();
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                /** 取消跳停*/
-                this.cancelJumpStop();
-            }
-        },
-        // 设置跳停
-        setJumpStop() {
-            // let val = this.model.val1;
-            // if (this.model.val2) {
-            //     val = this.model.val2;
-            // }
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
-                param: {
-                    // Is_This_Platform: val,
-                    trainGroupNumber: this.model.tripNumber
-                }
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            // let val = this.model.val1;
-            // if (this.model.val2) {
-            //     val = this.model.val2;
-            // }
-            const operate = {
-                over: true,
-                operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
-                cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
-                param: {
-                    // Is_This_Platform: val,
-                    trainGroupNumber: this.model.tripNumber
-                }
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        upAndDownStreamChangeVal1(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.selfStationStand.operation : OperationEvent.StationStand.cancelJumpStop.selfStationStand.operation;
-            this.model.val2 = '';
-            this.model.tripNumber = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        upAndDownStreamChange(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.otherStationStand.operation : OperationEvent.StationStand.cancelJumpStop.otherStationStand.operation;
-            this.model.val1 = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        trainNoSelectChange(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.select.operation : OperationEvent.StationStand.cancelJumpStop.select.operation;
-            this.model.val1 = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        }
-    }
-};
-</script>
-<style>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
index 32480089d..1ff1a2876 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" />
-    <stand-jump-stop-control ref="standJumpStopControl" />
+    <stand-control ref="standControl" system-name="foshan-01__systerm" />
+    <stand-jump-stop-control ref="standJumpStopControl" system-name="foshan-01__systerm" />
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
     <stand-stop-time ref="standStopTime" />
@@ -14,8 +14,8 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StandControl from './dialog/standControl';
-import StandJumpStopControl from './dialog/standJumpStopControl';
+import StandControl from '@/jmapNew/theme/components/menus/dialog/standControl';
+import StandJumpStopControl from '@/jmapNew/theme/components/menus/dialog/standJumpStopControl';
 import StandBackStrategy from './dialog/standBackStrategy';
 import StandDetail from './dialog/standDetail';
 import StandRunLevel from './dialog/standRunLevel';
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standJumpStopControl.vue
deleted file mode 100644
index 9ee4f97f1..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standJumpStopControl.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="ningbo-01__systerm stand-detain-train" :title="title" :visible.sync="show" width="380px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <el-row class="header">
-      <el-col :span="11"><span>集中站</span></el-col>
-      <el-col :span="11" :offset="2"><span>站台</span></el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-input v-model="standName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-form label-width="70px" size="mini" style="">
-      <el-row style="margin-top: 20px;padding: 10px 5px; border: 1px solid lightgray;">
-        <span class="base-label" style="display:block; padding-left: 20px;">范围</span>
-        <el-radio-group :id="selfStationStandId" v-model="model.val1" @change="upAndDownStreamChangeVal1">
-          <div style="margin-bottom: 8px;">
-            <el-radio :label="upstream" :disabled="model.direction !== '02'">本站台上行跳停</el-radio>
-          </div>
-          <div style="margin-bottom: 8px;">
-            <el-radio :label="downstream" :disabled="model.direction !== '01'">本站台下行跳停</el-radio>
-          </div>
-        </el-radio-group>
-        <el-row>
-          <el-col :span="10">
-            <el-radio-group :id="otherStationStandId" v-model="model.val2" @change="upAndDownStreamChange">
-              <div style="margin-bottom: 8px;">
-                <el-radio :label="upstream" :disabled="model.direction !== '02'">指定列车上行跳停</el-radio>
-              </div>
-              <div style="margin-bottom: 8px;">
-                <el-radio :label="downstream" :disabled="model.direction !== '01'">指定列车下行跳停</el-radio>
-              </div>
-            </el-radio-group>
-          </el-col>
-          <el-col :span="11" align="top" :offset="2">
-            <span>车组号</span>
-            <el-select
-              :id="selectTrainId"
-              v-model="model.tripNumber"
-              style="width: 110px;"
-              size="mini"
-              :disabled="!model.val2"
-              @change="trainNoSelectChange"
-            >
-              <el-option
-                v-for="option in trainList"
-                :key="option.groupNumber"
-                :label="option.groupNumber"
-                :value="option.groupNumber"
-              />
-            </el-select>
-          </el-col>
-        </el-row>
-      </el-row>
-    </el-form>
-    <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-      <span class="base-label" style="left: -5px; top: -22px; background: #f0f0f0; padding: 0 4px;">功能</span>
-      <el-row style="margin-top: -13px;">
-        <el-col :span="11">
-          <el-radio
-            v-model="radio1"
-            :label="JumpStopSet"
-            :disabled="radio1 == JumpStopCancel"
-            style="display: block; text-align: left;"
-          >
-            设置</el-radio>
-        </el-col>
-        <el-col :span="11" :offset="2">
-          <el-radio
-            v-model="radio1"
-            :label="JumpStopCancel"
-            :disabled="radio1 == JumpStopSet"
-            style="display: block; text-align: left;"
-          >
-            取消</el-radio>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '../utils/menuOperate';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'StandDetainTrains',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            stationName: '',
-            selected: null,
-            operation: null,
-            trainList: [],
-            radio1: '',
-            model: {
-                val1: '',
-                val2: '',
-                tripNumber: '',
-                direction: ''
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        selectTrainId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
-            }
-        },
-        selfStationStandId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.selfStationStand.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.selfStationStand.domId : '';
-            }
-        },
-        otherStationStandId() {
-            if (this.radio1 == this.JumpStopSet) {
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.otherStationStand.domId : '';
-            } else {
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.otherStationStand.domId : '';
-            }
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            return '跳停';
-        },
-        upstream() {
-            return '02'; // 上行
-        },
-        downstream() {
-            return '01'; // 下行
-        },
-        JumpStopSet() {
-            return OperationEvent.StationStand.setJumpStop.menu.operation;
-        },
-        JumpStopCancel() {
-            return OperationEvent.StationStand.cancelJumpStop.menu.operation;
-        }
-    },
-    watch: {
-        'model.val1'(val) {
-            if (val) this.model.val2 = '';
-        },
-        'model.val2'(val) {
-            if (val) this.model.val1 = '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.radio1 = '';
-                this.standName = '';
-                this.stationName = '';
-                if (selected) {
-                    this.standName = selected.name;
-                }
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.standName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.deviceStationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.model.direction = '01';
-                this.model.val1 = '01'; // 站台的上下行方向, 01:下行 /02:上行
-                if (this.selected.right) {
-                    this.model.direction = '02';
-                    this.model.val1 = '02';
-                }
-                this.radio1 = operate.operation;
-
-                this.model.val2 = '';
-                this.model.tripNumber = '';
-
-                /** 加载列车数据*/
-                this.trainList = this.map.trainList;
-                this.operation = operate.operation;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                /** 设置跳停*/
-                this.setJumpStop();
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                /** 取消跳停*/
-                this.cancelJumpStop();
-            }
-        },
-        // 设置跳停
-        setJumpStop() {
-            this.loading = true;
-            commitOperate(menuOperate.StationStand.setJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            this.loading = true;
-            commitOperate(menuOperate.StationStand.cancelJumpStop, {trainGroupNumber:this.model.tripNumber}, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        },
-        upAndDownStreamChangeVal1(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.selfStationStand.operation : OperationEvent.StationStand.cancelJumpStop.selfStationStand.operation;
-            this.model.val2 = '';
-            this.model.tripNumber = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        upAndDownStreamChange(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.otherStationStand.operation : OperationEvent.StationStand.cancelJumpStop.otherStationStand.operation;
-            this.model.val1 = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        trainNoSelectChange(val) {
-            const operation = this.radio1 == this.JumpStopSet
-                ? OperationEvent.StationStand.setJumpStop.select.operation : OperationEvent.StationStand.cancelJumpStop.select.operation;
-            this.model.val1 = '';
-            const operate = {
-                operation: operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        }
-    }
-};
-</script>
-<style>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index 04105b935..f75e6e248 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" />
-    <stand-jump-stop-control ref="standJumpStopControl" />
+    <stand-control ref="standControl" system-name="ningbo-01__systerm" />
+    <stand-jump-stop-control ref="standJumpStopControl" system-name="ningbo-01__systerm" />
     <stand-detail ref="standDetail" />
     <stand-run-level ref="standRunLevel" />
     <stand-stop-time ref="standStopTime" />
@@ -14,8 +14,8 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StandControl from './dialog/standControl';
-import StandJumpStopControl from './dialog/standJumpStopControl';
+import StandControl from '@/jmapNew/theme/components/menus/dialog/standControl';
+import StandJumpStopControl from '@/jmapNew/theme/components/menus/dialog/standJumpStopControl';
 import StandBackStrategy from './dialog/standBackStrategy';
 import StandDetail from './dialog/standDetail';
 import StandRunLevel from './dialog/standRunLevel';
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 0ddd88115..2107568d9 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -84,7 +84,7 @@
         @switchStationMode="switchStationMode"
       />
 
-      <menu-system-time v-if="!isScreen" ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
+      <menu-system-time ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
     </div>
 
     <!-- <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" /> -->
@@ -243,9 +243,6 @@ export default {
         isPractice() {
             return this.mode === 'practice';
         },
-        isScreen() {
-            return this.model === 'dp';
-        },
         isDrive() {
             return this.prdType == '04';
         },
diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue
index b7b31ed70..5f7a6e85d 100644
--- a/src/views/newMap/displayNew/menuLesson.vue
+++ b/src/views/newMap/displayNew/menuLesson.vue
@@ -31,9 +31,8 @@ import { mapGetters } from 'vuex';
 import { Notification } from 'element-ui';
 import { startTrainingNew, endTrainingNew } from '@/api/jmap/training';
 import { trainingNotifyNew } from '@/api/simulation';
-import { TrainingMode } from '@/scripts/ConstDic';
+import { TrainingMode, UrlConfig } from '@/scripts/ConstDic';
 import { timeFormat } from '@/utils/date';
-import { UrlConfig } from '@/scripts/ConstDic';
 
 export default {
     name: 'MenuLesson',

From f03880e59e0adec5a6145f48dbdf28deb36b2bbf Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 11 Jun 2020 13:43:58 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/chatView/chatBox.vue    |   4 +
 .../displayNew/chatView/chatTooltip.vue       | 110 ++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 src/views/newMap/displayNew/chatView/chatTooltip.vue

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index f99e86e10..dd6c3c242 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -45,6 +45,7 @@
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
     <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
+    <chat-tooltip :group="group" @getCoversitionList="getCoversitionList" />
   </div>
 </template>
 <script>
@@ -165,6 +166,9 @@ export default {
             }
             this.$refs.chatContent.scrollTop();
         },
+        getCoversitionList() {
+            this.$refs.chatCoversitionList.initPage(false);
+        },
         quitCoversition() {
             this.quitLoading = true;
             quitCoversition(this.group, this.currentCoversition.id).then(res=>{
diff --git a/src/views/newMap/displayNew/chatView/chatTooltip.vue b/src/views/newMap/displayNew/chatView/chatTooltip.vue
new file mode 100644
index 000000000..5ccc19fc7
--- /dev/null
+++ b/src/views/newMap/displayNew/chatView/chatTooltip.vue
@@ -0,0 +1,110 @@
+<template>
+  <div v-show="dialogVisible" class="chatTooltipAll">
+    <div class="chatTooltip">
+      <div class="chatTooltipHeader">
+        {{ userName }} 邀请您加入会话！
+      </div>
+      <div class="chatTooltipBootom">
+        <div class="create-group-bottom">
+          <el-button :loading="loading" size="small" type="primary" @click="doCreate">接受</el-button>
+          <el-button size="small" @click="doClose">拒绝</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+import {acceptCoversitionInvite} from '@/api/chat';
+export default {
+    name:'ChatTooltip',
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            userName:'',
+            dialogVisible:false,
+            loading:false,
+            conversationId:''
+        };
+    },
+    watch:{
+        '$store.state.socket.inviteOtherIntoChat':function(val) {
+            this.userName = this.coverName(val);
+            this.dialogVisible = true;
+            this.conversationId = val.conversationId;
+        }
+    },
+    // {"conversationId":"22e10b17-7a6c-4b1b-8724-f87fb2053b76","from":{"id":"17","userId":"75","name":"赵",
+    // "role":"STATION_SUPERVISOR","deviceType":"STATION","deviceCode":"Station32955","deviceName":"世纪大道","online":true,"robot":false}
+    methods:{
+        coverName(inviteUser) {
+            const member = inviteUser.from;
+            const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+            let data = member.role;
+            roleTypeList.forEach(function(element) {
+                const rolename = element.value;
+                if (Cookies.get('user_lang') == 'en') {
+                    data = data.replace(rolename, element.enLabel);
+                } else {
+                    data = data.replace(rolename, element.label);
+                }
+            });
+            const deviceName = member.deviceName ? '-' + member.deviceName : '';
+            const memberName = member.name ? '-' + member.name : '';
+            return data + deviceName + memberName;
+        },
+        doCreate() {
+            this.loading = true;
+            acceptCoversitionInvite(this.group, this.conversationId).then(res=>{
+                this.loading = false;
+                this.dialogVisible = false;
+                this.$emit('getCoversitionList');
+            }).catch(error=>{
+                this.$messageBox('接受邀请失败: ' + error.message);
+            });
+        },
+        doClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chatTooltip{
+    position: absolute;
+    width: 290px;
+    left: 32%;
+    top: 42%;
+    z-index: 5;
+    background: #fff;
+    padding: 15px;
+    box-shadow: #969090 0px 0px 10px;
+    border-radius: 4px;
+    line-height: 20px;
+    transform: translateY(-50%);
+}
+.chatTooltipHeader{
+    margin-top:10px;
+    font-size:14px;
+}
+.chatTooltipBootom{
+    margin-top:10px;
+    text-align: center;
+    margin-bottom:10px;
+}
+.chatTooltipAll{
+    position:absolute;
+    width:100%;
+    height:100%;
+    left:0;
+    top:0;
+    z-index: 10;
+}
+</style>

From 24acb1ba860a21a3da21522b9b347281952f38be Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 11 Jun 2020 14:48:40 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BB=BC=E5=90=88=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/constant/iscsData.js                 |  3 +++
 src/iscs/constant/keyboardEvents.js           |  4 ++--
 src/iscs/shape/bas/jetFan.js                  |  4 ++++
 src/jmapNew/shape/Text/index.js               |  2 +-
 src/views/iscs/iscsDesign/demonList.vue       |  6 ++++++
 .../iscsBasOperate/airConditioner.vue         |  1 +
 .../iscs/iscsDraw/iscsBasOperate/jetFan.vue   |  7 +++++++
 src/views/iscsSystem/index.vue                | 20 +++++++++++--------
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/iscs/constant/iscsData.js b/src/iscs/constant/iscsData.js
index 3c7086610..120d24489 100644
--- a/src/iscs/constant/iscsData.js
+++ b/src/iscs/constant/iscsData.js
@@ -35,6 +35,9 @@ const iscsData = {
     '28': {
         'orbitalVentilatorList':[{'point':{'x':803, 'y':570}, '_type':'OrbitalVentilator', 'code':'OrbitalVentilator_1', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':402, 'y':568}, '_type':'OrbitalVentilator', 'code':'OrbitalVentilator_2', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':78, 'y':534}, 'point2':{'x':1164, 'y':534}, 'code':'IscsLine_1', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':78, 'y':534}}, {'point1':{'x':73, 'y':297}, 'point2':{'x':1163, 'y':297}, 'code':'IscsLine_2', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':73, 'y':297}}, {'point1':{'x':425, 'y':319}, 'point2':{'x':425, 'y':570}, 'code':'IscsLine_3', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':425, 'y':319}}, {'point1':{'x':824, 'y':320}, 'point2':{'x':824, 'y':571}, 'code':'IscsLine_4', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':824, 'y':320}}, {'point1':{'x':644, 'y':320}, 'point2':{'x':740, 'y':320}, 'code':'IscsLine_6', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':320}}, {'point1':{'x':514, 'y':501}, 'point2':{'x':601, 'y':501}, 'code':'IscsLine_7', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':514, 'y':501}}, {'point1':{'x':72, 'y':371}, 'point2':{'x':1164, 'y':371}, 'code':'IscsLine_10', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':72, 'y':371}}, {'point1':{'x':202, 'y':467}, 'point2':{'x':1214, 'y':467}, 'code':'IscsLine_11', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':202, 'y':467}}, {'point1':{'x':619, 'y':133}, 'point2':{'x':619, 'y':300}, 'code':'IscsLine_15', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#58D7CF', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':619, 'y':133}}, {'point1':{'x':559, 'y':131}, 'point2':{'x':678, 'y':131}, 'code':'IscsLine_16', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#58D7CF', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':559, 'y':131}}, {'point1':{'x':153, 'y':130}, 'point2':{'x':153, 'y':323}, 'code':'IscsLine_17', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':153, 'y':130}}, {'point1':{'x':344, 'y':126}, 'point2':{'x':344, 'y':474}, 'code':'IscsLine_18', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':344, 'y':126}}, {'point1':{'x':209, 'y':79}, 'point2':{'x':209, 'y':174}, 'code':'IscsLine_19', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'arrowShow':'star', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':209, 'y':79}}, {'point1':{'x':289, 'y':78}, 'point2':{'x':289, 'y':173}, 'code':'IscsLine_20', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'arrowShow':'star', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':289, 'y':78}}, {'point1':{'x':152, 'y':130}, 'point2':{'x':209, 'y':130}, 'code':'IscsLine_21', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':152, 'y':130}}, {'point1':{'x':287, 'y':127}, 'point2':{'x':344, 'y':127}, 'code':'IscsLine_22', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':287, 'y':127}}, {'point1':{'x':290, 'y':235}, 'point2':{'x':290, 'y':323}, 'code':'IscsLine_23', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':290, 'y':235}}, {'point1':{'x':282, 'y':324}, 'point2':{'x':298, 'y':324}, 'code':'IscsLine_24', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':282, 'y':324}}, {'point1':{'x':1106, 'y':208}, 'point2':{'x':1106, 'y':271}, 'code':'IscsLine_25', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1106, 'y':208}}, {'point1':{'x':988, 'y':127}, 'point2':{'x':988, 'y':331}, 'code':'IscsLine_26', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':988, 'y':127}}, {'point1':{'x':932, 'y':128}, 'point2':{'x':989, 'y':128}, 'code':'IscsLine_27', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':932, 'y':128}}, {'point1':{'x':1106, 'y':90}, 'point2':{'x':1106, 'y':144}, 'code':'IscsLine_28', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'arrowShow':'star', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':1106, 'y':90}}, {'point1':{'x':932, 'y':270}, 'point2':{'x':1108, 'y':270}, 'code':'IscsLine_29', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':932, 'y':270}}, {'point1':{'x':931, 'y':127}, 'point2':{'x':931, 'y':144}, 'code':'IscsLine_30', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':931, 'y':127}}, {'point1':{'x':931, 'y':208}, 'point2':{'x':931, 'y':271}, 'code':'IscsLine_31', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':931, 'y':208}}, {'point1':{'x':1048, 'y':128}, 'point2':{'x':1105, 'y':128}, 'code':'IscsLine_32', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1048, 'y':128}}, {'point1':{'x':1049, 'y':127}, 'point2':{'x':1049, 'y':504}, 'code':'IscsLine_33', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1049, 'y':127}}, {'point1':{'x':80, 'y':489}, 'point2':{'x':449, 'y':489}, 'code':'IscsLine_34', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':80, 'y':489}}, {'point1':{'x':481, 'y':488}, 'point2':{'x':779, 'y':488}, 'code':'IscsLine_35', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':481, 'y':488}}, {'point1':{'x':828, 'y':487}, 'point2':{'x':1164, 'y':487}, 'code':'IscsLine_36', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':828, 'y':487}}, {'point1':{'x':74, 'y':342}, 'point2':{'x':1164, 'y':342}, 'code':'IscsLine_37', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#5AD6CD', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':74, 'y':342}}, {'point1':{'x':984, 'y':334}, 'point2':{'x':984, 'y':356}, 'code':'IscsLine_39', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':984, 'y':334}}, {'point1':{'x':423, 'y':622}, 'point2':{'x':423, 'y':655}, 'code':'IscsLine_40', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'arrowShow':'end', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':423, 'y':622}}, {'point1':{'x':824, 'y':625}, 'point2':{'x':824, 'y':658}, 'code':'IscsLine_41', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'arrowShow':'end', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':824, 'y':625}}, {'point1':{'x':1041, 'y':505}, 'point2':{'x':1057, 'y':505}, 'code':'IscsLine_42', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1041, 'y':505}}, {'point1':{'x':425, 'y':501}, 'point2':{'x':495, 'y':501}, 'code':'IscsLine_43', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':425, 'y':501}}, {'point1':{'x':513, 'y':437}, 'point2':{'x':600, 'y':437}, 'code':'IscsLine_44', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':437}}, {'point1':{'x':513, 'y':390}, 'point2':{'x':600, 'y':390}, 'code':'IscsLine_45', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':390}}, {'point1':{'x':513, 'y':321}, 'point2':{'x':600, 'y':321}, 'code':'IscsLine_46', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':321}}, {'point1':{'x':425, 'y':437}, 'point2':{'x':495, 'y':437}, 'code':'IscsLine_47', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':425, 'y':437}}, {'point1':{'x':425, 'y':391}, 'point2':{'x':495, 'y':391}, 'code':'IscsLine_48', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':425, 'y':391}}, {'point1':{'x':424, 'y':321}, 'point2':{'x':494, 'y':321}, 'code':'IscsLine_49', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':424, 'y':321}}, {'point1':{'x':759, 'y':320}, 'point2':{'x':823, 'y':320}, 'code':'IscsLine_50', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':759, 'y':320}}, {'point1':{'x':645, 'y':391}, 'point2':{'x':741, 'y':391}, 'code':'IscsLine_51', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':391}}, {'point1':{'x':645, 'y':437}, 'point2':{'x':741, 'y':437}, 'code':'IscsLine_52', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':437}}, {'point1':{'x':645, 'y':501}, 'point2':{'x':741, 'y':501}, 'code':'IscsLine_53', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':645, 'y':501}}, {'point1':{'x':760, 'y':391}, 'point2':{'x':824, 'y':391}, 'code':'IscsLine_54', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':760, 'y':391}}, {'point1':{'x':760, 'y':437}, 'point2':{'x':824, 'y':437}, 'code':'IscsLine_55', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':760, 'y':437}}, {'point1':{'x':759, 'y':502}, 'point2':{'x':823, 'y':502}, 'code':'IscsLine_56', '_type':'IscsLine', 'lineWidth':3, 'fillColor':'#0069FF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':759, 'y':502}}, {'point1':{'x':81, 'y':433}, 'point2':{'x':144, 'y':433}, 'code':'IscsLine_57', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'solid', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':81, 'y':433}}, {'point1':{'x':81, 'y':433}, 'point2':{'x':92, 'y':426}, 'code':'IscsLine_58', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'solid', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':81, 'y':433}}, {'point1':{'x':1136, 'y':425}, 'point2':{'x':1199, 'y':425}, 'code':'IscsLine_59', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'solid', 'zlevel':1, 'z':4, 'point':{'x':1136, 'y':425}, 'arrowShow':'none', 'arrowSize':5}, {'point1':{'x':1189, 'y':416}, 'point2':{'x':1198, 'y':424}, 'code':'IscsLine_60', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'solid', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':1189, 'y':416}}, {'point1':{'x':941, 'y':550}, 'point2':{'x':941, 'y':576}, 'code':'IscsLine_61', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'solid', 'arrowShow':'end', 'arrowSize':4, 'zlevel':1, 'z':4, 'point':{'x':941, 'y':550}}, {'point1':{'x':923, 'y':385}, 'point2':{'x':953, 'y':385}, 'code':'IscsLine_62', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'dashed', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':923, 'y':385}}, {'point1':{'x':923, 'y':546}, 'point2':{'x':953, 'y':546}, 'code':'IscsLine_63', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'dashed', 'zlevel':1, 'z':4, 'point':{'x':923, 'y':546}, 'arrowShow':'none', 'arrowSize':5}, {'point1':{'x':924, 'y':385}, 'point2':{'x':924, 'y':546}, 'code':'IscsLine_64', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'dashed', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':924, 'y':385}}, {'point1':{'x':952, 'y':385}, 'point2':{'x':952, 'y':542}, 'code':'IscsLine_65', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#FFFFFF', 'classify':'dashed', 'arrowShow':'none', 'arrowSize':5, 'zlevel':1, 'z':4, 'point':{'x':952, 'y':385}}], 'iscsTextList':[{'point':{'x':574, 'y':111}, 'code':'IscsText_1', '_type':'IscsText', 'context':'会展中心站', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':695, 'y':129}, 'code':'IscsText_2', '_type':'IscsText', 'context':'世纪大道站', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':79, 'y':130}, 'code':'IscsText_3', '_type':'IscsText', 'context':'MD-201-I-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':108, 'y':147}, 'code':'IscsText_4', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':181, 'y':132}, 'code':'IscsText_5', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':262, 'y':131}, 'code':'IscsText_6', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':369, 'y':146}, 'code':'IscsText_7', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':179, 'y':116}, 'code':'IscsText_8', '_type':'IscsText', 'context':'MD-201-I-6', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':258, 'y':114}, 'code':'IscsText_9', '_type':'IscsText', 'context':'MD-201-I-5', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':349, 'y':129}, 'code':'IscsText_10', '_type':'IscsText', 'context':'MD-201-I-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':143, 'y':243}, 'code':'IscsText_11', '_type':'IscsText', 'context':'MD-201-I-4', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':163, 'y':261}, 'code':'IscsText_12', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':237, 'y':239}, 'code':'IscsText_13', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':313, 'y':260}, 'code':'IscsText_14', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':165, 'y':280}, 'code':'IscsText_15', '_type':'IscsText', 'context':'MD-201-I-7', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':271, 'y':243}, 'code':'IscsText_16', '_type':'IscsText', 'context':'MD-201-I-3', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':161, 'y':178}, 'code':'IscsText_17', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':312, 'y':175}, 'code':'IscsText_18', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':163, 'y':225}, 'code':'IscsText_19', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':312, 'y':224}, 'code':'IscsText_20', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':311, 'y':199}, 'code':'IscsText_21', '_type':'IscsText', 'context':'TVF-201-I-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':109, 'y':198}, 'code':'IscsText_22', '_type':'IscsText', 'context':'TVF-201-I-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':429, 'y':265}, 'code':'IscsText_23', '_type':'IscsText', 'context':'MD-201-I-11', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':429, 'y':280}, 'code':'IscsText_24', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':596, 'y':328}, 'code':'IscsText_25', '_type':'IscsText', 'context':'轨顶排风道', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':591, 'y':399}, 'code':'IscsText_26', '_type':'IscsText', 'context':'站台板下风道', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':592, 'y':445}, 'code':'IscsText_27', '_type':'IscsText', 'context':'站台板下风道', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':595, 'y':509}, 'code':'IscsText_28', '_type':'IscsText', 'context':'轨顶排风道', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':882, 'y':147}, 'code':'IscsText_29', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':886, 'y':211}, 'code':'IscsText_30', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':176}, 'code':'IscsText_31', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1022, 'y':177}, 'code':'IscsText_32', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1129, 'y':143}, 'code':'IscsText_33', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':883, 'y':164}, 'code':'IscsText_34', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1129, 'y':161}, 'code':'IscsText_35', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':994, 'y':236}, 'code':'IscsText_36', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1059, 'y':231}, 'code':'IscsText_37', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':941, 'y':307}, 'code':'IscsText_38', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1139, 'y':352}, 'code':'IscsText_39', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1077, 'y':471}, 'code':'IscsText_40', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':757, 'y':329}, 'code':'IscsText_41', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':758, 'y':448}, 'code':'IscsText_42', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':759, 'y':402}, 'code':'IscsText_43', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':428, 'y':511}, 'code':'IscsText_44', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':429, 'y':448}, 'code':'IscsText_45', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':429, 'y':398}, 'code':'IscsText_46', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':759, 'y':516}, 'code':'IscsText_47', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':375, 'y':540}, 'code':'IscsText_48', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':377, 'y':571}, 'code':'IscsText_49', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':778, 'y':571}, 'code':'IscsText_50', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':776, 'y':538}, 'code':'IscsText_51', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1151, 'y':564}, 'code':'IscsText_52', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':378, 'y':657}, 'code':'IscsText_53', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':831, 'y':660}, 'code':'IscsText_54', '_type':'IscsText', 'context':'排风井', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':376, 'y':593}, 'code':'IscsText_55', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':780, 'y':597}, 'code':'IscsText_56', '_type':'IscsText', 'context':'运行', 'textFill':'#FFFFFF', 'fontSize':11, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1095, 'y':305}, 'code':'IscsText_57', '_type':'IscsText', 'context':'下行尾端', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1104, 'y':388}, 'code':'IscsText_58', '_type':'IscsText', 'context':'车控室端冷水机房', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1147, 'y':618}, 'code':'IscsText_59', '_type':'IscsText', 'context':'车控室对面冷水机房', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':83, 'y':621}, 'code':'IscsText_60', '_type':'IscsText', 'context':'车控室端空调机房', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':49, 'y':387}, 'code':'IscsText_61', '_type':'IscsText', 'context':'车控室端冷水机房', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':151, 'y':566}, 'code':'IscsText_62', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':59, 'y':352}, 'code':'IscsText_63', '_type':'IscsText', 'context':'BAS', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1115, 'y':409}, 'code':'IscsText_64', '_type':'IscsText', 'context':'世纪大道站', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1115, 'y':541}, 'code':'IscsText_65', '_type':'IscsText', 'context':'上行头端', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':70, 'y':541}, 'code':'IscsText_66', '_type':'IscsText', 'context':'上行尾端', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':48, 'y':304}, 'code':'IscsText_67', '_type':'IscsText', 'context':'下行头端', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':830, 'y':234}, 'code':'IscsText_68', '_type':'IscsText', 'context':'MD-201-II-6', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':871, 'y':113}, 'code':'IscsText_69', '_type':'IscsText', 'context':'TVF-201-II-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1129, 'y':179}, 'code':'IscsText_70', '_type':'IscsText', 'context':'TVF-201-II-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1131, 'y':225}, 'code':'IscsText_71', '_type':'IscsText', 'context':'MD-201-II-5', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':944, 'y':211}, 'code':'IscsText_72', '_type':'IscsText', 'context':'MD-201-II-4', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1001, 'y':153}, 'code':'IscsText_73', '_type':'IscsText', 'context':'MD-201-II-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1030, 'y':276}, 'code':'IscsText_74', '_type':'IscsText', 'context':'MD-201-II-7', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':941, 'y':356}, 'code':'IscsText_75', '_type':'IscsText', 'context':'MD-201-II-3', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1053, 'y':449}, 'code':'IscsText_76', '_type':'IscsText', 'context':'MD-201-II-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1120, 'y':322}, 'code':'IscsText_77', '_type':'IscsText', 'context':'DD-201-4', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1173, 'y':549}, 'code':'IscsText_78', '_type':'IscsText', 'context':'DD-201-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1117, 'y':82}, 'code':'IscsText_79', '_type':'IscsText', 'context':'隧道通风井', 'textFill':'#FFFFFF', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':49, 'y':322}, 'code':'IscsText_80', '_type':'IscsText', 'context':'DD-201-3', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':105, 'y':555}, 'code':'IscsText_81', '_type':'IscsText', 'context':'DD-201-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':751, 'y':280}, 'code':'IscsText_82', '_type':'IscsText', 'context':'MD-201-II-11', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':736, 'y':354}, 'code':'IscsText_83', '_type':'IscsText', 'context':'MD-201-II-12', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':802, 'y':441}, 'code':'IscsText_84', '_type':'IscsText', 'context':'MD-201-II-10', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':802, 'y':488}, 'code':'IscsText_85', '_type':'IscsText', 'context':'MD-201-II-9', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':653, 'y':328}, 'code':'IscsText_86', '_type':'IscsText', 'context':'FD2-201-II-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':655, 'y':406}, 'code':'IscsText_87', '_type':'IscsText', 'context':'FD2-201-II-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':656, 'y':452}, 'code':'IscsText_88', '_type':'IscsText', 'context':'FD2-201-II-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':653, 'y':511}, 'code':'IscsText_89', '_type':'IscsText', 'context':'FD2-201-II-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':515, 'y':328}, 'code':'IscsText_90', '_type':'IscsText', 'context':'FD2-201-I-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':512, 'y':404}, 'code':'IscsText_91', '_type':'IscsText', 'context':'FD2-201-I-2', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':516, 'y':452}, 'code':'IscsText_92', '_type':'IscsText', 'context':'FD2-201-I-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':514, 'y':515}, 'code':'IscsText_93', '_type':'IscsText', 'context':'FD2-201-I-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':432, 'y':351}, 'code':'IscsText_94', '_type':'IscsText', 'context':'MD-201-I-12', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':376, 'y':488}, 'code':'IscsText_95', '_type':'IscsText', 'context':'MD-201-I-9', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':377, 'y':421}, 'code':'IscsText_96', '_type':'IscsText', 'context':'MD-201-I-10', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':445, 'y':550}, 'code':'IscsText_97', '_type':'IscsText', 'context':'MD-201-I-8', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':447, 'y':593}, 'code':'IscsText_98', '_type':'IscsText', 'context':'TEF-201-I-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':842, 'y':563}, 'code':'IscsText_99', '_type':'IscsText', 'context':'TEF-201-II-1', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':845, 'y':546}, 'code':'IscsText_100', '_type':'IscsText', 'context':'MD-201-II-8', 'textFill':'#65BDDA', 'fontSize':13, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'jetFanList':[{'point':{'x':186, 'y':172}, '_type':'JetFan', 'code':'JetFan_1', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':266, 'y':171}, '_type':'JetFan', 'code':'JetFan_2', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':1083, 'y':143}, '_type':'JetFan', 'code':'JetFan_3', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':908, 'y':143}, '_type':'JetFan', 'code':'JetFan_4', 'width':40, 'color':'#00ff00', 'zlevel':1, 'z':4}], 'volumeControlDamperList':[{'point':{'x':208, 'y':253}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_1', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':289, 'y':253}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_2', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':239, 'y':252}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_3', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':155, 'y':140}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_4', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':208, 'y':140}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_5', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':289, 'y':139}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_6', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':344, 'y':140}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_7', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':453, 'y':479}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_8', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':454, 'y':415}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_9', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':454, 'y':366}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_10', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':454, 'y':298}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_11', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':780, 'y':298}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_12', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':781, 'y':368}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_13', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':781, 'y':415}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_14', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':781, 'y':476}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_15', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1050, 'y':465}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_16', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':932, 'y':219}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_17', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1106, 'y':218}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_18', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':989, 'y':187}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_19', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1051, 'y':187}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_20', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1009, 'y':247}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_21', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':988, 'y':312}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_22', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':425, 'y':533}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_23', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':823, 'y':533}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_24', 'width':18, 'rotateAngle':-90, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1115, 'y':336}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_25', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':126, 'y':567}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_26', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':1178, 'y':565}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_27', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}, {'point':{'x':89, 'y':335}, '_type':'VolumeControlDamper', 'code':'VolumeControlDamper_28', 'width':18, 'rotateAngle':0, 'color':'#00ff00', 'zlevel':1, 'z':5}], 'iscsButtonList':[{'point':{'x':319, 'y':582}, 'code':'IscsButton_1', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'紧急启动', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':319, 'y':605}, 'code':'IscsButton_2', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'工频启动', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':319, 'y':630}, 'code':'IscsButton_3', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'转率控制', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':733, 'y':584}, 'code':'IscsButton_4', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'紧急启动', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':733, 'y':609}, 'code':'IscsButton_5', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'工频启动', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':733, 'y':634}, 'code':'IscsButton_6', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'转率控制', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':970, 'y':595}, 'code':'IscsButton_7', '_type':'IscsButton', 'levelPadding':17, 'verticalPadding':7, 'context':'射流风机图', 'function':'OperatingButton', 'fontSize':12, 'zlevel':1, 'z':4}, {'point':{'x':1138, 'y':53}, 'code':'IscsButton_8', '_type':'IscsButton', 'levelPadding':30, 'verticalPadding':7, 'context':'图元说明', 'function':'GraphicEle', 'fontSize':12, 'zlevel':1, 'z':4}], 'fireDamperList':[{'point':{'x':497, 'y':423}, '_type':'FireDamper', 'code':'FireDamper_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':497, 'y':377}, '_type':'FireDamper', 'code':'FireDamper_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':743, 'y':379}, '_type':'FireDamper', 'code':'FireDamper_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':743, 'y':426}, '_type':'FireDamper', 'code':'FireDamper_4', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}], 'smookExhaustFdList':[{'point':{'x':497, 'y':304}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_1', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':304}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_2', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':497, 'y':490}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_3', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}, {'point':{'x':743, 'y':489}, '_type':'SmookExhaustFd', 'code':'SmookExhaustFd_4', 'width':15, 'direction':'vertical', 'color':'#00ff00', 'zlevel':1, 'z':4}]
     },
+    '29': {
+		"iscsLineList":[{"point1":{"x":77,"y":169},"point2":{"x":1087,"y":169},"code":"IscsLine_1","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":77,"y":169}},{"point1":{"x":77,"y":218},"point2":{"x":1087,"y":218},"code":"IscsLine_2","_type":"IscsLine","lineWidth":2,"fillColor":"#66E2DB","classify":"dashed","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":77,"y":218}},{"point1":{"x":154,"y":376},"point2":{"x":995,"y":376},"code":"IscsLine_4","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":154,"y":376}},{"point1":{"x":152,"y":464},"point2":{"x":993,"y":464},"code":"IscsLine_5","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":152,"y":464}},{"point1":{"x":539,"y":465},"point2":{"x":637,"y":377},"code":"IscsLine_6","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":539,"y":465}},{"point1":{"x":205,"y":410},"point2":{"x":472,"y":410},"code":"IscsLine_7","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":205,"y":410}},{"point1":{"x":205,"y":433},"point2":{"x":472,"y":433},"code":"IscsLine_8","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":205,"y":433}},{"point1":{"x":472,"y":409},"point2":{"x":472,"y":434},"code":"IscsLine_9","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":472,"y":409}},{"point1":{"x":687,"y":410},"point2":{"x":954,"y":410},"code":"IscsLine_10","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":687,"y":410}},{"point1":{"x":687,"y":433},"point2":{"x":954,"y":433},"code":"IscsLine_11","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":687,"y":433}},{"point1":{"x":687,"y":409},"point2":{"x":687,"y":434},"code":"IscsLine_12","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":687,"y":409}},{"point1":{"x":91,"y":202},"point2":{"x":172,"y":202},"code":"IscsLine_13","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":91,"y":202}},{"point1":{"x":91,"y":202},"point2":{"x":107,"y":189},"code":"IscsLine_14","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":91,"y":202}},{"point1":{"x":88,"y":625},"point2":{"x":1098,"y":625},"code":"IscsLine_15","_type":"IscsLine","lineWidth":2,"fillColor":"#66E2DB","classify":"dashed","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":88,"y":625}},{"point1":{"x":88,"y":682},"point2":{"x":1098,"y":682},"code":"IscsLine_16","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":88,"y":682}},{"point1":{"x":111,"y":667},"point2":{"x":192,"y":667},"code":"IscsLine_17","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":111,"y":667}},{"point1":{"x":179,"y":655},"point2":{"x":192,"y":667},"code":"IscsLine_18","_type":"IscsLine","lineWidth":2,"fillColor":"#fff","classify":"solid","arrowShow":"none","arrowSize":5,"zlevel":1,"z":4,"point":{"x":179,"y":655}}],"iscsButtonList":[{"point":{"x":188,"y":108},"code":"IscsButton_1","_type":"IscsButton","levelPadding":16,"verticalPadding":7,"context":"返回","function":"GoBack","fontSize":12,"zlevel":1,"z":4},{"point":{"x":1081,"y":109},"code":"IscsButton_2","_type":"IscsButton","levelPadding":20,"verticalPadding":8,"context":"图元说明","function":"GraphicEle","fontSize":12,"zlevel":1,"z":4}],"jetFanList":[{"point":{"x":502,"y":494},"_type":"JetFan","code":"JetFan_4","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":505,"y":299},"_type":"JetFan","code":"JetFan_5","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":293,"y":488},"_type":"JetFan","code":"JetFan_6","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":293,"y":558},"_type":"JetFan","code":"JetFan_7","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":818,"y":226},"_type":"JetFan","code":"JetFan_8","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":819,"y":276},"_type":"JetFan","code":"JetFan_9","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":817,"y":328},"_type":"JetFan","code":"JetFan_10","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":506,"y":232},"_type":"JetFan","code":"JetFan_11","width":35,"rotate":90,"color":"#00ff00","zlevel":1,"z":4},{"point":{"x":502,"y":563},"_type":"JetFan","code":"JetFan_12","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":276,"y":233},"_type":"JetFan","code":"JetFan_13","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":276,"y":300},"_type":"JetFan","code":"JetFan_14","width":35,"color":"#00ff00","zlevel":1,"z":4,"rotate":90},{"point":{"x":845,"y":477},"_type":"JetFan","code":"JetFan_20","width":35,"rotate":90,"color":"#00ff00","zlevel":1,"z":4},{"point":{"x":845,"y":531},"_type":"JetFan","code":"JetFan_21","width":35,"rotate":90,"color":"#00ff00","zlevel":1,"z":4},{"point":{"x":844,"y":580},"_type":"JetFan","code":"JetFan_22","width":35,"rotate":90,"color":"#00ff00","zlevel":1,"z":4}],"iscsTextList":[{"point":{"x":960,"y":415},"code":"IscsText_3","_type":"IscsText","context":"洞口","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":145,"y":418},"code":"IscsText_4","_type":"IscsText","context":"出入线洞口","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":541,"y":498},"code":"IscsText_9","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":540,"y":518},"code":"IscsText_10","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":336,"y":494},"code":"IscsText_11","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":335,"y":514},"code":"IscsText_12","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":541,"y":568},"code":"IscsText_13","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":540,"y":588},"code":"IscsText_14","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":334,"y":564},"code":"IscsText_15","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":333,"y":584},"code":"IscsText_16","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":860,"y":229},"code":"IscsText_17","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":859,"y":249},"code":"IscsText_18","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":862,"y":283},"code":"IscsText_19","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":861,"y":303},"code":"IscsText_20","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":861,"y":331},"code":"IscsText_21","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":860,"y":351},"code":"IscsText_22","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":545,"y":234},"code":"IscsText_23","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":544,"y":254},"code":"IscsText_24","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":545,"y":304},"code":"IscsText_25","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":544,"y":324},"code":"IscsText_26","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":318,"y":237},"code":"IscsText_27","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":317,"y":257},"code":"IscsText_28","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":316,"y":307},"code":"IscsText_29","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":315,"y":327},"code":"IscsText_30","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":190,"y":502},"code":"IscsText_31","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":192,"y":571},"code":"IscsText_32","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":397,"y":507},"code":"IscsText_33","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":400,"y":577},"code":"IscsText_34","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":734,"y":493},"code":"IscsText_35","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":736,"y":546},"code":"IscsText_36","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":737,"y":596},"code":"IscsText_37","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":715,"y":238},"code":"IscsText_38","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":717,"y":291},"code":"IscsText_39","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":718,"y":341},"code":"IscsText_40","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":399,"y":245},"code":"IscsText_41","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":402,"y":315},"code":"IscsText_42","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":173,"y":246},"code":"IscsText_43","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":175,"y":315},"code":"IscsText_44","_type":"IscsText","context":"JET-281-5","textFill":"#7CD6E5","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":885,"y":482},"code":"IscsText_57","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":884,"y":502},"code":"IscsText_58","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":887,"y":536},"code":"IscsText_59","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":886,"y":556},"code":"IscsText_60","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":886,"y":584},"code":"IscsText_61","_type":"IscsText","context":"BAS","textFill":"#FFFFFF","fontSize":14,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4},{"point":{"x":885,"y":604},"code":"IscsText_62","_type":"IscsText","context":"运行","textFill":"#FFFFFF","fontSize":12,"fontWeight":450,"fontFamily":"consolas","zlevel":1,"z":4}]
+    },
     '31': {
         'platformScreenDoorList':[{'point':{'x':135, 'y':225}, 'code':'PlatformScreenDoor_1', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':198, 'y':225}, 'code':'PlatformScreenDoor_2', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':324, 'y':225}, 'code':'PlatformScreenDoor_4', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':260, 'y':225}, 'code':'PlatformScreenDoor_5', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':385, 'y':225}, 'code':'PlatformScreenDoor_6', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':448, 'y':225}, 'code':'PlatformScreenDoor_7', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':512, 'y':225}, 'code':'PlatformScreenDoor_8', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':576, 'y':225}, 'code':'PlatformScreenDoor_9', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':830, 'y':225}, 'code':'PlatformScreenDoor_10', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':767, 'y':225}, 'code':'PlatformScreenDoor_11', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':702, 'y':225}, 'code':'PlatformScreenDoor_12', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':639, 'y':225}, 'code':'PlatformScreenDoor_13', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1330, 'y':225}, 'code':'PlatformScreenDoor_14', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1267, 'y':225}, 'code':'PlatformScreenDoor_15', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1205, 'y':225}, 'code':'PlatformScreenDoor_16', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1143, 'y':225}, 'code':'PlatformScreenDoor_17', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1080, 'y':225}, 'code':'PlatformScreenDoor_18', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1017, 'y':225}, 'code':'PlatformScreenDoor_19', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':955, 'y':225}, 'code':'PlatformScreenDoor_20', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':892, 'y':225}, 'code':'PlatformScreenDoor_21', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':143, 'y':638}, 'code':'PlatformScreenDoor_22', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':455, 'y':638}, 'code':'PlatformScreenDoor_23', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':638}, 'code':'PlatformScreenDoor_24', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':582, 'y':638}, 'code':'PlatformScreenDoor_25', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1085, 'y':638}, 'code':'PlatformScreenDoor_26', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1022, 'y':638}, 'code':'PlatformScreenDoor_27', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':958, 'y':638}, 'code':'PlatformScreenDoor_28', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':638}, 'code':'PlatformScreenDoor_29', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':833, 'y':638}, 'code':'PlatformScreenDoor_30', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':770, 'y':638}, 'code':'PlatformScreenDoor_31', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':707, 'y':638}, 'code':'PlatformScreenDoor_32', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':645, 'y':638}, 'code':'PlatformScreenDoor_33', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':331, 'y':638}, 'code':'PlatformScreenDoor_34', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':269, 'y':638}, 'code':'PlatformScreenDoor_35', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':206, 'y':638}, 'code':'PlatformScreenDoor_36', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':394, 'y':638}, 'code':'PlatformScreenDoor_37', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1333, 'y':638}, 'code':'PlatformScreenDoor_38', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1271, 'y':638}, 'code':'PlatformScreenDoor_39', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1209, 'y':638}, 'code':'PlatformScreenDoor_40', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}, {'point':{'x':1147, 'y':638}, 'code':'PlatformScreenDoor_41', '_type':'PlatformScreenDoor', 'width':60, 'zlevel':1, 'z':4}], 'endDoorList':[{'point':{'x':97, 'y':209}, 'code':'EndDoor_1', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1407, 'y':210}, 'code':'EndDoor_2', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':113, 'y':654}, 'code':'EndDoor_3', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}, {'point':{'x':1405, 'y':659}, 'code':'EndDoor_4', '_type':'EndDoor', 'width':19, 'zlevel':1, 'z':4}], 'borderRadiusList':[{'point':{'x':141, 'y':157}, 'code':'BorderRadius_1', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':391, 'y':158}, 'code':'BorderRadius_2', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':644, 'y':157}, 'code':'BorderRadius_3', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':896, 'y':157}, 'code':'BorderRadius_4', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1148, 'y':157}, 'code':'BorderRadius_5', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':147, 'y':717}, 'code':'BorderRadius_6', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':1150, 'y':718}, 'code':'BorderRadius_7', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':649, 'y':716}, 'code':'BorderRadius_8', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':900, 'y':717}, 'code':'BorderRadius_9', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}, {'point':{'x':399, 'y':717}, 'code':'BorderRadius_10', '_type':'BorderRadius', 'width':240, 'height':26, 'zlevel':1, 'z':4}], 'iscsLineList':[{'point1':{'x':104, 'y':260}, 'point2':{'x':1438, 'y':260}, 'code':'IscsLine_1', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':260}}, {'point1':{'x':134, 'y':220}, 'point2':{'x':1391, 'y':220}, 'code':'IscsLine_2', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':134, 'y':220}}, {'point1':{'x':103, 'y':189}, 'point2':{'x':1436, 'y':189}, 'code':'IscsLine_3', 'classify':'solid', '_type':'IscsLine', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':103, 'y':189}}, {'point1':{'x':104, 'y':150}, 'point2':{'x':1437, 'y':150}, 'code':'IscsLine_4', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':104, 'y':150}}, {'point1':{'x':133, 'y':190}, 'point2':{'x':133, 'y':261}, 'code':'IscsLine_5', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':133, 'y':190}}, {'point1':{'x':1393, 'y':189}, 'point2':{'x':1393, 'y':260}, 'code':'IscsLine_6', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1393, 'y':189}}, {'point1':{'x':385, 'y':149}, 'point2':{'x':385, 'y':260}, 'code':'IscsLine_7', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':385, 'y':149}}, {'point1':{'x':637, 'y':149}, 'point2':{'x':637, 'y':259}, 'code':'IscsLine_8', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':637, 'y':149}}, {'point1':{'x':1142, 'y':149}, 'point2':{'x':1142, 'y':259}, 'code':'IscsLine_9', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1142, 'y':149}}, {'point1':{'x':892, 'y':149}, 'point2':{'x':892, 'y':259}, 'code':'IscsLine_10', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':892, 'y':149}}, {'point1':{'x':109, 'y':634}, 'point2':{'x':1439, 'y':634}, 'code':'IscsLine_11', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':109, 'y':634}}, {'point1':{'x':108, 'y':749}, 'point2':{'x':1438, 'y':749}, 'code':'IscsLine_12', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':108, 'y':749}}, {'point1':{'x':107, 'y':712}, 'point2':{'x':1437, 'y':712}, 'code':'IscsLine_13', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':107, 'y':712}}, {'point1':{'x':142, 'y':671}, 'point2':{'x':1393, 'y':671}, 'code':'IscsLine_14', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':142, 'y':671}}, {'point1':{'x':141, 'y':633}, 'point2':{'x':141, 'y':713}, 'code':'IscsLine_15', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':141, 'y':633}}, {'point1':{'x':1395, 'y':633}, 'point2':{'x':1395, 'y':713}, 'code':'IscsLine_16', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1395, 'y':633}}, {'point1':{'x':392, 'y':633}, 'point2':{'x':392, 'y':749}, 'code':'IscsLine_17', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':392, 'y':633}}, {'point1':{'x':644, 'y':633}, 'point2':{'x':644, 'y':749}, 'code':'IscsLine_18', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':633}}, {'point1':{'x':894, 'y':634}, 'point2':{'x':894, 'y':749}, 'code':'IscsLine_19', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':894, 'y':634}}, {'point1':{'x':1146, 'y':634}, 'point2':{'x':1146, 'y':749}, 'code':'IscsLine_20', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1146, 'y':634}}, {'point1':{'x':408, 'y':301}, 'point2':{'x':408, 'y':601}, 'code':'IscsLine_21', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':408, 'y':301}}, {'point1':{'x':1140, 'y':299}, 'point2':{'x':1140, 'y':600}, 'code':'IscsLine_22', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':1140, 'y':299}}, {'point1':{'x':644, 'y':301}, 'point2':{'x':644, 'y':391}, 'code':'IscsLine_23', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':644, 'y':301}}, {'point1':{'x':221, 'y':328}, 'point2':{'x':481, 'y':328}, 'code':'IscsLine_24', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':328}}, {'point1':{'x':221, 'y':370}, 'point2':{'x':481, 'y':370}, 'code':'IscsLine_25', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':370}}, {'point1':{'x':220, 'y':393}, 'point2':{'x':480, 'y':393}, 'code':'IscsLine_26', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':393}}, {'point1':{'x':221, 'y':415}, 'point2':{'x':481, 'y':415}, 'code':'IscsLine_27', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':415}}, {'point1':{'x':220, 'y':436}, 'point2':{'x':480, 'y':436}, 'code':'IscsLine_28', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':436}}, {'point1':{'x':221, 'y':458}, 'point2':{'x':481, 'y':458}, 'code':'IscsLine_29', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':458}}, {'point1':{'x':222, 'y':479}, 'point2':{'x':482, 'y':479}, 'code':'IscsLine_30', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':222, 'y':479}}, {'point1':{'x':221, 'y':500}, 'point2':{'x':481, 'y':500}, 'code':'IscsLine_31', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':221, 'y':500}}, {'point1':{'x':220, 'y':521}, 'point2':{'x':480, 'y':521}, 'code':'IscsLine_32', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':521}}, {'point1':{'x':220, 'y':539}, 'point2':{'x':480, 'y':539}, 'code':'IscsLine_33', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':539}}, {'point1':{'x':219, 'y':580}, 'point2':{'x':479, 'y':580}, 'code':'IscsLine_34', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':580}}, {'point1':{'x':219, 'y':560}, 'point2':{'x':479, 'y':560}, 'code':'IscsLine_35', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':219, 'y':560}}, {'point1':{'x':220, 'y':349}, 'point2':{'x':480, 'y':349}, 'code':'IscsLine_36', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':220, 'y':349}}, {'point1':{'x':511, 'y':368}, 'point2':{'x':701, 'y':368}, 'code':'IscsLine_37', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':511, 'y':368}}, {'point1':{'x':513, 'y':346}, 'point2':{'x':703, 'y':346}, 'code':'IscsLine_38', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':513, 'y':346}}, {'point1':{'x':512, 'y':323}, 'point2':{'x':702, 'y':323}, 'code':'IscsLine_39', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':512, 'y':323}}, {'point1':{'x':954, 'y':408}, 'point2':{'x':1214, 'y':408}, 'code':'IscsLine_40', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':408}}, {'point1':{'x':952, 'y':450}, 'point2':{'x':1212, 'y':450}, 'code':'IscsLine_41', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':952, 'y':450}}, {'point1':{'x':954, 'y':367}, 'point2':{'x':1214, 'y':367}, 'code':'IscsLine_42', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':367}}, {'point1':{'x':955, 'y':348}, 'point2':{'x':1215, 'y':348}, 'code':'IscsLine_43', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':348}}, {'point1':{'x':955, 'y':326}, 'point2':{'x':1215, 'y':326}, 'code':'IscsLine_44', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':326}}, {'point1':{'x':955, 'y':429}, 'point2':{'x':1215, 'y':429}, 'code':'IscsLine_45', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':429}}, {'point1':{'x':955, 'y':471}, 'point2':{'x':1215, 'y':471}, 'code':'IscsLine_46', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':471}}, {'point1':{'x':954, 'y':388}, 'point2':{'x':1214, 'y':388}, 'code':'IscsLine_47', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':388}}, {'point1':{'x':954, 'y':493}, 'point2':{'x':1214, 'y':493}, 'code':'IscsLine_48', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':493}}, {'point1':{'x':954, 'y':517}, 'point2':{'x':1214, 'y':517}, 'code':'IscsLine_49', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':517}}, {'point1':{'x':954, 'y':539}, 'point2':{'x':1214, 'y':539}, 'code':'IscsLine_50', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':539}}, {'point1':{'x':955, 'y':579}, 'point2':{'x':1214, 'y':579}, 'code':'IscsLine_51', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':955, 'y':579}}, {'point1':{'x':954, 'y':559}, 'point2':{'x':1213, 'y':559}, 'code':'IscsLine_52', '_type':'IscsLine', 'classify':'solid', 'lineWidth':2, 'fillColor':'#fff', 'zlevel':1, 'z':4, 'point':{'x':954, 'y':559}}], 'iscsRectList':[{'point':{'x':220, 'y':300}, 'code':'IscsRect_1', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}, {'point':{'x':512, 'y':300}, 'code':'IscsRect_2', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':190, 'height':90, 'zlevel':1, 'z':3}, {'point':{'x':954, 'y':300}, 'code':'IscsRect_3', '_type':'IscsRect', 'fillColor':'rgba(255, 0, 0, 0)', 'borderWidth':2, 'strokeColor':'#FFFFFF', 'width':260, 'height':300, 'zlevel':1, 'z':3}], 'iscsTextList':[{'point':{'x':229, 'y':163}, 'code':'IscsText_1', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':483, 'y':162}, 'code':'IscsText_2', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':747, 'y':161}, 'code':'IscsText_3', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':991, 'y':161}, 'code':'IscsText_4', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1243, 'y':162}, 'code':'IscsText_5', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':239, 'y':722}, 'code':'IscsText_6', '_type':'IscsText', 'context':'车厢1', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':491, 'y':722}, 'code':'IscsText_7', '_type':'IscsText', 'context':'车厢2', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':742, 'y':722}, 'code':'IscsText_8', '_type':'IscsText', 'context':'车厢3', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':989, 'y':723}, 'code':'IscsText_9', '_type':'IscsText', 'context':'车厢4', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1242, 'y':722}, 'code':'IscsText_10', '_type':'IscsText', 'context':'车厢5', 'textFill':'#FFFFFF', 'fontSize':20, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':100, 'y':131}, 'code':'IscsText_11', '_type':'IscsText', 'context':'下行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1406, 'y':755}, 'code':'IscsText_12', '_type':'IscsText', 'context':'上行', 'textFill':'#20B8C1', 'fontSize':14, 'fontWeight':400, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':308}, 'code':'IscsText_13', '_type':'IscsText', 'context':'下行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':309}, 'code':'IscsText_14', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1011, 'y':306}, 'code':'IscsText_15', '_type':'IscsText', 'context':'上行站台', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1163, 'y':308}, 'code':'IscsText_16', '_type':'IscsText', 'context':'状态', 'textFill':'#FFFFFF', 'fontSize':16, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':334}, 'code':'IscsText_17', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':354}, 'code':'IscsText_18', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':376}, 'code':'IscsText_19', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':398}, 'code':'IscsText_20', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':442}, 'code':'IscsText_22', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':464}, 'code':'IscsText_23', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':484}, 'code':'IscsText_24', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':506}, 'code':'IscsText_25', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':525}, 'code':'IscsText_26', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':545}, 'code':'IscsText_27', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':226, 'y':565}, 'code':'IscsText_28', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':227, 'y':585}, 'code':'IscsText_29', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':517, 'y':306}, 'code':'IscsText_30', '_type':'IscsText', 'context':'系统驱动电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':518, 'y':329}, 'code':'IscsText_31', '_type':'IscsText', 'context':'系统控制电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':519, 'y':352}, 'code':'IscsText_32', '_type':'IscsText', 'context':'监视电源故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':520, 'y':375}, 'code':'IscsText_33', '_type':'IscsText', 'context':'现场总线故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':332}, 'code':'IscsText_34', '_type':'IscsText', 'context':'滑动门&应急门开门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':960, 'y':352}, 'code':'IscsText_35', '_type':'IscsText', 'context':'滑动门&应急门关门故障', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':371}, 'code':'IscsText_36', '_type':'IscsText', 'context':'滑动门互锁解除报警', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':393}, 'code':'IscsText_37', '_type':'IscsText', 'context':'紧急控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':225, 'y':421}, 'code':'IscsText_38', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':961, 'y':413}, 'code':'IscsText_39', '_type':'IscsText', 'context':'紧急控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':433}, 'code':'IscsText_40', '_type':'IscsText', 'context':'紧急控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':454}, 'code':'IscsText_41', '_type':'IscsText', 'context':'就地控制盘操作', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':477}, 'code':'IscsText_42', '_type':'IscsText', 'context':'就得控制盘操作开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':500}, 'code':'IscsText_43', '_type':'IscsText', 'context':'就地控制盘操作关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':523}, 'code':'IscsText_44', '_type':'IscsText', 'context':'自动开门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':962, 'y':545}, 'code':'IscsText_45', '_type':'IscsText', 'context':'自动关门命令', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':565}, 'code':'IscsText_46', '_type':'IscsText', 'context':'所有门开到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':963, 'y':583}, 'code':'IscsText_47', '_type':'IscsText', 'context':'所有门关到位', 'textFill':'#0EDEE1', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':154, 'y':265}, 'code':'IscsText_48', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':217, 'y':266}, 'code':'IscsText_49', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':280, 'y':266}, 'code':'IscsText_50', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':341, 'y':266}, 'code':'IscsText_51', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':404, 'y':267}, 'code':'IscsText_52', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':467, 'y':267}, 'code':'IscsText_53', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':531, 'y':266}, 'code':'IscsText_54', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':596, 'y':266}, 'code':'IscsText_55', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':659, 'y':266}, 'code':'IscsText_56', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':720, 'y':267}, 'code':'IscsText_57', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':267}, 'code':'IscsText_58', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':267}, 'code':'IscsText_59', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':910, 'y':266}, 'code':'IscsText_60', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':972, 'y':267}, 'code':'IscsText_61', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1035, 'y':266}, 'code':'IscsText_62', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1098, 'y':267}, 'code':'IscsText_63', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1162, 'y':267}, 'code':'IscsText_64', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':267}, 'code':'IscsText_65', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1288, 'y':267}, 'code':'IscsText_66', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1348, 'y':266}, 'code':'IscsText_67', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':164, 'y':619}, 'code':'IscsText_68', '_type':'IscsText', 'context':'1-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':223, 'y':619}, 'code':'IscsText_69', '_type':'IscsText', 'context':'1-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':285, 'y':619}, 'code':'IscsText_70', '_type':'IscsText', 'context':'1-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':348, 'y':619}, 'code':'IscsText_71', '_type':'IscsText', 'context':'1-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':412, 'y':618}, 'code':'IscsText_72', '_type':'IscsText', 'context':'2-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':472, 'y':618}, 'code':'IscsText_73', '_type':'IscsText', 'context':'2-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':535, 'y':619}, 'code':'IscsText_74', '_type':'IscsText', 'context':'2-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':599, 'y':620}, 'code':'IscsText_75', '_type':'IscsText', 'context':'2-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':663, 'y':618}, 'code':'IscsText_76', '_type':'IscsText', 'context':'3-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':724, 'y':618}, 'code':'IscsText_77', '_type':'IscsText', 'context':'3-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':787, 'y':617}, 'code':'IscsText_78', '_type':'IscsText', 'context':'3-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':847, 'y':619}, 'code':'IscsText_79', '_type':'IscsText', 'context':'3-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':912, 'y':619}, 'code':'IscsText_80', '_type':'IscsText', 'context':'4-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':973, 'y':620}, 'code':'IscsText_81', '_type':'IscsText', 'context':'4-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1039, 'y':619}, 'code':'IscsText_82', '_type':'IscsText', 'context':'4-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1101, 'y':619}, 'code':'IscsText_83', '_type':'IscsText', 'context':'4-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':618}, 'code':'IscsText_84', '_type':'IscsText', 'context':'5-1', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1225, 'y':618}, 'code':'IscsText_85', '_type':'IscsText', 'context':'5-2', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1290, 'y':620}, 'code':'IscsText_86', '_type':'IscsText', 'context':'5-3', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1350, 'y':620}, 'code':'IscsText_87', '_type':'IscsText', 'context':'5-4', 'textFill':'#FFFFFF', 'fontSize':14, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':432, 'y':399}, 'code':'IscsText_88', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':421}, 'code':'IscsText_89', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':426, 'y':443}, 'code':'IscsText_90', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':464}, 'code':'IscsText_91', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':431, 'y':484}, 'code':'IscsText_92', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':506}, 'code':'IscsText_93', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':525}, 'code':'IscsText_94', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':430, 'y':544}, 'code':'IscsText_95', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':427, 'y':586}, 'code':'IscsText_96', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':585}, 'code':'IscsText_97', '_type':'IscsText', 'context':'关到位', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':524}, 'code':'IscsText_98', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':501}, 'code':'IscsText_99', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1165, 'y':392}, 'code':'IscsText_100', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':455}, 'code':'IscsText_101', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':478}, 'code':'IscsText_102', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1166, 'y':545}, 'code':'IscsText_103', '_type':'IscsText', 'context':'自动', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1160, 'y':415}, 'code':'IscsText_104', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}, {'point':{'x':1161, 'y':435}, 'code':'IscsText_105', '_type':'IscsText', 'context':'无动作', 'textFill':'#12FB35', 'fontSize':12, 'fontWeight':450, 'fontFamily':'consolas', 'zlevel':1, 'z':4}], 'arcStatusList':[{'point':{'x':443, 'y':338}, 'code':'ArcStatus_1', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':359}, 'code':'ArcStatus_2', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':443, 'y':381}, 'code':'ArcStatus_3', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':311}, 'code':'ArcStatus_4', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':335}, 'code':'ArcStatus_5', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':358}, 'code':'ArcStatus_6', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':673, 'y':380}, 'code':'ArcStatus_7', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':337}, 'code':'ArcStatus_8', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':357}, 'code':'ArcStatus_9', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}, {'point':{'x':1175, 'y':377}, 'code':'ArcStatus_10', '_type':'ArcStatus', 'fillColor':'#00FF00', 'r':7, 'zlevel':1, 'z':4}]
     },
diff --git a/src/iscs/constant/keyboardEvents.js b/src/iscs/constant/keyboardEvents.js
index 5df56b0d3..a7811c178 100644
--- a/src/iscs/constant/keyboardEvents.js
+++ b/src/iscs/constant/keyboardEvents.js
@@ -1,7 +1,7 @@
 export const keyboardEvents = {
     C: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_C'}, // 绘图复制
-    V: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_V'} // 绘图粘贴
-    // DELETE: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Delete'}, // 快捷删除绘图元素
+    V: {altKey:false, ctrlKey:true, shiftKey:false, event: 'Ctrl_V'}, // 绘图粘贴
+    DELETE: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Delete'}, // 快捷删除绘图元素
     // ENTER: {altKey:false, ctrlKey:false, shiftKey:false, event: 'Update'} // 快捷修改绘图元素
 };
 
diff --git a/src/iscs/shape/bas/jetFan.js b/src/iscs/shape/bas/jetFan.js
index 464f59d90..c8c8506de 100644
--- a/src/iscs/shape/bas/jetFan.js
+++ b/src/iscs/shape/bas/jetFan.js
@@ -17,6 +17,10 @@ export default class jetFan extends Group {
             position: [this.model.point.x, this.model.point.y]
         });
         this.path = createPathSvg(this.model);
+        if (this.model.rotate) {
+            this.grouper.origin = [this.model.width / 2, this.model.width / 2];
+            this.grouper.rotation = -Math.PI / 180 * Number(this.model.rotate);
+        }
         this.add(this.grouper);
         this.grouper.add(this.path);
     }
diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js
index 56b3d4a22..1eb7a38e7 100644
--- a/src/jmapNew/shape/Text/index.js
+++ b/src/jmapNew/shape/Text/index.js
@@ -38,7 +38,7 @@ export default class Text2 extends Group {
                 x: model.position.x,
                 y: model.position.y,
                 text: content,
-                textFont: model.font,
+                fontSize: Number(model.font),
                 textFill: model.fontColor,
                 textAlign: 'middle'
             }
diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue
index 5b6e2cd00..636ddd9d1 100644
--- a/src/views/iscs/iscsDesign/demonList.vue
+++ b/src/views/iscs/iscsDesign/demonList.vue
@@ -163,6 +163,12 @@ export default {
                                     mode: 'bas',
                                     id: '28',
                                     type: 'interface'
+                                },
+                                {
+                                    name: '隧道通风-射流风机图',
+                                    mode: 'bas',
+                                    id: '29',
+                                    type: 'interface'
                                 }
                             ]
                         },
diff --git a/src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue b/src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue
index 5a217083c..cd61c8eb5 100644
--- a/src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue
+++ b/src/views/iscs/iscsDraw/iscsBasOperate/airConditioner.vue
@@ -117,6 +117,7 @@ export default {
                 code:'',
                 isRight:true,
                 width: 40,
+                rotate: 0,
                 x: 10,
                 y: 10
             };
diff --git a/src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue b/src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue
index 14a7b1478..8bc7fe59a 100644
--- a/src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue
+++ b/src/views/iscs/iscsDraw/iscsBasOperate/jetFan.vue
@@ -7,6 +7,9 @@
       <el-form-item label="图形宽度" prop="width">
         <el-input-number v-model="form.width" :min="20" />
       </el-form-item>
+      <el-form-item label="旋转角度" prop="rotate">
+        <el-input-number v-model="form.rotate" />
+      </el-form-item>
       <el-form-item label="X轴坐标" prop="x">
         <el-input-number v-model="form.x" controls-position="right" :min="1" />
       </el-form-item>
@@ -34,6 +37,7 @@ export default {
             form:{
                 code:'',
                 width: 40,
+                rotate: 0,
                 x: 10,
                 y: 10
             },
@@ -67,6 +71,7 @@ export default {
                 this.isUpdate = true;
                 this.form.code = model.code;
                 this.form.width = model.width;
+                this.form.rotate = model.rotate || 0;
                 this.form.x = model.point.x;
                 this.form.y = model.point.y;
             }
@@ -87,6 +92,7 @@ export default {
                         _type: 'JetFan',
                         code: this.isUpdate ? this.form.code : getUID('JetFan', this.iscs.jetFanList),
                         width: this.form.width,
+                        rotate: this.form.rotate,
                         color:'#00ff00'
                     };
                     this.$emit('createJetFan', jetFanModel);
@@ -104,6 +110,7 @@ export default {
             this.form = {
                 code:'',
                 width: 40,
+                rotate: 0,
                 x: 10,
                 y: 10
             };
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index 2521f8dea..79baead9d 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -147,7 +147,7 @@ export default {
                         list.forEach(item => {
                             if (item && item.code) {
                                 const copyModel = this.copyModelInfo(item, 30);
-                                const type1 = item._type.charAt(0).toLowerCase() + item._type.slice(1); // .toLowerCase()
+                                const type1 = item._type.charAt(0).toLowerCase() + item._type.slice(1);
                                 if (!mapIscs[type1 + 'List']) {
                                     mapIscs[type1 + 'List'] = this.iscs[type1 + 'List'] || [];
                                 }
@@ -159,7 +159,7 @@ export default {
                         });
                     } else if (this.selected._type != 'CheckBox') {
                         this.copyModel = this.copyModelInfo(this.selected, 10);
-                        const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1); // .toLowerCase()
+                        const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1);
                         this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
                     } else {
                         this.copyModel = {};
@@ -175,12 +175,16 @@ export default {
                         this.copyModel.code && this.createDataModel(this.copyModel);
                     }
                 } break;
-				// case 'Delete': this.$store.dispatch('map/setDeleteCount');
-				//     break;
-				// case 'Update':
-				//     this.$refs.offsetX.focus();
-				//     this.$store.dispatch('map/setUpdateCount');
-				//     break;
+				case 'Delete': {
+                    const list = this.getSelectList();
+                    if (list.length) {
+                        list.forEach(item => {
+                            item && item.code && this.$store.dispatch('iscs/deleteIscsDevices', item);
+                        });
+                    } else {
+                        this.copyModel.code && this.$store.dispatch('iscs/deleteIscsDevices', this.copyModel);
+                    }
+                } break;
                 }
             }
         },

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 06/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=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);

From fb570eb5225ec5dc44e485f206d052984e434f60 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Jun 2020 17:06:37 +0800
Subject: [PATCH 07/22] =?UTF-8?q?sics=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iscs/iscsSystem/config/bas/schedules.vue  |  34 +++-
 .../bas/schedulesChild/broadOverview.vue      | 112 +++++++++++
 .../bas/schedulesChild/saveScheduleView.vue   | 120 ++++++++++++
 .../bas/schedulesChild/schedulesManage.vue    |  15 +-
 .../schedulesChild/stationRunningSchedule.vue | 178 ++++++++++--------
 .../bas/schedulesChild/weeklyStatus.vue       |  16 +-
 6 files changed, 385 insertions(+), 90 deletions(-)
 create mode 100644 src/views/iscs/iscsSystem/config/bas/schedulesChild/broadOverview.vue
 create mode 100644 src/views/iscs/iscsSystem/config/bas/schedulesChild/saveScheduleView.vue

diff --git a/src/views/iscs/iscsSystem/config/bas/schedules.vue b/src/views/iscs/iscsSystem/config/bas/schedules.vue
index daf75bab6..4b3f4c305 100644
--- a/src/views/iscs/iscsSystem/config/bas/schedules.vue
+++ b/src/views/iscs/iscsSystem/config/bas/schedules.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="schedules-box">
-    <div class="title-name">车站运行时间表</div>
+    <div class="title-name">{{ modeName }}</div>
     <station-running-schedule v-if="showMode === 'stationRunningSchedule'" @changeShowMode="changeShowMode" />
     <weekly-status v-else-if="showMode==='weeklyStatus'" @changeShowMode="changeShowMode" />
     <schedules-manage v-else-if="showMode === 'schedulesManage'" @changeShowMode="changeShowMode" />
+    <broad-overview v-else-if="showMode === 'broadOverview'" @changeShowMode="changeShowMode" />
+    <save-schedule-view v-else-if="showMode === 'saveScheduleView'" @changeShowMode="changeShowMode" />
   </div>
 </template>
 
@@ -11,23 +13,47 @@
 import StationRunningSchedule from './schedulesChild/stationRunningSchedule';
 import WeeklyStatus from './schedulesChild/weeklyStatus';
 import SchedulesManage from './schedulesChild/schedulesManage';
+import BroadOverview from './schedulesChild/broadOverview';
+import SaveScheduleView from './schedulesChild/saveScheduleView';
 export default {
     name: 'Schedules',
     components: {
         StationRunningSchedule,
         WeeklyStatus,
-        SchedulesManage
+        SchedulesManage,
+        BroadOverview,
+        SaveScheduleView
     },
     data() {
         return {
             station: '',
             stations: [],
-            showMode: 'stationRunningSchedule'
+            showMode: 'stationRunningSchedule',
+            modeName: '车站运行时间表'
         };
     },
+    computed: {
+    },
     methods: {
         changeShowMode(mode) {
             this.showMode = mode;
+            switch (this.showMode) {
+            case 'stationRunningSchedule':
+                this.modeName = '车站运行时间表';
+                break;
+            case 'weeklyStatus':
+                this.modeName = '一周车站时间表定期下载';
+                break;
+            case 'broadOverview':
+                this.modeName = '';
+                break;
+            case 'schedulesManage':
+                this.modeName = '控制时间表管理';
+                break;
+            case 'saveScheduleView':
+                this.modeName = '车站保存时间表查看';
+                break;
+            }
         }
     }
 };
@@ -41,7 +67,7 @@ export default {
 .title-name{
 	width: 100%;
 	text-align: center;
-	font-size: 26px;
+	font-size: 20px;
 	margin-top: 30px;
 	color: #56E5DE;
 }
diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/broadOverview.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/broadOverview.vue
new file mode 100644
index 000000000..c39de8f80
--- /dev/null
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/broadOverview.vue
@@ -0,0 +1,112 @@
+<template>
+  <div style="width: 100%;height: calc(100% - 50px);display: flex;justify-content: center">
+    <div style="width: 25px;font-size: 18px;color: #56E5DE;margin: auto 3px;">主线运行时间表总览</div>
+    <div class="table-box" style="font-size: 13px">
+      <div style="display: flex;justify-content: left">
+        <div class="table-head" style="width: 95px;">车站</div>
+        <div class="table-head" style="width: 95px;" />
+        <div class="table-head" style="width: 95px;">版本</div>
+        <div class="table-head" style="width: 95px;" />
+        <div class="table-head" style="width: 140px;">空调大系统</div>
+        <div class="table-head" style="width: 140px;">空调小系统</div>
+        <div class="table-head" style="width: 140px;">隧道通风系统</div>
+        <div class="table-head" style="width: 140px;">照明系统</div>
+      </div>
+      <template v-for="(item, index) in tableData">
+        <div :key="index" style="display: flex;justify-content: left">
+          <div style="height: 30px;line-height: 30px;width: 95px;color: #56E5DE;border-bottom: 1px solid #3E5770">{{ item.stationName }}</div>
+          <div style="height: 30px;width: 95px;background: #FFF;border-bottom: 1px solid #3E5770;" />
+          <div style="height: 30px;width: 95px;border-bottom: 1px solid #3E5770;" />
+          <div class="button-box" style="height: 30px;width: 95px;line-height: 30px;text-align: center;">内容</div>
+          <div style="width: 140px;border-bottom: 1px solid #3E5770;">
+            <div style="display: inline-block;height: 28px;line-height: 28px;width: 60px;text-align: center;" :style="{color: item.largeAirConditioning?'#0F0':'#F00'}">{{ item.largeAirConditioning?'允许': '禁止' }}</div>
+            <div class="button-box" style="display: inline-block;height: 28px;width: 60px;line-height: 28px;text-align: center;" @click="changeSystemMode(item, 'largeAirConditioning')">允许/禁止</div>
+          </div>
+          <div style="width: 140px;border-bottom: 1px solid #3E5770;">
+            <div style="display: inline-block;height: 28px;line-height: 28px;width: 60px;text-align: center;" :style="{color: item.smallAirConditioning?'#0F0':'#F00'}">{{ item.smallAirConditioning?'允许': '禁止' }}</div>
+            <div class="button-box" style="display: inline-block;height: 28px;width: 60px;line-height: 28px;text-align: center;" @click="changeSystemMode(item, 'smallAirConditioning')">允许/禁止</div>
+          </div>
+          <div style="width: 140px;border-bottom: 1px solid #3E5770;">
+            <div style="display: inline-block;height: 28px;line-height: 28px;width: 60px;text-align: center;" :style="{color: item.tunnelVentilation?'#0F0':'#F00'}">{{ item.tunnelVentilation?'允许': '禁止' }}</div>
+            <div class="button-box" style="display: inline-block;height: 28px;width: 60px;line-height: 28px;text-align: center;" @click="changeSystemMode(item, 'tunnelVentilation')">允许/禁止</div>
+          </div>
+          <div style="width: 140px;border-bottom: 1px solid #3E5770;">
+            <div style="display: inline-block;height: 28px;line-height: 28px;width: 60px;text-align: center;" :style="{color: item.lighting?'#0F0':'#F00'}">{{ item.lighting?'允许': '禁止' }}</div>
+            <div class="button-box" style="display: inline-block;height: 28px;width: 60px;line-height: 28px;text-align: center;" @click="changeSystemMode(item, 'lighting')">允许/禁止</div>
+          </div>
+        </div>
+      </template>
+    </div>
+    <div style="font-size: 13px;text-align: center;margin-left: 10px;display: flex;flex-direction: column-reverse;">
+      <div class="button-box" style="height: 35px;padding-top: 2px;margin-bottom: 60px;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
+      <div class="button-box" style="height: 35px;padding-top: 2px;margin-bottom: 10px;" @click="changeShowMode('weeklyStatus')">每周<br>下发一览</div>
+      <div class="button-box" style="height: 35px;line-height: 35px;margin-bottom: 10px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'BroadOverview',
+    data() {
+        return {
+            tableData: [
+                {stationName:'会展中心站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'世纪大道站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'交通大学站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'市图书馆站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'中心医院站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'未来路站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'火车站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'人民广场站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true},
+                {stationName:'体育中心站', largeAirConditioning: true, smallAirConditioning: true, tunnelVentilation: true, lighting: true}
+            ]
+        };
+    },
+    methods: {
+        changeSystemMode(item, system) {
+            item[system] = !item[system];
+        },
+        changeShowMode(mode) {
+            this.$emit('changeShowMode', mode);
+        }
+    }
+};
+</script>
+
+<style scoped>
+	.table-head{
+		background: #43388A;
+		border-right: 1px solid #001528;
+		border-bottom: 1px solid #001528;
+		height: 25px;
+		color: #FFF;
+		text-align: center;
+		line-height: 25px;
+	}
+	.table-box {
+		width: 85%;
+		height: 90%;
+		margin-top: 10px;
+		border-top: 2px solid #5B6163;
+		border-right: 1px solid #64758A;
+		border-left: 1px solid #64758A;
+		border-bottom: 1px solid #64758A;
+	}
+	.button-box {
+		background: #BABABB;
+		border-top: 2px solid #FFFFFE;
+		border-right: 2px solid #797977;
+		border-bottom: 2px solid #797977;
+		border-left: 2px solid #FFFFFE;
+		cursor: pointer;
+	}
+	.button-box.active,
+	.button-box:hover{
+		background: #EBB570;
+		border-top: 2px solid #795B31;
+		border-left: 2px solid #795B31;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
+	}
+</style>
diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/saveScheduleView.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/saveScheduleView.vue
new file mode 100644
index 000000000..f4691b889
--- /dev/null
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/saveScheduleView.vue
@@ -0,0 +1,120 @@
+<template>
+  <div style="width: 100%;margin-top: 10px;">
+    <div class="border-box" style="width: 840px;margin: auto">
+      <el-row>
+        <el-col class="table-header" :span="8">车站</el-col>
+        <el-col class="table-header" :span="8">时间表</el-col>
+        <el-col class="table-header" :span="8">版本</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-select v-model="station" size="mini" placeholder="请选择" style="width: 250px;margin: 5px 15px">
+            <el-option
+              v-for="item in stations"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <el-select v-model="schedule" size="mini" placeholder="请选择" style="width: 250px;margin: 5px 15px">
+            <el-option
+              v-for="item in schedules"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="8">
+          <div style="width: 250px;background: #FFF;height: 28px;margin: 5px 15px" />
+        </el-col>
+      </el-row>
+    </div>
+    <div style="display: flex;justify-content: center;">
+      <div style="display: flex; flex-wrap: wrap;width: 950px;margin-top: 10px;margin-left: 90px;">
+        <div style="width: 460px;height: 280px;background: #FFF;margin: 5px;">
+          <el-row>
+            <el-col class="table-header" style="text-align: left;" :span="6">时间</el-col>
+            <el-col class="table-header" style="text-align: left;" :span="18">空调大系统</el-col>
+          </el-row>
+        </div>
+        <div style="width: 460px;height: 280px;background: #FFF;margin: 5px;">
+          <el-row>
+            <el-col class="table-header" style="text-align: left;" :span="6">时间</el-col>
+            <el-col class="table-header" style="text-align: left;" :span="18">空调小系统</el-col>
+          </el-row>
+        </div>
+        <div style="width: 460px;height: 280px;background: #FFF;margin: 5px;">
+          <el-row>
+            <el-col class="table-header" style="text-align: left;" :span="6">时间</el-col>
+            <el-col class="table-header" style="text-align: left;" :span="18">照明系统</el-col>
+          </el-row>
+        </div>
+        <div style="width: 460px;height: 280px;background: #FFF;margin: 5px;">
+          <el-row>
+            <el-col class="table-header" style="text-align: left;" :span="6">时间</el-col>
+            <el-col class="table-header" style="text-align: left;" :span="18">隧道通风系统</el-col>
+          </el-row>
+        </div>
+      </div>
+      <div style="position: relative;top: 50px;font-size: 12px;text-align: center;margin-top: 355px;">
+        <div class="button-box" style="height: 35px;width:70px;margin: 10px;padding: 0;line-height: 30px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
+        <div class="button-box" style="height: 35px;width:70px;margin: 10px;padding: 3px 0;" @click="changeShowMode('broadOverview')">全线运行<br>时间表总览</div>
+        <div class="button-box" style="height: 35px;width:70px;margin: 10px;padding: 3px 0;" @click="changeShowMode('stationRunningSchedule')">车站运行<br>时间表查看</div>
+        <div class="button-box" style="height: 35px;width:70px;margin: 10px;padding: 3px 0;" @click="changeShowMode('weeklyStatus')">每周<br>下发一览</div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'SaveScheduleView',
+    data() {
+        return {
+            station: '',
+            stations: [],
+            schedule: '',
+            schedules: []
+        };
+    },
+    methods: {
+        changeShowMode(mode) {
+            this.$emit('changeShowMode', mode);
+        }
+    }
+};
+</script>
+
+<style scoped>
+	.border-box{
+		border-top: 2px solid #FFFFFE;
+		border-right: 2px solid #797977;
+		border-bottom: 2px solid #797977;
+		border-left: 2px solid #FFFFFE;
+	}
+	.table-header{
+		background: #43388A;
+		text-align: center;
+		color: #FFF;
+	}
+	.button-box {
+		background: #BABABB;
+		border-top: 2px solid #FFFFFE;
+		border-right: 2px solid #797977;
+		border-bottom: 2px solid #797977;
+		border-left: 2px solid #FFFFFE;
+		cursor: pointer;
+	}
+	.button-box.active,
+	.button-box:hover{
+		background: #EBB570;
+		border-top: 2px solid #795B31;
+		border-left: 2px solid #795B31;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
+	}
+</style>
diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
index 9386a5cbc..03e26692d 100644
--- a/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/schedulesManage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%;display: flex;justify-content: center;">
+  <div style="width: 100%;display: flex;justify-content: center;height: 600px;">
     <div>
       <div class="content-box">
         <div style="width: 950px;font-size: 18px;color: #56E5DE;margin: 10px;">全线车站时间表</div>
@@ -117,6 +117,12 @@
           </div>
         </div>
       </div>
+      <div style="position: relative;left: calc(50% + 470px);bottom: calc(100% - 280px);font-size: 12px;text-align: center;">
+        <div class="button-box" style="height: 70px;width:70px;margin: 10px;padding: 21px 0;" @click="changeShowMode('broadOverview')">全线运行<br>时间表总览</div>
+        <div class="button-box" style="height: 70px;width:70px;margin: 10px;padding: 21px 0;" @click="changeShowMode('stationRunningSchedule')">车站运行<br>时间表查看</div>
+        <div class="button-box" style="height: 70px;width:70px;margin: 10px;padding: 21px 0;" @click="changeShowMode('weeklyStatus')">每周<br>下发一览</div>
+        <div class="button-box" style="height: 70px;width:70px;margin: 10px;padding: 21px 0;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
+      </div>
     </div>
   </div>
 </template>
@@ -148,6 +154,9 @@ export default {
             } else {
                 this.allStationDate.splice(index, 1);
             }
+        },
+        changeShowMode(mode) {
+            this.$emit('changeShowMode', mode);
         }
     }
 };
@@ -200,8 +209,8 @@ export default {
 		background: #EBB570;
 		border-top: 2px solid #795B31;
 		border-left: 2px solid #795B31;
-		border-right: 1px solid #fff;
-		border-bottom: 1px solid #fff;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
 	}
 	/deep/
 	.el-input__inner{
diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/stationRunningSchedule.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/stationRunningSchedule.vue
index 5f759471e..a8b706c6f 100644
--- a/src/views/iscs/iscsSystem/config/bas/schedulesChild/stationRunningSchedule.vue
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/stationRunningSchedule.vue
@@ -1,78 +1,91 @@
 <template>
-  <div style="width: 100%;height: 100%;">
-    <div class="top-box">
-      <el-row style="background: #43388A;font-size: 12px;height: 20px;line-height: 20px;">
-        <el-col :span="8" style="text-align: center;color: #FFF;">车站</el-col>
-        <el-col :span="8" style="text-align: center;color: #FFF;">时间表</el-col>
-        <el-col :span="8" style="text-align: center;color: #FFF;">版本</el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8" style="padding: 10px;">
-          <el-select v-model="station" size="mini" placeholder="请选择">
-            <el-option
-              v-for="item in stations"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-col>
-        <el-col :span="8" style="padding: 10px;">
-          <div style="width: 100%;height: 28px;background: #FFF" />
-        </el-col>
-        <el-col :span="8" style="padding: 10px;">
-          <div style="width: 100%;height: 28px;background: #FFF" />
-        </el-col>
-      </el-row>
+  <div style="width: 100%;height: 600px;display: flex;justify-content: center">
+    <div style="width: 550px;">
+      <div class="top-box">
+        <el-row style="background: #43388A;font-size: 12px;height: 20px;line-height: 20px;">
+          <el-col :span="8" style="text-align: center;color: #FFF;">车站</el-col>
+          <el-col :span="8" style="text-align: center;color: #FFF;">时间表</el-col>
+          <el-col :span="8" style="text-align: center;color: #FFF;">版本</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" style="padding: 10px;">
+            <el-select v-model="station" size="mini" placeholder="请选择">
+              <el-option
+                v-for="item in stations"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-col>
+          <el-col :span="8" style="padding: 10px;">
+            <div style="width: 100%;height: 28px;background: #FFF" />
+          </el-col>
+          <el-col :span="8" style="padding: 10px;">
+            <div style="width: 100%;height: 28px;background: #FFF" />
+          </el-col>
+        </el-row>
+      </div>
+      <div style="width: 100px;height: 20px;background: #FFF;position: relative;left: calc(25% + 450px);margin-top: 20px;" />
+      <div class="top-box" style="border: 0; height: 400px;background: #FFF;">
+        <el-row style="background: #43388A;font-size: 12px;height: 20px;line-height: 20px;">
+          <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">时间表</el-col>
+          <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">时间</el-col>
+          <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">模式</el-col>
+          <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">模式描述</el-col>
+          <el-col :span="8" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">系统</el-col>
+        </el-row>
+      </div>
+      <div class="top-box" style="border: 0; display: flex;justify-content: space-between;">
+        <div class="button-box">上一页</div>
+        <div class="button-box">更新时间表</div>
+        <div class="button-box">下一页</div>
+      </div>
     </div>
-    <div style="width: 100px;height: 20px;background: #FFF;position: relative;left: calc(25% + 450px);margin-top: 20px;" />
-    <div class="top-box" style="border: 0; height: 50%;background: #FFF;">
-      <el-row style="background: #43388A;font-size: 12px;height: 20px;line-height: 20px;">
-        <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">时间表</el-col>
-        <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">时间</el-col>
-        <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">模式</el-col>
-        <el-col :span="4" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">模式描述</el-col>
-        <el-col :span="8" style="text-align: center;color: #FFF;border-right: 1px solid #000;border-bottom: 1px solid #000;">系统</el-col>
-      </el-row>
-    </div>
-    <div class="top-box" style="border: 0; display: flex;justify-content: space-between;">
-      <div class="button-box">上一页</div>
-      <div class="button-box">更新时间表</div>
-      <div class="button-box">下一页</div>
-    </div>
-    <div style="width: 240px;position: absolute;left: calc(25% + 650px);font-size: 12px;top: calc(100% - 300px);">
-      <el-row style="background: #43388A;height: 25px;line-height: 25px;">
-        <el-col :span="9" style="text-align: center;color: #FFF;border: 1px solid #000;">系统</el-col>
-        <el-col :span="9" style="text-align: center;color: #FFF;border-top: 1px solid #000;border-bottom: 1px solid #000;">允许/禁止操作</el-col>
-        <el-col :span="6" style="text-align: center;color: #FFF;border: 1px solid #000;">状态</el-col>
-      </el-row>
-      <el-row style="height: 25px;line-height: 25px;">
-        <el-col :span="9" style="text-align: center;background: #FFF;border: 1px solid #D2D2D2;border-top: 0;">空调大系统</el-col>
-        <el-col :span="9" style="text-align: center;background: #FFF;"><div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;">允许/禁止</div></el-col>
-        <el-col :span="6" style="background: #0F0;text-align: center;border: 1px solid #D2D2D2;border-top: 0;">允许</el-col>
-      </el-row>
-      <el-row style="height: 25px;line-height: 25px;">
-        <el-col :span="9" style="text-align: center;background: #FFF;border: 1px solid #D2D2D2;border-top: 0;">隧道通风系统</el-col>
-        <el-col :span="9" style="text-align: center;background: #FFF;"><div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;">允许/禁止</div></el-col>
-        <el-col :span="6" style="background: #0F0;text-align: center;border: 1px solid #D2D2D2;border-top: 0;">允许</el-col>
-      </el-row>
-      <el-row style="height: 25px;line-height: 25px;">
-        <el-col :span="9" style="text-align: center;background: #FFF;border: 1px solid #D2D2D2;border-top: 0;">空调小系统</el-col>
-        <el-col :span="9" style="text-align: center;background: #FFF;"><div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;">允许/禁止</div></el-col>
-        <el-col :span="6" style="background: #0F0;text-align: center;border: 1px solid #D2D2D2;border-top: 0;">允许</el-col>
-      </el-row>
-      <el-row style="height: 25px;line-height: 25px;">
-        <el-col :span="9" style="text-align: center;background: #FFF;border: 1px solid #D2D2D2;border-top: 0;">照明系统</el-col>
-        <el-col :span="9" style="text-align: center;background: #FFF;"><div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;">允许/禁止</div></el-col>
-        <el-col :span="6" style="background: #0F0;text-align: center;border: 1px solid #D2D2D2;border-top: 0;">允许</el-col>
-      </el-row>
-    </div>
-    <div style="position: absolute;left: calc(25% + 600px);font-size: 12px;top: calc(100% - 150px);display: flex;text-align: center;">
-      <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;padding: 0 5px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
-      <div class="button-box" style="height: 40px;margin: 10px;" @click="changeShowMode('stationRunningSchedule')">全线运行<br>时间表总览</div>
-      <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;padding: 0 5px;" @click="changeShowMode('weeklyStatus')">每周下发一览</div>
-      <div class="button-box" style="height: 40px;margin: 10px;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
+    <div style="margin-left: 180px;">
+      <div style="width: 280px;font-size: 12px;margin-top: 350px;margin-left: 65px;">
+        <el-row style="background: #43388A;height: 25px;line-height: 25px;">
+          <el-col :span="9" style="text-align: center;color: #FFF;border: 1px solid #000;">系统</el-col>
+          <el-col :span="9" style="text-align: center;color: #FFF;border-top: 1px solid #000;border-bottom: 1px solid #000;">允许/禁止操作</el-col>
+          <el-col :span="6" style="text-align: center;color: #FFF;border: 1px solid #000;">状态</el-col>
+        </el-row>
+        <el-row style="height: 25px;line-height: 25px;">
+          <el-col :span="9" class="table-system">空调大系统</el-col>
+          <el-col :span="9" style="text-align: center;background: #FFF;">
+            <div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;" @click="changeSystemMode('largeAirConditioning')">允许/禁止</div>
+          </el-col>
+          <el-col :span="6" class="table-system" :style="{background:systemStatus.largeAirConditioning?'#0F0':'#F00'}">{{ systemStatus.largeAirConditioning?'允许':'禁止' }}</el-col>
+        </el-row>
+        <el-row style="height: 25px;line-height: 25px;">
+          <el-col :span="9" class="table-system">隧道通风系统</el-col>
+          <el-col :span="9" style="text-align: center;background: #FFF;">
+            <div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;" @click="changeSystemMode('tunnelVentilation')">允许/禁止</div>
+          </el-col>
+          <el-col :span="6" class="table-system" :style="{background:systemStatus.tunnelVentilation?'#0F0':'#F00'}">{{ systemStatus.tunnelVentilation?'允许':'禁止' }}</el-col>
+        </el-row>
+        <el-row style="height: 25px;line-height: 25px;">
+          <el-col :span="9" class="table-system">空调小系统</el-col>
+          <el-col :span="9" style="text-align: center;background: #FFF;">
+            <div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;" @click="changeSystemMode('smallAirConditioning')">允许/禁止</div>
+          </el-col>
+          <el-col :span="6" class="table-system" :style="{background:systemStatus.smallAirConditioning?'#0F0':'#F00'}">{{ systemStatus.smallAirConditioning?'允许':'禁止' }}</el-col>
+        </el-row>
+        <el-row style="height: 25px;line-height: 25px;">
+          <el-col :span="9" class="table-system">照明系统</el-col>
+          <el-col :span="9" style="text-align: center;background: #FFF;">
+            <div class="button-box" style="padding: 3px 10px;height: 25px;line-height: 19px;" @click="changeSystemMode('lighting')">允许/禁止</div>
+          </el-col>
+          <el-col :span="6" class="table-system" :style="{background:systemStatus.lighting?'#0F0':'#F00'}">{{ systemStatus.lighting?'允许':'禁止' }}</el-col>
+        </el-row>
+      </div>
+      <div style="font-size: 12px;display: flex;text-align: center;margin-top: 25px;width: 410px;">
+        <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;padding: 0 5px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
+        <div class="button-box" style="height: 40px;margin: 10px;" @click="changeShowMode('broadOverview')">全线运行<br>时间表总览</div>
+        <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;padding: 0 5px;" @click="changeShowMode('weeklyStatus')">每周下发一览</div>
+        <div class="button-box" style="height: 40px;margin: 10px;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
+      </div>
     </div>
+
   </div>
 </template>
 
@@ -82,12 +95,21 @@ export default {
     data() {
         return {
             station: '',
-            stations: []
+            stations: [],
+            systemStatus: {
+                largeAirConditioning: true,
+                tunnelVentilation: true,
+                smallAirConditioning: true,
+                lighting:true
+            }
         };
     },
     methods: {
         changeShowMode(mode) {
             this.$emit('changeShowMode', mode);
+        },
+        changeSystemMode(system) {
+            this.systemStatus[system] = !this.systemStatus[system];
         }
     }
 };
@@ -118,7 +140,13 @@ export default {
 		background: #EBB570;
 		border-top: 2px solid #795B31;
 		border-left: 2px solid #795B31;
-		border-right: 1px solid #fff;
-		border-bottom: 1px solid #fff;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
+	}
+	.table-system{
+		text-align: center;
+		background: #FFF;
+		border: 1px solid #D2D2D2;
+		border-top: 0;
 	}
 </style>
diff --git a/src/views/iscs/iscsSystem/config/bas/schedulesChild/weeklyStatus.vue b/src/views/iscs/iscsSystem/config/bas/schedulesChild/weeklyStatus.vue
index 76ec56819..50c6c8f40 100644
--- a/src/views/iscs/iscsSystem/config/bas/schedulesChild/weeklyStatus.vue
+++ b/src/views/iscs/iscsSystem/config/bas/schedulesChild/weeklyStatus.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%;display: flex;justify-content: center;">
+  <div style="width: 100%;height: 600px;display: flex;justify-content: center;">
     <div>
       <el-row style="margin-top: 120px;width: 560px;height: 28px;line-height: 28px;margin-bottom: 5px;">
         <el-col :span="2" style="color: #56E5DE;">车站:</el-col>
@@ -79,11 +79,11 @@
           <el-col :span="4"><div class="button-box" style="text-align: center;padding: 5px 0;margin-top: 4px;">查看</div></el-col>
         </el-row>
       </div>
-      <div style="position: absolute;left: calc(50% + 320px);bottom: calc(100% - 735px);font-size: 12px;text-align: center;">
-        <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;padding: 0 5px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
-        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 10px;" @click="changeShowMode('')">全线运行<br>时间表管理</div>
-        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 10px;" @click="changeShowMode('')">车站运行<br>时间表查看</div>
-        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 10px;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
+      <div style="position: relative;left: calc(50% + 320px);bottom: calc(100% - 400px);font-size: 12px;text-align: center;width: 90px;">
+        <div class="button-box" style="height: 40px;line-height: 40px;margin: 10px;" @click="changeShowMode('schedulesManage')">时间表管理</div>
+        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 0;" @click="changeShowMode('broadOverview')">全线运行<br>时间表管理</div>
+        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 0;" @click="changeShowMode('')">车站运行<br>时间表查看</div>
+        <div class="button-box" style="height: 40px;margin: 10px;padding: 5px 0;" @click="changeShowMode('saveScheduleView')">车站保存<br>时间表查看</div>
       </div>
     </div>
   </div>
@@ -129,8 +129,8 @@ export default {
 		background: #EBB570;
 		border-top: 2px solid #795B31;
 		border-left: 2px solid #795B31;
-		border-right: 1px solid #fff;
-		border-bottom: 1px solid #fff;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
 	}
 	.white-block{
 		width: 100%;

From 434d7fdbbe6f3a67a6c87a7ce0d96722f3328dd5 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Jun 2020 17:28:15 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E7=81=AF=E4=BD=8D=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/mapoperate/signal/index.vue   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index 9195d728f..aa6fc273d 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -88,6 +88,18 @@
             <el-button type="primary" style="margin-right: 10px;" size="small" @click="setCtcShow">设置</el-button>
           </div>
         </el-collapse-item>
+        <el-collapse-item title="设置灯位类型">
+          <el-form ref="ctcForm" label-width="160px" :model="lampPositionModel" size="mini">
+            <el-form-item label="灯位类型:" prop="lampPositionType">
+              <el-select v-model="lampPositionModel.lampPositionType">
+                <el-option v-for="item in SignalLampPositionTypeList" :key="item.code" :label="item.name" :value="item.code" />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div class="flex_box">
+            <el-button type="primary" style="margin-right: 10px;" size="small" @click="setLampPosition">设置</el-button>
+          </div>
+        </el-collapse-item>
       </el-collapse>
       <div style="height: calc(100% - 90px);">
         <el-scrollbar wrap-class="scrollbar-wrapper">
@@ -195,6 +207,9 @@ export default {
             guideModel: {
                 scope: 'All',
                 callOn: true
+            },
+            lampPositionModel: {
+                lampPositionType: ''
             }
         };
     },
@@ -491,6 +506,16 @@ export default {
             this.$emit('updateMapModel', models);
             this.$message.success('数据构建成功!');
         },
+        setLampPosition() {
+            const models = [];
+            this.signalList.forEach(item => {
+                const signalModel = deepAssign({}, item); // 深拷贝
+                signalModel.lampPositionType = this.lampPositionModel.lampPositionType;
+                models.push(signalModel);
+            });
+            this.$emit('updateMapModel', models);
+            this.$message.success('数据构建成功!');
+        },
         // 寻找信号机关联区段
         findSection(signal) {
             // 01 向左 02 向右

From 9c0d69e81ea612943efbbd7744db7a1e10899237 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 11 Jun 2020 17:39:33 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=BD=A6=E6=AC=A1=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
index 73ab36207..177d624b3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
@@ -74,6 +74,9 @@ export default {
             this.editModel.logicSectionCodeList.forEach(logicCode => {
                 const section = this.$store.getters['map/getDeviceByCode'](logicCode);
                 models.push(deepAssign(section, {_dispose: true}));
+
+                const trainWindowModel = this.$store.getters['map/getDeviceByCode'](section.trainWindowCode);
+                models.push(deepAssign(trainWindowModel, {_dispose: true}));
             });
             if (this.logicNum === 0) {
                 logicSectionCodeList = [];

From 6402e6312b64eb9232e6f676eefbf69ec8b2c222 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 11 Jun 2020 17:53:35 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8C=BA=E6=AE=B5=20=E5=90=8D=E7=A7=B0=E5=81=8F=E7=A7=BB?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapoperate/section/logicBlock.vue         | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
index 177d624b3..af3a48c51 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height:100%">
-    <div style="height: calc(100% - 46px);">
+    <div style="height: 100%;">
       <el-scrollbar wrap-class="scrollbar-wrapper">
         <el-form ref="showDelimiter" label-width="180px" size="mini">
           <el-form-item label="逻辑区段数量">
@@ -9,17 +9,18 @@
           <el-form-item label="是否显示分隔符">
             <el-checkbox v-model="isDelimiter" />
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="editSectionNum">{{ $t('map.updateObj') }}</el-button>
+          </el-form-item>
           <el-form-item label="区段名称偏移Y坐标">
             <el-input-number v-model="distanceY" />
           </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="editSectionDistance">{{ $t('map.updateObj') }}</el-button>
+          </el-form-item>
         </el-form>
       </el-scrollbar>
     </div>
-    <div class="button_box">
-      <el-button-group class="map-draft-group">
-        <el-button type="primary" size="small" @click="editSectionNum">{{ $t('map.updateObj') }}</el-button>
-      </el-button-group>
-    </div>
   </div>
 </template>
 <script>
@@ -212,6 +213,16 @@ export default {
         // 计算逻辑区段数量列表展示
         computedLogicSectionNumList(logicSectionCodeList) {
             this.logicNum = logicSectionCodeList ? logicSectionCodeList.length : 0;
+        },
+        // 修改逻辑区段偏移量
+        editSectionDistance() {
+            const models = [];
+            this.editModel.logicSectionCodeList.forEach(logicCode => {
+                const logicSection = deepAssign({}, this.$store.getters['map/getDeviceByCode'](logicCode));
+                logicSection.namePosition = { x: 0, y: this.distanceY };
+                models.push(logicSection);
+            });
+            this.$emit('updateMapModel', models, 'four');
         }
     }
 };

From b341735a8c30b9d673f031a036d53c504592a23f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 11 Jun 2020 18:32:26 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/chatView/chatBox.vue    |   4 +-
 src/views/newMap/displayNew/menuScript.vue    |  21 +++-
 .../newMap/displayNew/menuSystemTime.vue      |   9 +-
 src/views/newMap/jlmapNew/pendant/zoom.vue    |   2 +-
 src/views/scriptManage/display/indexNew.vue   |  44 +++----
 .../display/tipScriptRecordNew.vue            | 108 ++++++++++++++++++
 .../scriptManage/scriptRecord/addAction.vue   |   5 +
 7 files changed, 161 insertions(+), 32 deletions(-)
 create mode 100644 src/views/scriptManage/display/tipScriptRecordNew.vue

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index dd6c3c242..b7cae596b 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -54,6 +54,7 @@ import ChatSetting from './chatSetting';
 import ChatContent from './chatContent';
 import ChatCreateGroup from './chatCreateGroup';
 import ChatMemberList from './chatMemberList';
+import ChatTooltip from './chatTooltip';
 import ChatCoversitionList from './chatCoversitionList';
 import RecordRTC from 'recordrtc';
 import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
@@ -64,7 +65,8 @@ export default {
         ChatContent,
         ChatMemberList,
         ChatCoversitionList,
-        ChatCreateGroup
+        ChatCreateGroup,
+        ChatTooltip
     },
     props: {
         group: {
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 2a98e9db5..736369bea 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -12,12 +12,16 @@
         <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
       </el-button-group>
     </div>
+    <chat-box ref="chatbox" :group="group" :user-role="userRole" />
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+    <tip-script-record-new ref="tipTaskRecordNew" :group="group" :offset-bottom="offsetBottom" />
   </div>
 </template>
 
 <!-- 单人仿真 -->
 <script>
+import ChatBox from './chatView/chatBox';
+import TipScriptRecordNew from '@/views/scriptManage/display/tipScriptRecordNew';
 import SetTime from './demon/setTime';
 import { Notification } from 'element-ui';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
@@ -28,7 +32,9 @@ import { mapGetters } from 'vuex';
 export default {
     name: 'MenuTask',
     components: {
-        SetTime
+        SetTime,
+        ChatBox,
+        TipScriptRecordNew
     },
     props: {
         group: {
@@ -70,7 +76,18 @@ export default {
         },
         ...mapGetters('map', [
             'trainList'
-        ])
+        ]),
+        userRole() {
+            if (this.$store.state.training.prdType == '02') {
+                return 'DISPATCHER';
+            } else if (this.$store.state.training.prdType == '01') {
+                return 'STATION_SUPERVISOR';
+            } else if (this.$store.state.training.prdType == '04') {
+                return 'DRIVER';
+            } else {
+                return 'AUDIENCE';
+            }
+        }
     },
     watch: {
         '$store.state.training.subscribeCount': function () {
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index e771a36aa..39e78c02c 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -54,14 +54,17 @@ export default {
         pause() {
             return this.$store.state.scriptRecord.simulationPause;
         },
+        isDisplay() {
+            return this.$route.path.includes('displayNew') || this.$route.path.includes('scriptDisplayNew');
+        },
         isShowDate() {
-            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew');
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay;
         },
         top() {
-            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? 35 : this.offset;
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay ? 35 : this.offset;
         },
         newRight() {
-            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.$route.path.includes('displayNew') ? this.$store.state.config.width - 340 - 80 : this.right;
+            return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay ? this.$store.state.config.width - 340 - 80 : this.right;
         }
     },
     watch: {
diff --git a/src/views/newMap/jlmapNew/pendant/zoom.vue b/src/views/newMap/jlmapNew/pendant/zoom.vue
index e82c5b89f..50bc7db13 100644
--- a/src/views/newMap/jlmapNew/pendant/zoom.vue
+++ b/src/views/newMap/jlmapNew/pendant/zoom.vue
@@ -38,7 +38,7 @@ export default {
     methods: {
         setPosition() {
             this.$nextTick(() => {
-                let offset = this.$route.path.includes('displayNew') && (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) ? 73 : 15;
+                let offset = (this.$route.path.includes('displayNew') || this.$route.path.includes('scriptDisplayNew')) && (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) ? 73 : 15;
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 if (menuBar) {
diff --git a/src/views/scriptManage/display/indexNew.vue b/src/views/scriptManage/display/indexNew.vue
index c14820389..3492331b0 100644
--- a/src/views/scriptManage/display/indexNew.vue
+++ b/src/views/scriptManage/display/indexNew.vue
@@ -1,32 +1,33 @@
 <template>
   <div class="script-parent">
-    <div class="script-card" :style="{width: widthLeft+'px'}">
-      <tip-script-record ref="tipTaskRecord" :group="group" :width="widthLeft" />
-    </div>
-    <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" />
-    <div class="script-display">
-      <display ref="display" :size="size" />
-    </div>
+    <!-- <div class="script-card" :style="{width: widthLeft+'px'}"> -->
+    <!-- <tip-script-record ref="tipTaskRecord" :group="group" :width="widthLeft" /> -->
+    <!-- </div> -->
+    <!-- <drap-left :width-left="widthLeft" :min="780" :max="980" @drapWidth="drapWidth" /> -->
+    <!-- <div class="script-display"> -->
+    <display ref="display" :size="size" />
+    <!-- <tip-script-record-new ref="tipTaskRecordNew" :group="group" /> -->
+    <!-- </div> -->
   </div>
 </template>
 
 <script>
 import Display from '@/views/newMap/displayNew/index';
-import TipScriptRecord from './tipScriptRecord';
-import drapLeft from '@/views/components/drapLeft/index';
+// import TipScriptRecordNew from './tipScriptRecordNew';
+// import drapLeft from '@/views/components/drapLeft/index';
 
 export default {
     name: 'ScriptDisplayNew',
     components: {
-        Display,
-        TipScriptRecord,
-        drapLeft
+        Display
+        // TipScriptRecordNew
+        // drapLeft
     },
     data() {
         return {
-            widthLeft: 780,
+            // widthLeft: 780,
             size: {
-                width: document.documentElement.clientWidth - 780,
+                width: document.documentElement.clientWidth,
                 height: document.documentElement.clientHeight
             },
             group: this.$route.query.group
@@ -34,11 +35,11 @@ export default {
     },
     watch: {
         '$store.state.app.windowSizeCount': function() {
-            this.size = { width: this.$store.state.app.width - 780, height: this.$store.state.app.height};
-        },
-        widthLeft: function(val) {
-            this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
+            this.size = { width: this.$store.state.app.width, height: this.$store.state.app.height};
         }
+        // widthLeft: function(val) {
+        //     this.size = { width: this.$store.state.app.width - val, height: this.$store.state.app.height};
+        // }
     },
     methods: {
         drapWidth(width) {
@@ -49,11 +50,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-    .script-parent {
-        display: flex;
-        flex-flow: row;
-        .script-card {
-            width: 780px;
-        }
-    }
 </style>
diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
new file mode 100644
index 000000000..0c3b4b1a1
--- /dev/null
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <div class="scriptRecordNew" :style="{bottom:(offsetBottom-15)+'px'}">
+      <div v-show="isShow" class="scriptRecordNewIn">
+        <el-tabs type="card">
+          <el-tab-pane :label="$t('scriptRecord.scriptRecordTitle')+'('+language+')'">
+            <div style="padding:0px 10px;height: 240px;" />
+          </el-tab-pane>
+          <el-tab-pane label="选择剧本角色">
+            <div style="padding:0px 10px;height: 240px;">
+              <add-role ref="addRole" :group="group" @refresh="refresh" />
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <div class="scriptRecordNewTitle" @click="minisize">
+        <span class="titleStyle">{{ $t('scriptRecord.scriptRecordTitle') }}</span>
+        <!-- <span class="titleStyle">( {{ $t('scriptRecord.language') }}: {{ $route.query.lang=="en"?$t('scriptRecord.english'):$t('scriptRecord.chinese') }} )</span> -->
+      </div>
+    </div>
+    <!-- <div class="selectRoles">
+      <div class="selectRolesTitle">选择成员角色</div>
+      <add-role ref="addRole" :group="group" @refresh="refresh" />
+    </div> -->
+  </div>
+</template>
+<script>
+import AddRole from '../scriptRecord/addRole';
+export default {
+    name:'TipScriptRecordNew',
+    components: {
+        AddRole
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offsetBottom:{
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            isShow:true,
+            language:''
+        };
+    },
+    mounted() {
+        this.language = this.$route.query.lang == 'en' ? this.$t('scriptRecord.english') : this.$t('scriptRecord.chinese');
+    },
+    methods:{
+        refresh() {
+        },
+        minisize() {
+            if (this.isShow) {
+                this.isShow = false;
+            } else {
+                this.isShow = true;
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+// .selectRoles{
+//     position: absolute;
+//     width: 700px;
+//     left: 5px;
+//     bottom: 424px;
+//     z-index: 10;
+//     background: #fff;
+//     height: 200px;
+//     border-radius: 5px;
+// }
+.selectRolesTitle{
+
+}
+.scriptRecordNew{
+    position: absolute;
+    width: 700px;
+    max-height: 400px;
+    z-index: 10;
+    padding-top: 28px;
+    left: 50%;
+    bottom: 0px;
+    transform: translateX(-50%) translateY(0);
+}
+.scriptRecordNewTitle{
+    position: absolute;
+    background: #fff;
+    border-radius: 5px 5px 0px 0px ;
+    padding: 5px 0px;
+    width: 100px;
+    text-align: center;
+    left: 50%;
+    transform: translateX(-50%);
+    cursor: pointer;
+    top:0;
+}
+.scriptRecordNewIn{
+    padding: 10px;
+    background: #fff;
+    border-radius: 5px 5px 0px 0px ;
+    box-shadow: -1px -1px 3px #656565;
+}
+</style>
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 46d315955..426c6f000 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -11,6 +11,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('scriptRecord.receiver')" class="conditionVO" prop="actionVO.targetId">
+              <!-- multiple -->
               <el-select v-model="modalData.actionVO.targetId" :placeholder="$t('scriptRecord.receiverRules')" :disabled="isPause&&isNotModify">
                 <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
               </el-select>
@@ -545,6 +546,10 @@ export default {
         },
         changeItem() {
             if (!(this.isPause && this.isNotModify)) {
+                // debugger;
+                // if (this.modalData.actionVO.targetId) {
+
+                // }
                 const temp = this.modalData.actionVO.memberId;
                 this.modalData.actionVO.memberId = this.modalData.actionVO.targetId;
                 this.modalData.actionVO.targetId = temp;

From 9de92f71066153dbec01bb0f871f61d81023ec66 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 11 Jun 2020 18:36:15 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?=
 =?UTF-8?q?=E7=BA=BF=E5=88=97=E8=BD=A6=E8=AE=BE=E7=BD=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=BD=A6=E3=80=81=E4=BA=BA=E5=B7=A5=E8=BD=A6=E3=80=81=E5=A4=B4?=
 =?UTF-8?q?=E7=A0=81=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningbo_01/menus/dialog/trainSetHead.vue   | 49 ++++++-------------
 .../ningbo_01/menus/dialog/trainSetPlan.vue   | 36 +++++---------
 .../ningbo_01/menus/dialog/trainSetWork.vue   | 37 +++-----------
 .../theme/ningbo_01/menus/menuTrain.vue       | 14 ++----
 .../ningbo_01/menus/utils/menuOperate.js      | 14 ++++++
 src/utils/baseUrl.js                          |  4 +-
 6 files changed, 55 insertions(+), 99 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
index 7e724d24a..fc4acbbf2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
@@ -16,10 +16,10 @@
     </el-row>
     <el-row>
       <el-col :span="11">
-        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" @change="inputGroupNumber" />
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" :disabled="trueValue" />
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-input :id="domIdInput" v-model="addModel.serialNumber" size="mini" @change="inputGroupNumber" />
+        <el-input :id="domIdInput" v-model="addModel.serviceNumber" size="mini" :disabled="trueValue" />
       </el-col>
     </el-row>
     <el-row>
@@ -27,7 +27,7 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <el-input v-model="addModel.targetCode" size="mini" />
+        <el-input v-model="addModel.destinationCode" size="mini" />
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
@@ -46,6 +46,7 @@
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
 
 export default {
     name: 'TrainSetHead',
@@ -58,10 +59,11 @@ export default {
             selected: null,
             addModel: {
                 groupNumber: '',
-                targetCode: '',
-                serialNumber: ''
+                destinationCode: '',
+                serviceNumber: ''
             },
             dialogShow: false,
+            trueValue: true,
             loading: false
         };
     },
@@ -95,14 +97,8 @@ export default {
             this.selected = selected;
             // 如果不是断点激活，则需要对初始值进行初始化
             if (!this.dialogShow) {
-                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
-                if (section) {
-                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
-                    if (station) {
-                        this.addModel.stationName = station.name;
-                    }
-                }
-                this.addModel.trainWindowCode = selected.code;
+                this.addModel.groupNumber = selected.groupNumber;
+                console.log(selected);
             }
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -116,29 +112,14 @@ export default {
             this.$store.dispatch('map/setTrainWindowShow', false);
             this.mouseCancelState(this.selected);
         },
-        inputGroupNumber() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.input.operation,
-                val: this.addModel.groupNumber
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
         commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.menu.operation,
-                val: this.addModel.groupNumber
+            const params = {
+                groupNumber: this.addModel.groupNumber,
+                destinationCode: this.addModel.destinationCode,
+                serviceNumber: this.addModel.serviceNumber
             };
-
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            commitOperate(menuOperate.TrainWindow.destinationTrainId, params, 2).then(({valid})=>{
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
index d2bb4f025..616931563 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
@@ -15,7 +15,7 @@
     </el-row>
     <el-row>
       <el-col :span="11">
-        <el-input v-model="addModel.groupNumber" size="mini" />
+        <el-input v-model="addModel.groupNumber" size="mini" :disabled="true" />
       </el-col>
     </el-row>
     <el-row>
@@ -24,10 +24,10 @@
     </el-row>
     <el-row>
       <el-col :span="11">
-        <el-input v-model="addModel.serialNumber" size="mini" />
+        <el-input v-model="addModel.serviceNumber" size="mini" />
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-input :id="domIdInput" v-model="addModel.tripNumber" @change="inputGroupNumber" size="mini" />
+        <el-input :id="domIdInput" v-model="addModel.tripNumber" size="mini" />
       </el-col>
     </el-row>
 
@@ -47,6 +47,7 @@
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
 
 export default {
     name: 'TrainSetPlan',
@@ -60,7 +61,7 @@ export default {
             addModel: {
                 groupNumber: '',
                 tripNumber: '',
-                serialNumber: ''
+                serviceNumber: ''
             },
             dialogShow: false,
             loading: false
@@ -97,6 +98,7 @@ export default {
             // 如果不是断点激活，则需要对初始值进行初始化
             // if (!this.dialogShow) {
             // }
+            this.addModel.groupNumber = selected.groupNumber;
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
@@ -109,29 +111,15 @@ export default {
             this.$store.dispatch('map/setTrainWindowShow', false);
             this.mouseCancelState(this.selected);
         },
-        inputGroupNumber() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.input.operation,
-                val: this.addModel.tripNumber
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
         commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.menu.operation,
-                val: this.addModel.tripNumber
+            const params = {
+                groupNumber: this.addModel.groupNumber,
+                tripNumber: this.addModel.tripNumber,
+                serviceNumber: this.addModel.serviceNumber
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            commitOperate(menuOperate.TrainWindow.setPlanTrainId, params, 2).then(({valid})=>{
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -148,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
index 4f695e6d0..506a5f7ba 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
@@ -13,7 +13,7 @@
     <el-row>
       <el-col :span="6" style="line-height: 44px;">车组号:</el-col>
       <el-col :span="18">
-        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" @change="inputGroupNumber" />
+        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" :disabled="true" />
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
@@ -32,6 +32,7 @@
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
 
 export default {
     name: 'TrainSetWork',
@@ -79,14 +80,7 @@ export default {
             this.selected = selected;
             // 如果不是断点激活，则需要对初始值进行初始化
             if (!this.dialogShow) {
-                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
-                if (section) {
-                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
-                    if (station) {
-                        this.addModel.stationName = station.name;
-                    }
-                }
-                this.addModel.trainWindowCode = selected.code;
+                this.addModel.groupNumber = selected.groupNumber;
             }
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -100,29 +94,12 @@ export default {
             this.$store.dispatch('map/setTrainWindowShow', false);
             this.mouseCancelState(this.selected);
         },
-        inputGroupNumber() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.input.operation,
-                val: this.addModel.tripNumber
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
         commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.menu.operation,
-                val: this.addModel.tripNumber
+            const params = {
+                groupNumber: this.addModel.groupNumber
             };
-
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            commitOperate(menuOperate.TrainWindow.artificialTrainId, params, 2).then(({valid})=>{
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -139,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 18331a9f0..55234be20 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -151,17 +151,17 @@ export default {
                     {
                         label: '设置计划车',
                         handler: this.setPlanTrain,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
                     },
                     {
                         label: '设置头码车',
                         handler: this.setHeadTrain,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
                     },
                     {
                         label: '设置人工车',
                         handler: this.setWorkTrain,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
                     },
                     {
                         label: '设乘务组号',
@@ -388,9 +388,7 @@ export default {
                 start: true,
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation,
-                param: {
-                    sectionCode: this.$store.state.map.trainWindowSectionCode
-                }
+                param: {}
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -405,9 +403,7 @@ export default {
                 start: true,
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation,
-                param: {
-                    sectionCode: this.$store.state.map.trainWindowSectionCode
-                }
+                param: {}
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js
index 1e4d33713..97c415fba 100644
--- a/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js
+++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js
@@ -271,6 +271,20 @@ export const menuOperate = {
             operation: OperationEvent.MixinCommand.cancelStoppage.menu.operation,
             cmdType: CMD.Fault.CMD_CANCEL_FAULT
         }
+    },
+    TrainWindow: {
+        destinationTrainId: {
+            operation: OperationEvent.Train.editTrainId.menu.operation,
+            cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
+        },
+        setPlanTrainId: {
+            operation: OperationEvent.Train.setPlanTrainId.menu.operation,
+            cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+        },
+        artificialTrainId: {
+            operation: OperationEvent.Train.artificialTrainId.menu.operation,
+            cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
+        }
     }
 };
 
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 778caeb7b..c59924e25 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ 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.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';

From 9294c582f88e3ed681cd915e50f1a6f715ac39c4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 12 Jun 2020 09:41:16 +0800
Subject: [PATCH 13/22] =?UTF-8?q?domId=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/menus/dialog/trainSetHead.vue | 15 ++++++---------
 .../theme/ningbo_01/menus/dialog/trainSetPlan.vue | 15 ++++++++-------
 .../theme/ningbo_01/menus/dialog/trainSetWork.vue | 11 +++--------
 .../theme/xian_01/menus/dialog/trainControl.vue   |  2 +-
 src/scripts/cmdPlugin/OperationHandler.js         | 14 +++++++++++++-
 src/utils/baseUrl.js                              |  4 ++--
 6 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
index fc4acbbf2..5c053d848 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
@@ -16,10 +16,10 @@
     </el-row>
     <el-row>
       <el-col :span="11">
-        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" :disabled="trueValue" />
+        <el-input v-model="addModel.groupNumber" size="mini" :disabled="trueValue" />
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-input :id="domIdInput" v-model="addModel.serviceNumber" size="mini" :disabled="trueValue" />
+        <el-input v-model="addModel.serviceNumber" size="mini" :disabled="trueValue" />
       </el-col>
     </el-row>
     <el-row>
@@ -27,7 +27,7 @@
     </el-row>
     <el-row>
       <el-col :span="12">
-        <el-input v-model="addModel.destinationCode" size="mini" />
+        <el-input :id="domIdTargetCodeChange" v-model="addModel.destinationCode" size="mini" />
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
@@ -44,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
 
@@ -74,8 +74,8 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        domIdInput() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.input.domId : '';
+        domIdTargetCodeChange() {
+            return this.dialogShow ? OperationEvent.Train.destinationTrainId.targetCodeChange.domId : '';
         },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
@@ -98,7 +98,6 @@ export default {
             // 如果不是断点激活，则需要对初始值进行初始化
             if (!this.dialogShow) {
                 this.addModel.groupNumber = selected.groupNumber;
-                console.log(selected);
             }
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -132,10 +131,8 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
index 616931563..3104f87ea 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
@@ -24,13 +24,12 @@
     </el-row>
     <el-row>
       <el-col :span="11">
-        <el-input v-model="addModel.serviceNumber" size="mini" />
+        <el-input :id="domIdServerNoChange" v-model="addModel.serviceNumber" size="mini" />
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-input :id="domIdInput" v-model="addModel.tripNumber" size="mini" />
+        <el-input :id="domIdTrainNoChange" v-model="addModel.tripNumber" size="mini" />
       </el-col>
     </el-row>
-
     <el-row justify="center" class="button-group">
       <el-col :span="10">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
@@ -45,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
 
@@ -74,8 +73,11 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        domIdInput() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.input.domId : '';
+        domIdServerNoChange() {
+            return this.dialogShow ? OperationEvent.Train.setPlanTrainId.serverNoChange.domId : '';
+        },
+        domIdTrainNoChange() {
+            return this.dialogShow ? OperationEvent.Train.setPlanTrainId.trainNoChange.domId : '';
         },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
@@ -132,7 +134,6 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
index 506a5f7ba..ac00237a5 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
@@ -13,7 +13,7 @@
     <el-row>
       <el-col :span="6" style="line-height: 44px;">车组号:</el-col>
       <el-col :span="18">
-        <el-input :id="domIdInput" v-model="addModel.groupNumber" size="mini" :disabled="true" />
+        <el-input v-model="addModel.groupNumber" size="mini" :disabled="true" />
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
@@ -30,7 +30,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import { menuOperate, commitOperate } from '../utils/menuOperate';
 
@@ -57,14 +57,11 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        domIdInput() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.input.domId : '';
-        },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Train.artificialTrainId.menu.domId : '';
         },
         title() {
             return '设置人工车';
@@ -112,10 +109,8 @@ export default {
         },
         cancel() {
             const operate = {
-                type: MapDeviceType.Train.type,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
index 3e6bef581..cc88afa9f 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainControl.vue
@@ -427,7 +427,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index a204ec1c5..0ec11058f 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1726,7 +1726,7 @@ export const OperationEvent = {
                 operation: '6102',
                 domId: '_Tips-Station-setBackStrategy-confirm'
             }
-        },
+        }
     },
 
     // 列车
@@ -1886,6 +1886,14 @@ export const OperationEvent = {
             trainSource: {
                 operation: '7082',
                 domId: '_Tips-Train-SetPlanTrainId-TrainSource'
+            },
+            serverNoChange: {
+                operation: '7083',
+                domId: '_Tips-Train-SetPlanTrainId-serverNoChange'
+            },
+            trainNoChange: {
+                operation: '7084',
+                domId: '_Tips-Train-SetPlanTrainId-trainNoChange'
             }
         },
         // 添加计划车
@@ -1938,6 +1946,10 @@ export const OperationEvent = {
             menu: {
                 operation: '70c',
                 domId: '_Tips-Train-destinationTrainId-Menu'
+            },
+            targetCodeChange: {
+                operation: '70c1',
+                domId: '_Tips-Train-destinationTrainId-targetCodeChange'
             }
         },
         // 设人工车
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c59924e25..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ 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.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';

From f7c6f6ee644c69298123a171e1b2d194c10bbd78 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 12 Jun 2020 09:55:53 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                                      | 4 ++--
 src/views/newMap/newMapdraft/mapoperate/section/index.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c59924e25..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ 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.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 2caa663b3..9040ccb6c 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -223,7 +223,7 @@ export default {
                                 { prop: 'destinationCodePoint.y', firstLevel: 'destinationCodePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
                             ] }, // 目的地码坐标
 
-                            { prop: 'switchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', disabled: true }, // 是否关联道岔
+                            { prop: 'switchSection', label: this.$t('map.isSwitchSection'), type: 'checkbox', disabled: true, isHidden: !this.isRelevanceSwitchShow }, // 是否关联道岔
                             { prop: 'relSwitchCode', label: this.$t('map.relSwitchCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.switchList, isHidden: !this.isRelevanceSwitchShow, disabled: true }, // 关联道岔
 
                             { prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSwitchSectionType }, // 1
@@ -393,7 +393,7 @@ export default {
         },
         isSwitchSectionShow() {
             // 道岔区段
-            return this.editModel.type != '03';
+            return this.editModel.type != '03' && !this.editModel.logicSectionCodeList.length;
         },
         isPointsShow() {
             return (
@@ -401,7 +401,7 @@ export default {
             );
         },
         isRelevanceSwitchShow() {
-            return this.editModel.type == '04' && this.editModel.type == '03';
+            return this.editModel.type == '04' || this.editModel.type == '03';
         },
         hasAssociatedSection() {
             return this.editModel.type == '01' || this.editModel.type == '03';

From 429fe6d6a7159ea017aa4e81503735176b47f697 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 12 Jun 2020 10:51:06 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E8=B7=B3=E5=81=9C=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4&=E5=88=97?=
 =?UTF-8?q?=E8=BD=A6=E8=AF=86=E5=88=AB=E5=8F=B7=E6=98=BE=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/bejing_01.js      |   2 -
 src/jmapNew/config/skinCode/chengdu_01.js     |   2 -
 src/jmapNew/config/skinCode/chengdu_03.js     |   2 -
 src/jmapNew/config/skinCode/foshan_01.js      |   3 -
 src/jmapNew/config/skinCode/fuzhou_01.js      |   3 +-
 src/jmapNew/config/skinCode/haerbin_01.js     |   3 -
 src/jmapNew/config/skinCode/ningbo_01.js      |   2 -
 src/jmapNew/config/skinCode/xian_01.js        |   4 +-
 src/jmapNew/config/skinCode/xian_02.js        |   2 -
 src/jmapNew/shape/Train/index.js              |  86 +---
 src/jmapNew/theme/beijing_01/model.js         |   2 -
 src/jmapNew/theme/chengdu_01/model.js         |   2 -
 src/jmapNew/theme/chengdu_03/model.js         |   2 -
 .../menus/dialog/standJumpStopControl.vue     |  15 +-
 .../menus/menuDialog/viewTrainId.vue          |   2 +-
 src/jmapNew/theme/foshan_01/model.js          |   4 +-
 .../childDialog/twoConfirmation.vue           | 142 ------
 .../menus/menuDialog/childDialog/userAdd.vue  | 172 -------
 .../menuDialog/childDialog/userDelete.vue     | 143 ------
 .../menus/menuDialog/childDialog/userEdit.vue | 189 -------
 .../haerbin_01/menus/menuDialog/helpAbout.vue | 140 ------
 .../menus/menuDialog/manageUser.vue           | 309 ------------
 .../menus/menuDialog/passwordBox.vue          | 228 ---------
 .../menuDialog/stationControlConvert.vue      | 463 ------------------
 .../haerbin_01/menus/menuDialog/trainAdd.vue  | 179 -------
 .../menus/menuDialog/trainDelete.vue          | 157 ------
 .../menus/menuDialog/trainTranstalet.vue      | 164 -------
 .../menus/menuDialog/viewDevice.vue           | 166 -------
 .../haerbin_01/menus/menuDialog/viewName.vue  | 248 ----------
 .../menus/menuDialog/viewTrainId.vue          | 209 --------
 src/jmapNew/theme/haerbin_01/model.js         |   2 -
 src/jmapNew/theme/ningbo_01/model.js          |   2 -
 .../xian_01/menus/menuDialog/viewTrainId.vue  |   2 +-
 src/jmapNew/theme/xian_01/model.js            |   2 +-
 src/jmapNew/theme/xian_02/model.js            |   2 -
 35 files changed, 18 insertions(+), 3037 deletions(-)
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue
 delete mode 100644 src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 6c6afa69b..27c8b6c42 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -628,8 +628,6 @@ class SkinCode extends defaultStyle {
                 haveTrainBorder: false, // 是否需创建trainBorder对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
-                useSelfText: true, // 使用配置项的字体大小
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 9c01e1b09..0e1bcd2f5 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -565,8 +565,6 @@ class SkinCode extends defaultStyle {
                 aspectRatio: 7 / 5, // 字体宽高比例（用以拼接text是计算位置）
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
-                useSelfText: true, // 使用配置项的字体大小
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 8983f55ed..05a0b30f8 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -749,8 +749,6 @@ class SkinCode extends defaultStyle {
                 haveTrainBorder: false, // 是否需创建trainBorder对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
-                useSelfText: true, // 使用配置项的字体大小
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index c36e3c2d2..5c90763f9 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -592,14 +592,11 @@ class SkinCode extends defaultStyle {
                 trainHeadArrowOffsetX: 3 // 列车车头三角偏移
             },
             common: {
-                useSelfFormat: true,
-                useSelfText: false,
                 trainHeight: 17, // 列车高度
                 trainHeadDistance: 2, // 列车和车头之间的间距
                 trainWidth:62, // 列车长度
                 trainTextFontSize: 19, // 列车字号
                 fontFamily: 'consolas', // 默认字体 族类
-                nameFontSize: 19, // 字体大小
                 haveTextHSDA: false, // 是否需创建textHSDA对象
                 haveArrowText: true, // 是否需创建arrowText对象
                 haveTrainBorder: false, // 是否需创建trainBorder对象
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index e863755a3..e5522d778 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -582,9 +582,8 @@ class SkinCode extends defaultStyle {
                 trainHeight: 17, // 列车高度
                 trainHeadDistance: 2, // 列车和车头之间的间距
                 trainWidth: 76, // 列车长度
-                trainTextFontSize: 15, // 列车字号
+                trainTextFontSize: 10, // 列车字号
                 fontFamily: 'consolas', // 默认字体 族类
-                nameFontSize: 15, // 字体大小
                 haveTextHSDA: false, // 是否需创建textHSDA对象
                 haveArrowText: true, // 是否需创建arrowText对象
                 haveTrainBorder: false, // 是否需创建trainBorder对象
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index b0ab0e95d..8dd13b025 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -645,15 +645,12 @@ class SkinCode extends defaultStyle {
                 hasDelayTime: true, // 是否有延迟时间
                 hasCrewNum: true, // 是否有乘务组号
                 hasTravelNum:  true, // 是否有行程号
-                useSelfFormat: true,
-                useSelfText: true,
                 fixedCoordinates: true, // 列车车组号等固定坐标
                 trainHeight: 40, // 列车高度
                 trainHeadDistance: 2, // 列车和车头之间的间距
                 trainWidth: 82, // 列车长度
                 trainTextFontSize: 12, // 列车字号
                 fontFamily: 'consolas', // 默认字体 族类
-                nameFontSize: 12, // 字体大小
                 haveTextHSDA: false, // 是否需创建textHSDA对象
                 haveArrowText: true, // 是否需创建arrowText对象
                 haveTrainBorder: false, // 是否需创建trainBorder对象
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 44f653d35..6a4301278 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -602,9 +602,7 @@ class SkinCode extends defaultStyle {
                 aspectRatio: 7 / 5, // 字体宽高比例（用以拼接text是计算位置）
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
                 trainHeadColorChangeMode: 1, // 1:driveMode + runlevel
-                useSelfText: true, // 使用配置项的字体大小
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:false // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 24536bca1..95730cf9b 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -648,16 +648,14 @@ class SkinCode extends defaultStyle {
                 trainHeight: 17, // 列车高度
                 trainHeadDistance: 2, // 列车和车头之间的间距
                 trainWidth: 76, // 列车长度
-                trainTextFontSize: 15, // 列车字号
+                trainTextFontSize: 30, // 列车字号
                 fontFamily: 'consolas', // 默认字体 族类
-                nameFontSize: 15, // 字体大小
                 haveTextHSDA: false, // 是否需创建textHSDA对象
                 haveArrowText: true, // 是否需创建arrowText对象
                 haveTrainBorder: false, // 是否需创建trainBorder对象
                 aspectRatio: 8 / 15, // 字体宽高比例（用以拼接text是计算位置）
                 textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 21a84dd77..0cd06989a 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -737,8 +737,6 @@ class SkinCode extends defaultStyle {
                 aspectRatio: 7 / 5, // 字体宽高比例（用以拼接text是计算位置）
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                useSelfFormat: true, // 使用配置项的nameFormat
-                useSelfText: true, // 使用配置项的字体大小
                 displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 171df05c3..e1eab05f6 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -20,11 +20,9 @@ export default class Train extends Group {
         this.z = 40;
         this.section = null;
         this.isShowShape = true;
-        this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
-        // this.fontSize = model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
+        this.fontSize = model.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
-        this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
-        // this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
+        this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
         if (style.Train.trainBody.specialTrainType.length > 0) {
             style.Train.trainBody.specialTrainType.some((item) => {
                 if (model.type === item.type) {
@@ -216,60 +214,6 @@ export default class Train extends Group {
         this.trainR && this.trainR.setArrowShow(false);
     }
 
-    // 设置服务号状态类型
-    setServerNoType(type) {
-        if (this.style.Train.trainStatusStyle.serverNoType.length > 0) {
-            const flag = this.style.Train.trainStatusStyle.serverNoType.some((item) => {
-                if (type === item.type) {
-                    this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
-                    return true;
-                }
-            });
-            if (this.style.Train.trainStatusStyle.defaultServerNoColor && !flag) {
-                this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultServerNoColor);
-            }
-        }
-    }
-
-    // 设置目的地状态
-    setDestinationStatus(status) {
-        if (this.style.Train.trainStatusStyle.destinationStatus.length > 0) {
-            const flag = this.style.Train.trainStatusStyle.destinationStatus.some((item) => {
-                if (status === item.status) {
-                    switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
-                    case 'trainTarget':
-                        this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
-                        break;
-                    case 'trainServer':
-                        this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
-                        break;
-                    case 'trainWindowBorder':
-                        this.trainB && this.trainB.setBodyBoxShape('stroke', item.showColor);
-                        break;
-                    default:
-                        this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
-                    }
-                    return true;
-                }
-            });
-            if (this.style.Train.trainStatusStyle.defaultDestinationColor && !flag) {
-                switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
-                case 'trainTarget':
-                    this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                case 'trainServer':
-                    this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                case 'trainWindowBorder':
-                    this.trainB && this.trainB.setBodyBoxShape('stroke', this.style.Train.trainStatusStyle.defaultDestinationColor);
-                    break;
-                default:
-                    this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
-                }
-            }
-        }
-    }
-
     // 设置运行方向状态类型
     setDirectionType(right, flag) {
         if (this.style.Train.trainStatusStyle.directionType.length > 0) {
@@ -384,18 +328,6 @@ export default class Train extends Group {
             this.trainB && this.trainB.setAShow(false);
         }
     }
-    setTrainTypeStatus(type) {
-        if (this.style.Train.trainStatusStyle.trainTypeStatus) {
-            this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => {
-                if (type === item.type) {
-                    item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor);
-                    item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor);
-                    item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor);
-                    item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor);
-                }
-            });
-        }
-    }
     // 设置状态
     setState(model, object) {
         if (!this.isShowShape) return;
@@ -409,7 +341,6 @@ export default class Train extends Group {
             }
             this.setRunStatus(model.stop, flag);
             this.setCommunicationStatus(model.runLevel);
-            // this.setTrainTypeStatus(model.type); 配合早晚点设置
             this.setDoorStatus(model.doorCloseLock);
             this.setAlarmStatus(model.alarmStatus);
             this.setHoldStatus(model.hold);
@@ -422,19 +353,6 @@ export default class Train extends Group {
                 this.updateSection(object);
             }
         }
-        // let points = [];
-        // if (model) {
-        //     this.recover();
-        //     this.setServerNoType(model.serverNoType); 				// 设置服务号状态类型
-        //     this.setDestinationStatus(model.destinationStatus);		// 设置目的地状态
-        //     this.setRunStatus(model.runStatus, flag); // 设置运行状态
-        //     this.setRunMode(model.runMode); 						// 设置运行模式
-        //     this.setRunControlStatus(model.runControlStatus); 		// 设置运行控制状态类型
-        //     this.setDoorStatus(model.doorStatus); 					// 设置车门状态类型
-        //     this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
-        //     this.setAlarmStatus(model.alarmStatus); 				// 设置报警状态
-        //     this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
-        // }
     }
     setTrainTypeColor(type) {
         this.trainB && this.trainB.setTrainTypeColor(type);
diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/beijing_01/model.js
+++ b/src/jmapNew/theme/beijing_01/model.js
@@ -35,8 +35,6 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true
diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/chengdu_01/model.js
+++ b/src/jmapNew/theme/chengdu_01/model.js
@@ -35,8 +35,6 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true
diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/chengdu_03/model.js
+++ b/src/jmapNew/theme/chengdu_03/model.js
@@ -35,8 +35,6 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true
diff --git a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
index 7a17f6bb6..0037b53cf 100644
--- a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
@@ -27,10 +27,10 @@
         <span class="base-label" style="display:block; padding-left: 20px;">范围</span>
         <el-radio-group :id="selfStationStandId" v-model="model.val1" @change="upAndDownStreamChangeVal1">
           <div style="margin-bottom: 8px;">
-            <el-radio :label="upstream" :disabled="model.right==false">本站台上行跳停</el-radio>
+            <el-radio :label="upstream" :disabled="!isUpDirection">本站台上行跳停</el-radio>
           </div>
           <div style="margin-bottom: 8px;">
-            <el-radio :label="downstream" :disabled="model.right==true">本站台下行跳停</el-radio>
+            <el-radio :label="downstream" :disabled="isUpDirection">本站台下行跳停</el-radio>
           </div>
         </el-radio-group>
         <el-row>
@@ -38,10 +38,10 @@
             <!-- id="stand_upDown_choose"  -->
             <el-radio-group :id="otherStationStandId" v-model="model.val2" @change="upAndDownStreamChange">
               <div style="margin-bottom: 8px;">
-                <el-radio :label="upstream" :disabled="model.right==false">指定列车上行跳停</el-radio>
+                <el-radio :label="upstream" :disabled="!isUpDirection">指定列车上行跳停</el-radio>
               </div>
               <div style="margin-bottom: 8px;">
-                <el-radio :label="downstream" :disabled="model.right==true">指定列车下行跳停</el-radio>
+                <el-radio :label="downstream" :disabled="isUpDirection">指定列车下行跳停</el-radio>
               </div>
             </el-radio-group>
           </el-col>
@@ -130,6 +130,7 @@ export default {
             operation: null,
             trainList: [],
             radio1: '',
+            isUpDirection: true,
             model: {
                 val1: '',
                 val2: '',
@@ -140,7 +141,8 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'map'
+            'map',
+            'mapConfig'
         ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -225,8 +227,9 @@ export default {
                     }
                 }
                 this.radio1 = operate.operation;
+                this.isUpDirection = (this.mapConfig.upDirection === 'right' && selected.right) || (this.mapConfig.upDirection === 'left' && !selected.right);
                 this.model.right = selected.right;
-                this.model.val1 = selected.right ? '02' : '01'; // 站台的上下行方向, 01:下行 /02:上行
+                this.model.val1 = this.isUpDirection ? '02' : '01'; // 站台的上下行方向, 01:下行 /02:上行
                 this.model.val2 = '';
                 this.model.tripNumber = '';
 
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
index 3a3d9aca2..208b68b45 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
@@ -91,7 +91,7 @@ export default {
             loading: false,
             operate: null,
             operation: '',
-            planMode: 5,
+            planMode: 2,
             headMode: 5,
             fontSize: 19
         };
diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js
index 4920490ff..bd6829d9f 100644
--- a/src/jmapNew/theme/foshan_01/model.js
+++ b/src/jmapNew/theme/foshan_01/model.js
@@ -35,8 +35,8 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
+            nameFormat: 'serviceNumber:groupNumber',	// 字体格式
+            nameFontSize: 19					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue
deleted file mode 100644
index e2dfae0c0..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm two-confirmation"
-    :title="$t('menu.menuChildDialog.secondaryConfirmation')"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :show-close="false"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <template v-for="(message,index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="3">
-        <el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.close') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'TwoConfirmation',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: '',
-            timer: null,
-            domIdConfirm: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        },
-        messages() {
-            if (this.operate) {
-                return this.operate.messages;
-            }
-            return [];
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.domIdConfirm = '';
-            if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
-            } else if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
-            }
-
-            this.operate = operate || {};
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.confirm.operation
-            };
-
-            this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            if (this.operate) {
-                this.loading = true;
-                (this.operate.selection || []).forEach(elem => {
-                    const operate = {
-                        val: elem.code,
-                        param: {
-                            ControlMode_Code: elem.code
-                        }
-                    };
-
-                    if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                        operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
-                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL;
-                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                        operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
-                    } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
-                        operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
-                        operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
-                    }
-
-                    this.doClose();
-                    this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                    this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-                        if (valid) {
-                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        }
-                    }).catch(() => {
-                        this.$refs.noticeInfo.doShow(operate);
-                    });
-                });
-                this.loading = false;
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue
deleted file mode 100644
index 4384bb801..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm user-add"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
-        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
-          <el-input v-model="model.jobNumber" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
-          <el-input v-model="model.userName" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
-          <el-input v-model="model.confirm" type="password" />
-        </el-form-item>
-
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'UserAdd',
-    components: {
-    },
-    data() {
-        return {
-            operate: {},
-            operation: null,
-            dialogShow: false,
-            loading: false,
-            model: {
-                type: 'ADD',
-                jobNumber: '',
-                userName: '',
-                password: '',
-                confirm: ''
-            },
-            rules: {
-                jobNumber: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
-                ],
-                userName: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
-                ],
-                password: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputPassword'), trigger: 'change' }
-                ],
-                confirm: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputPasswordAgain'), trigger: 'change' }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuChildDialog.addUser');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.$nextTick(() => {
-                    this.$refs.form.resetFields();
-                });
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            if (this.model.password === this.model.confirm) {
-                                this.doClose();
-                                this.$emit('operateUser', this.model);
-                            } else {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordInconsistent'));
-                            }
-                        }
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); this.model; });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue
deleted file mode 100644
index 7b6e8afa7..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm user-delete"
-    :title="title"
-    :visible.sync="show"
-    width="260px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding-left: 10px; padding-bottom: 10px">
-      <i class="el-icon-info" />
-      <template v-for="(message,index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="3">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="2">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'UserDelete',
-    components: {
-    },
-    data() {
-        return {
-            operate: {},
-            messages: [],
-            model: {
-                type: 'DELETE',
-                jobNumber: '',
-                userName: ''
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuChildDialog.deleteUser');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.messages = operate.messages;
-                this.model.userName = '';
-                this.model.jobNumber = '';
-                if (selected) {
-                    this.model.userName = selected.userName;
-                    this.model.jobNumber = selected.jobNumber;
-                }
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            if (this.model.userName && this.model.jobNumber) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.confirm.operation
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                        this.$emit('operateUser', this.model);
-                    }
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuChildDialog.selectTips'));
-            }
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue
deleted file mode 100644
index 259982272..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm user-edit"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
-        <el-form-item :label="$t('menu.menuChildDialog.jobNumber')" prop="jobNumber">
-          <el-input v-model="model.jobNumber" disabled />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.userName')" prop="userName">
-          <el-input v-model="model.userName" disabled />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.originalPassword')" prop="oldPassword">
-          <el-input v-model="model.oldPassword" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.password')" prop="password">
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-        <el-form-item :label="$t('menu.menuChildDialog.confirmPassword')" prop="confirm">
-          <el-input v-model="model.confirm" type="password" />
-        </el-form-item>
-
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuChildDialog.determine') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuChildDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'UserEdit',
-    components: {
-    },
-    data() {
-        return {
-            operate: {},
-            selected: {},
-            operation: null,
-            dialogShow: false,
-            loading: false,
-            model: {
-                type: 'EDIT',
-                jobNumber: '',
-                userName: '',
-                oldPassword: '',
-                password: '',
-                confirm: ''
-            },
-            rules: {
-                jobNumber: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputJobNumber'), trigger: 'blur' }
-                ],
-                userName: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputUserName'), trigger: 'blur' }
-                ],
-                oldPassword: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputOriginal'), trigger: 'change' }
-                ],
-                password: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputNewPassword'), trigger: 'change' }
-                ],
-                confirm: [
-                    { required: true, message: this.$t('menu.menuChildDialog.inputNewAgain'), trigger: 'change' }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuChildDialog.userEditPage');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.$nextTick(() => {
-                    this.$refs.form.resetFields();
-                    this.selected = selected;
-                    if (selected) {
-                        this.model.jobNumber = selected.jobNumber;
-                        this.model.userName = selected.userName;
-                    }
-                });
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            if (this.selected.password !== this.model.oldPassword) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.originalPasswordError'));
-                            } else if (this.model.password !== this.model.confirm) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordError'));
-                            } else if (this.model.oldPassword === this.model.password) {
-                                this.$messageBox(this.$t('menu.menuChildDialog.passwordSame'));
-                            } else {
-                                this.doClose();
-                                this.$emit('operateUser', this.model);
-                            }
-                        }
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue
deleted file mode 100644
index f2cfc9478..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm manage-user"
-    :title="title"
-    :visible.sync="show"
-    width="600px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="height: 70px;">
-      <div style="position: relative; left: 10px;" />
-      <div style="position: relative; left: 80px;">
-        <div style="width:100%">
-          <span style="padding-left: 60px">{{ $t('menu.menuDialog.versionName') }}</span>
-          <el-button
-            :id="domIdConfirm"
-            style="position: absolute; right: 95px;"
-            type="primary"
-            :loading="loading"
-            @click="commit"
-          >{{ $t('menu.menuDialog.confirm') }}</el-button>
-        </div>
-        <div style="width:100%; padding-top: 20px">
-          <span> {{ $t('menu.menuDialog.copyright') }}</span>
-        </div>
-      </div>
-    </div>
-    <div style="padding: 10px;  margin: 5px; ">
-      <el-table :data="tableData" style="width: 100%;" height="400">
-        <el-table-column prop="moduleName" :label="$t('menu.menuDialog.moduleName')" width="180" />
-        <el-table-column prop="version" :label="$t('menu.menuDialog.version')" width="180" />
-        <el-table-column prop="updateDate" :label="$t('menu.menuDialog.modifyDate')" />
-      </el-table>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'ManageUser',
-    data() {
-        return {
-            tableData: [
-                {
-                    moduleName: this.$t('menu.menuDialog.mainProgramVersion'),
-                    version: '123',
-                    updateDate: '123'
-                }
-            ],
-            operate: {},
-            operation: null,
-            dialogShow: false,
-            loading: false,
-            selected: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuDialog.about');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue
deleted file mode 100644
index d744e5b8d..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm manage-user"
-    :title="title"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-      <span class="base-label">{{ $t('menu.menuDialog.userList') }}</span>
-      <el-row>
-        <el-col :span="18">
-          <el-table
-            ref="multipleTable"
-            :data="tableData"
-            border
-            row-key="code"
-            style="width: 100%"
-            height="450"
-            center
-            size="mini"
-            highlight-current-row
-            @row-click="chooseUser"
-          >
-            <el-table-column prop="jobNumber" :label="$t('menu.menuDialog.jobNumber')" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.jobNumber }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="userName" :label="$t('menu.menuDialog.userName')">
-              <template slot-scope="scope">
-                <span>{{ scope.row.userName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column width="20" />
-          </el-table>
-        </el-col>
-        <el-col :span="4">
-          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">{{ $t('menu.menuDialog.refresh') }}
-          </el-button>
-          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">{{ $t('menu.menuDialog.add') }}
-          </el-button>
-          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">{{ $t('menu.menuDialog.modify') }}
-          </el-button>
-          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">{{ $t('menu.menuDialog.delete') }}
-          </el-button>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="8" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <user-add ref="userAdd" @operateUser="operateUser" />
-    <user-edit ref="userEdit" @operateUser="operateUser" />
-    <user-delete ref="userDelete" @operateUser="operateUser" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import UserAdd from './childDialog/userAdd';
-import UserEdit from './childDialog/userEdit';
-import UserDelete from './childDialog/userDelete';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'ManageUser',
-    components: {
-        UserAdd,
-        UserEdit,
-        UserDelete
-    },
-    data() {
-        return {
-            tableData: [],
-            operate: {},
-            operation: null,
-            dialogShow: false,
-            loading: false,
-            selected: null
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdAddUser() {
-            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-        },
-        domIdEditUser() {
-            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-        },
-        domIdDelUser() {
-            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-        },
-        domIdFreshUser() {
-            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-        },
-        domIdChooseUser() {
-            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuDialog.userManage');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        // 添加用户
-        addUser() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.addUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.$refs.userAdd.doShow(operate);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 编辑用户
-        editUser() {
-            if (this.selected) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.editUser.operation
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.$refs.userEdit.doShow(operate, this.selected);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
-            }
-        },
-        // 删除用户
-        delUser() {
-            if (this.selected) {
-                const operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.delUser.operation,
-                    messages: [`${this.$t('menu.menuDialog.deleteMessageOne')} ${this.selected.userName} ${this.$t('menu.menuDialog.deleteMessageTwo')}`]
-                };
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.$refs.userDelete.doShow(operate, this.selected);
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                });
-            } else {
-                this.$messageBox(this.$t('menu.menuDialog.selectUser'));
-            }
-        },
-        // 刷新用户
-        freshUser() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.freshUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        // 选择用户
-        chooseUser(row) {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.manage.chooseUser.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                this.selected = row;
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        },
-        // 增删改函数处理
-        operateUser(data) {
-            if (data && data.type === 'ADD') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index < 0) {
-                    this.tableData.push({
-                        jobNumber: data.jobNumber,
-                        userName: data.userName,
-                        password: data.password
-                    });
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.addFail'));
-                }
-            } else if (data && data.type === 'EDIT') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index >= 0) {
-                    this.tableData[index].password = data.password;
-                    this.tableData[index].userName = data.userName;
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.modifyFail'));
-                }
-            } else if (data && data.type === 'DELETE') {
-                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
-                if (index >= 0) {
-                    this.tableData.splice(index, 1);
-                    this.selected = null;
-                } else {
-                    this.$messageBox(this.$t('menu.menuDialog.deleteFail'));
-                }
-            }
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue
deleted file mode 100644
index 5ab07f4b4..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm password-box"
-    :title="$t('menu.menuDialog.passwordBox')"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="context" style="overflow:hidden">
-      <el-form label-width="80px" size="mini">
-        <el-form-item prop="username">
-          <span slot="label">{{ $t('menu.menuDialog.userNameLabel') }}</span>
-          <el-input v-model="model.username" disabled />
-        </el-form-item>
-        <el-form-item prop="password">
-          <span slot="label">{{ $t('menu.menuDialog.password') }}</span>
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-      </el-form>
-      <div class="operate">
-        <el-button-group v-model="key" class="left" size="mini">
-          <el-button size="mini" @click="click(1)">1</el-button>
-          <el-button size="mini" @click="click(2)">2</el-button>
-          <el-button size="mini" @click="click(3)">3</el-button>
-          <el-button size="mini" @click="click(4)">4</el-button>
-          <el-button size="mini" @click="click(5)">5</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="right" size="mini">
-          <el-button @click="esc">{{ $t('menu.menuDialog.back') }}</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="left" size="mini">
-          <el-button size="mini" @click="click(6)">6</el-button>
-          <el-button size="mini" @click="click(7)">7</el-button>
-          <el-button size="mini" @click="click(8)">8</el-button>
-          <el-button size="mini" @click="click(9)">9</el-button>
-          <el-button size="mini" @click="click(0)">0</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="right" size="mini">
-          <el-button @click="clr">{{ $t('menu.menuDialog.clear') }}</el-button>
-        </el-button-group>
-      </div>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'PasswordBox',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: null,
-            model: {
-                username: '',
-                password: ''
-            },
-            key: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    /** 强制站控*/
-                    return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
-                }
-            }
-            return '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        loadInitData(operate) {
-            this.model.username = '';
-            this.model.password = '';
-            this.operate = operate || {};
-            this.operation = operate.operation;
-            this.model.username = this.$store.state.user.nickname;
-        },
-        doShow(operate) {
-            /** 如果不是断点激活，而是第一次显示需要初始化数据*/
-            if (!this.dialogShow) {
-                this.loadInitData(operate);
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.password.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-            };
-
-            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                /** 强制站控*/
-                operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation;
-            }
-
-            if (this.model.password == '123456') {
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-
-                    if (valid) {
-                        this.$emit('setLoginResult', {
-                            operation: operate.operation,
-                            success: valid
-                        });
-                        this.doClose();
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.$emit('setLoginResult', {
-                        operation: operate.operation,
-                        success: false
-                    });
-                });
-            } else {
-                this.$refs.noticeInfo.doShow(operate, [this.$t('menu.menuDialog.IncorrectPassword')]);
-
-            }
-        },
-        click(key) {
-            if (!this.model.password) {
-                this.model.password = '';
-            }
-            this.model.password += key;
-        },
-        esc() {
-            if (this.model.password) {
-                this.model.password = this.model.password.substring(0, this.model.password.length - 1);
-            }
-        },
-        clr() {
-            this.model.password = '';
-        }
-
-    }
-};
-
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .password-box .el-form {
-        margin-top: 10px !important;
-        margin-right: 20px !important;
-    }
-
-    .password-box .el-form-item {
-        margin-bottom: 5px !important;
-    }
-
-    .password-box .context {
-        height: 170px !important;
-    }
-
-    .password-box .operate {
-        margin-top: 10px !important;
-        padding-bottom: 10px !important;
-    }
-
-    .password-box .left {
-        margin-left: 10px !important;
-    }
-
-    .password-box .left .el-button {
-        color: #000;
-        background: #F0F0F0;
-        text-align: center;
-        width: 30px !important;
-    }
-
-    .password-box .right {
-        color: #000;
-        margin-left: 10px !important;
-        background: #F0F0F0;
-        width: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue
deleted file mode 100644
index 5016c6205..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm station-control-convert"
-    :title="$t('menu.menuDialog.controlModeConversion')"
-    :visible.sync="show"
-    width="700px"
-    :before-close="doClose"
-    :show-close="true"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      row-key="code"
-      style="width: 100%"
-      height="250"
-      center
-      size="mini"
-      highlight-current-row
-    >
-      <el-table-column :id="domIdChoose" prop="check" :label="$t('menu.menuDialog.select')" width="60" style="margin-left:30px">
-        <template slot-scope="scope">
-          <el-checkbox ref="check" v-model="scope.row.check" :disabled="scope.row.disabled" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="operate" :label="$t('menu.menuDialog.operatingArea')" width="140">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.operate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="control" :label="$t('menu.menuDialog.controlMode')" width="80">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.control }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" :label="$t('menu.menuDialog.centerStationCommunicationStatus')" width="140">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.status }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="result" :label="$t('menu.menuDialog.transferExecutionStatus')">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.result }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="3" class="control_button">
-        <el-button v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">{{ $t('menu.menuDialog.forcedStationControl') }}</el-button>
-        <el-button v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">{{ $t('menu.menuDialog.requestStationControl') }}
-        </el-button>
-        <el-button v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">{{ $t('menu.menuDialog.requestInTheControl') }}
-        </el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" :disabled="disabledClose" @click="cancel">{{ $t('menu.menuDialog.close') }}
-        </el-button>
-      </el-col>
-    </el-row>
-    <two-confirmation ref="twoConfirmation" @setOperate="getOperate" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import TwoConfirmation from './childDialog/twoConfirmation';
-
-export default {
-    name: 'StationControlConvert',
-    components: {
-        TwoConfirmation
-    },
-    data() {
-        return {
-            operate: null,
-            dialogShow: false,
-            disabledSend: false,
-            disabledSure: false,
-            disabledClose: false,
-            operation: '',
-            controlProps: {
-                '01': this.$t('menu.menuDialog.inTheControl'),
-                '02': this.$t('menu.menuDialog.stationControl')
-            },
-            selection: [],
-            tableData: [],
-            timer: null,
-            count: 0,
-            flagListBit: [],
-            backOperate: '',
-            timeout: 61,
-            counts: 0
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList',
-            'stationControlList'
-        ]),
-        ...mapGetters('training', [
-            'mode',
-            'started'
-        ]),
-        disabledCommit() {
-            return this.disabledSend || this.disabledSure;
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        isFork() {
-            if (this.dialogShow) {
-                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
-            }
-            return false;
-        },
-        isRequest() {
-            if (this.dialogShow) {
-                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
-            }
-            return false;
-        },
-        isConter() {
-            if (this.dialogShow) {
-                return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
-            }
-            return false;
-        },
-        domIdChoose() {
-            if (this.dialogShow) {
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    return OperationEvent.StationControl.forcedStationControl.choose.domId;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    return OperationEvent.StationControl.requestStationControl.choose.domId;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    return OperationEvent.StationControl.requestCentralControl.choose.domId;
-                }
-            }
-            return false;
-        },
-        domIdConter() {
-            return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
-        },
-        domIdFork() {
-            return this.dialogShow ? OperationEvent.StationControl.forcedStationControl.menu.domId : '';
-        },
-        domIdRequest() {
-            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.menu.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        }
-    },
-    watch: {
-        '$store.state.socket.msgHead': function (elem) {
-            if (elem) {
-                this.flagListBit[this.selection.forEach(elem => { return elem.stationControlCode == elem.code; })] = false;
-                if (elem.hasOwnProperty('timeout')) {
-                    this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.acceptConversionResponseTimeout') }, false);
-                } else if (elem.hasOwnProperty('agree')) {
-                    if (elem.agree) {
-                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransfersuccees') }, true);
-                    } else {
-                        this.updateTableValue(elem.stationControlCode, { result: this.$t('menu.menuDialog.controlModeTransferFailed') }, false);
-                    }
-                }
-                this.disabledClose = false;
-                this.disabledSure = false;
-            }
-        },
-        backOperate: function (operate) {
-            if (this.dialogShow && operate) {
-                if (operate.selection && operate.selection.length) {
-                    operate.selection.forEach(elem => {
-                        if (operate.commit) {
-                            this.updateTableValue(elem.code, { result: `${this.$t('menu.menuDialog.senedMessageOne')}${this.timeout} ${this.$t('menu.menuDialog.senedMessageTwo')}` }, false);
-                        } else if (operate.cancel) {
-                            this.updateTableValue(elem.code, { result: '' }, false);
-                        }
-                    });
-                }
-            }
-        },
-        // 深度数据状态
-        tableData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.loadTableData();
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        updateTableValue(code, result, success) {
-            this.tableData.forEach((row, index) => {
-                if (row.code == code) {
-                    for (const prop in result) {
-                        row[prop] = result[prop];
-                    }
-                    if (success) {
-                        if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                            row.control = this.controlProps['02']; // 01:中控， 02:站控
-                        } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                            row.control = this.controlProps['01']; // 01:中控， 02:站控
-                        }
-                        row.disabled = true;
-                        row.check = false;
-                    }
-                }
-            });
-        },
-        checkTableDataSelction(data) {
-            const selection = [];
-            if (data && data.length > 0) {
-                data.forEach(row => {
-                    if (row.check && !row.disabled) {
-                        selection.push(row);
-                    }
-                });
-            }
-
-            this.disabledSend = !selection.length;
-            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
-                this.handleChooseChange(selection);
-                this.selection = selection;
-            }
-        },
-        checkBoxDisabled(row) {
-            const control = (this.$store.getters['map/getDeviceByCode'](row.code) || {});
-            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                if (control && control.status == '02') { // 01:中控， 02:站控
-                    return true;
-                }
-            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                if (control && control.status == '01') { // 01:中控， 02:站控
-                    return true;
-                }
-            }
-
-        },
-        loadTableData() {
-            this.tableData = [];
-            this.stationControlList && this.stationControlList.forEach(control => {
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                this.tableData.push({
-                    code: control.code,
-                    operate: station.name || '',
-                    control: '',
-                    check: false,
-                    disabled: false,
-                    status: this.$t('menu.menuDialog.normal'),
-                    result: ''
-                });
-            });
-        },
-        initTableDataStatus() {
-            this.tableData.forEach(row => {
-                row.disabled = this.checkBoxDisabled(row);
-                row.check = false;
-                row.result = '';
-                const control = this.$store.getters['map/getDeviceByCode'](row.code);
-                if (control) {
-                    row.control = this.controlProps[control.status];
-                }
-            });
-        },
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.disabledSure = false;
-                this.initTableDataStatus();
-            }
-            this.dialogShow = true;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        doClose() {
-            if (this.dialogShow) {
-                this.$store.dispatch('socket/shiftMsgQueue');
-            }
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$refs.multipleTable.setCurrentRow();
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        setTimer() {
-            this.clearTimer();
-            this.flagListBit = new Array(this.selection.length).fill(true);
-            this.timer = setInterval(() => {
-                (this.selection || []).forEach((elem, index) => {
-                    if (this.flagListBit[index]) {
-                        elem['count'] = (elem['count'] || 0) + 1;
-                        elem['count'] > this.timeout && (
-                            this.flagListBit[index] = false,
-                            this.setRequestTimeout(elem)
-                        );
-                    }
-                });
-
-                this.flagListBit.findIndex(elem => { return elem; }) < 0 && this.clearTimer();
-            }, 1000);
-        },
-        clearTimer() {
-            this.count = 0;
-            if (this.timer) {
-                clearInterval(this.timer);
-                this.timer = null;
-            }
-        },
-        setRequestTimeout(elem) {
-            elem['count'] = 0;
-            this.$store.dispatch('socket/pushMsgQueue',
-                { type: 'resp', timeout: 'true', stationControlCode: elem.code }
-            );
-        },
-        handleChooseChange(selection) {
-            this.selection = selection;
-            const stationCodeList = selection.map(elem => { return elem.code; });
-            if (selection && selection.length) {
-                const operate = {
-                    operation: '',
-                    val: stationCodeList.join('::'),
-                    selection: selection
-                };
-
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
-                }
-
-                this.disabledSure = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.disabledSure = false;
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            } else if (!selection) {
-                this.$messageBox(this.$t('menu.menuDialog.selectData'));
-            }
-        },
-        requestCommit() {
-            const stationCodeList = this.selection.map(elem => { return elem.code; });
-            const operate = {
-                messages: [this.$t('menu.menuDialog.confirmStationControlTip')],
-                operation: OperationEvent.StationControl.requestStationControl.menu.operation,
-                val: stationCodeList.join('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-            });
-        },
-        forkCommit() {
-            const stationCodeList = this.selection.map(elem => { return elem.code; });
-            const operate = {
-                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
-                operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
-                val: stationCodeList.join('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-            });
-        },
-        conterCommit() {
-            const stationCodeList = this.selection.map(elem => { return elem.code; });
-            const operate = {
-                messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
-                operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
-                val: stationCodeList.join('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`${this.$t('menu.menuDialog.operatingArea')} ${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-            });
-        },
-        getOperate(operate) {
-            this.backOperate = operate;
-            if (operate.cancel) {
-                this.disabledSure = this.disabledSend = false;
-            }
-            if (operate.commit || operate.timeout) {
-                this.disabledSend = this.disabledSure = true;
-            }
-            this.setTimer();
-            this.disabledClose = true;
-            this.counts = 1;
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .haerbin-01__systerm .el-dialog .control_button button{
-        max-width:180px;
-        width:auto ;
-        padding-left: 5px ;
-        padding-right: 5px ;
-        min-width: 80px;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue
deleted file mode 100644
index 435b2d971..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-        <span class="base-label">{{ $t('menu.menuDialog.addLocation') }}</span>
-        <div style="position: relative; top:-10px;">
-          <el-form-item prop="stationStandCode">
-            <span slot="label">{{ $t('menu.menuDialog.terminalOne') }}</span>
-            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
-              <el-option
-                v-for="item in stationStandList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="trainNumberLimber">
-            <span id="frontTrainNumber" slot="label">{{ $t('menu.menuDialog.frontTrainNumber') }}</span>
-            <el-input v-model="addModel.trainNumberLimber" />
-          </el-form-item>
-        </div>
-      </div>
-      <el-form-item id="groupNumber" :label="$t('menu.menuDialog.addTrainNumber')" label-width="115px" prop="groupNumber">
-        <el-input v-model="addModel.groupNumber" />
-      </el-form-item>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'TrainAdd',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                groupNumber: '',
-                stationStandCode: '',
-                trainNumberLimber: ''
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
-                ],
-                // trainNumberLimber: [
-                //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
-                // ],
-                stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
-                ]
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuDialog.addPlanTrain');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.operation = operate.operation;
-
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        
-                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    #frontTrainNumber,#groupNumber label{
-        line-height: 100%;
-        display: inline-block;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue
deleted file mode 100644
index 0ab971d50..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <el-form-item prop="stationStandCode">
-        <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
-        <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
-          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="groupNumber">
-        <el-input v-model="addModel.groupNumber" />
-      </el-form-item>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'TrainAdd',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                groupNumber: '',
-                stationStandCode: ''
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
-                ],
-                stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
-                ]
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuDialog.deletePlanTrain');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.operation = operate.operation;
-
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        
-                        operation: OperationEvent.Command.planTrain.delPlanTrain.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue
deleted file mode 100644
index 64b298f42..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <el-form-item :label="$t('menu.menuDialog.trainNumber')" label-width="115px" prop="groupNumber">
-        <el-input v-model="addModel.groupNumber" />
-      </el-form-item>
-      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-        <span class="base-label">{{ $t('menu.menuDialog.purpose') }}</span>
-        <div style="position: relative; top:-10px;">
-          <el-form-item prop="stationStandCode">
-            <span slot="label">{{ $t('menu.menuDialog.terminalTwo') }}</span>
-            <el-select v-model="addModel.stationStandCode" filterable :placeholder="$t('menu.menuDialog.pleaseSelect')">
-              <el-option
-                v-for="item in stationStandList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('menu.menuDialog.trainNumber')" prop="trainNumberLimber">
-            <el-input v-model="addModel.trainNumberLimber" />
-          </el-form-item>
-        </div>
-      </div>
-    </el-form>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'TrainTranstalet',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                groupNumber: '',
-                stationStandCode: '',
-                trainNumberLimber: ''
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputTrainNumber'), trigger: 'blur' }
-                ],
-                trainNumberLimber: [
-                    { required: true, message: this.$t('menu.menuDialog.inputFrontNumber'), trigger: 'blur' }
-                ],
-                stationStandCode: [
-                    { required: true, message: this.$t('menu.menuDialog.selectTerminal'), trigger: 'change' }
-                ]
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
-        },
-        title() {
-            return this.$t('menu.menuDialog.panPlanCar');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.operation = operate.operation;
-
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        
-                        operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue
deleted file mode 100644
index 35fef3db0..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm view-display"
-    :title="$t('menu.menuDialog.deviceDisplaySettings')"
-    :visible.sync="show"
-    width="340px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-checkbox-group v-model="deviceLevels">
-      <div>
-        <el-checkbox :label="1">{{ $t('menu.menuDialog.trainWindow') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="2">{{ $t('menu.menuDialog.sectionBoundary') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="3">{{ $t('menu.menuDialog.linkageAutoRouteShow') }}</el-checkbox>
-      </div>
-      <div>
-        <el-checkbox :label="4">{{ $t('menu.menuDialog.atsAutoTriggerShow') }}</el-checkbox>
-      </div>
-    </el-checkbox-group>
-    <el-row class="button-group">
-      <el-col :span="8" :offset="2">
-        <el-button :id="domIdConfirm" class="commit" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}
-        </el-button>
-      </el-col>
-      <el-col :span="8" :offset="3">
-        <el-button :id="domIdCancel" class="cancal" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewDevice',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: '',
-            deviceLevels: [2, 3, 4, 5]
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        }
-
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.setDeviceDisplay();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 如果不是断点激活，而是第一次显示，需要初始化数据
-            if (!this.dialogShow) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: this.deviceLevels.sort().join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.setDeviceDisplay();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setDeviceDisplay() {
-            const deviceList = [];
-
-            // 区段边界设置
-            const borderBorderShow = this.deviceLevels.indexOf(2) !== -1;
-            const sectionList = this.$store.getters['map/sectionList'];
-            if (sectionList && sectionList.length > 0) {
-                sectionList.forEach(elem => {
-                    // 区段边界
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {borderBorderShow }));
-                });
-            }
-
-            // 车次窗设置
-            const trainWindowShow = this.deviceLevels.indexOf(1) !== -1;
-            const trainWindowList = this.$store.getters['map/trainWindowList'];
-            if (trainWindowList && trainWindowList.length > 0) {
-                trainWindowList.forEach(elem => {
-                    // 车次窗
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {trainWindowShow }));
-                });
-            }
-
-            // 联锁自动进路表示灯和ATS自动触发表示灯设置
-            const linkageAutoRouteShow = this.deviceLevels.indexOf(3) !== -1; // 联锁自动进路表示灯
-            const atsAutoTriggerShow = this.deviceLevels.indexOf(4) !== -1; // ATS自动触发表示灯
-            const signalList = this.$store.getters['map/signalList'];
-            if (signalList && signalList.length > 0) {
-                signalList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { linkageAutoRouteShow, atsAutoTriggerShow }));
-                });
-            }
-
-            this.$store.dispatch('map/updateMapDevices', deviceList);
-        }
-    }
-};
-
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue
deleted file mode 100644
index 6e14fb262..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm view-name"
-    :title="$t('menu.menuDialog.nameDisplaySetting')"
-    :visible.sync="show"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-checkbox-group v-model="nameLevels">
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="1">{{ $t('menu.menuDialog.signalName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="2">{{ $t('menu.menuDialog.standTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="3" disabled>{{ $t('menu.menuDialog.buttonName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="4">{{ $t('menu.menuDialog.reentryTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="5">{{ $t('menu.menuDialog.trackName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="6">{{ $t('menu.menuDialog.transferTrackName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="7">{{ $t('menu.menuDialog.turnoutName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="8">{{ $t('menu.menuDialog.indicatorName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="9">{{ $t('menu.menuDialog.turnoutSectionName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="10">{{ $t('menu.menuDialog.destinationName') }}</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="11">{{ $t('menu.menuDialog.axisSectionName') }}</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="12">{{ $t('menu.menuDialog.kmPost') }}</el-checkbox>
-        </el-col>
-      </el-row>
-    </el-checkbox-group>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="4" :offset="8">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import deviceType from '@/jmap/constant/deviceType';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewName',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            nameLevels: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12]
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.setNameDisplay();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 如果不是断点激活显示，而是第一次显示时，需要初始化参数
-            if (!this.dialogShow) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: this.nameLevels.sort().join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.setNameDisplay();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setNameDisplay() {
-            const deviceList = [];
-
-            // 信号机
-            let nameShow = this.nameLevels.indexOf(1) !== -1;
-            const signalList = this.$store.getters['map/signalList'];
-            if (signalList && signalList.length > 0) {
-                signalList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow }));
-                });
-            }
-
-            // 道岔
-            nameShow = this.nameLevels.indexOf(7) !== -1;				// 道岔名称
-            const switchSectionNameShow = this.nameLevels.indexOf(9) !== -1;	// 道岔轨名称
-            const switchList = this.$store.getters['map/switchList'];
-            if (switchList && switchList.length > 0) {
-                switchList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameShow, switchSectionNameShow }));
-                });
-            }
-
-            // 控制模式
-            const indicatorShow = this.nameLevels.indexOf(8) !== -1;
-            const control = this.$store.getters['map/stationControlList'];
-            if (control && control.length > 0) {
-                control.forEach(elem => {
-                    // 标识灯名称
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { indicatorShow }));
-                });
-            }
-
-            // 区段
-            nameShow = false;
-            let standTrackNameShow = false;
-            let reentryTrackNameShow = false;
-            let transferTrackNameShow = false;
-            const sectionList = this.$store.getters['map/sectionList'];
-            if (sectionList && sectionList.length > 0) {
-                sectionList.forEach(elem => {
-                    elem._type = deviceType.Section;
-                    if (elem.isSwitchSection && elem.parentCode) {
-                        // 道岔轨的区段名称默认不显示
-                        nameShow = false;
-                    } else {
-                        if (elem.type === '01') {
-                            // 计轴区段名称
-                            nameShow = this.nameLevels.indexOf(11) !== -1;
-                        } else if (elem.type === '02') {
-                            // 轨道轨名称
-                            nameShow = this.nameLevels.indexOf(5) !== -1;
-                        } else if (elem.type === '03') {
-                            // 道岔区段名称
-                            nameShow = this.nameLevels.indexOf(9) !== -1;
-                        }
-                    }
-
-                    // 站台轨名称
-                    if (elem.isStandTrack) {
-                        standTrackNameShow = this.nameLevels.indexOf(2) !== -1;
-                    }
-
-                    // 折返轨名称
-                    if (elem.isReentryTrack) {
-                        reentryTrackNameShow = this.nameLevels.indexOf(4) !== -1;
-                    }
-
-                    // 转换轨名称
-                    if (elem.isTransferTrack) {
-                        transferTrackNameShow = this.nameLevels.indexOf(6) !== -1;
-                    }
-
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow }));
-                });
-            }
-
-            // 车站
-            const kmPostShow = this.nameLevels.indexOf(12) !== -1;
-            const stationList = this.$store.getters['map/stationList'];
-            if (stationList && stationList.length > 0) {
-                stationList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { kmPostShow })); // 公里标
-                });
-            }
-
-            this.$store.dispatch('map/updateMapDevices', deviceList);
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue
deleted file mode 100644
index 91f027b71..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="haerbin-01__systerm view-train-id"
-    :title="$t('menu.menuDialog.trainIDDisplaySetting')"
-    :visible.sync="show"
-    width="420px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="padding: 10px 20px; border: 1px double lightgray;">
-      <span class="base-label">{{ $t('menu.menuDialog.plantrainDisplayMode') }}</span>
-      <el-radio-group v-model="planMode">
-        <el-row>
-          <el-col :span="10">
-            <el-radio :label="1">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="2">{{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-        <el-row class="elrow">
-          <el-col :span="10">
-            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-        <el-row class="elrow">
-          <el-col :span="10">
-            <el-radio :label="5">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-radio :label="6">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
-      <span class="base-label">{{ $t('menu.menuDialog.headCodeStationDisplayMode') }}</span>
-      <el-radio-group v-model="headMode">
-        <el-row>
-          <el-col :span="10">
-            <el-radio :label="3">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}</el-radio>
-          </el-col>
-          <el-col :span="6" :offset="4">
-            <el-radio :label="4">{{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}</el-radio>
-          </el-col>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <div style="padding: 10px 20px; border: 1px double lightgray;">
-      <span class="base-label">{{ $t('menu.menuDialog.fontSize') }}</span>
-      <el-row>
-        <el-col :span="10">
-          <el-input v-model="fontSize" size="small" min="16" max="99" />
-        </el-col>
-        <el-col :span="10" :offset="1">
-          <span style="height:32px; line-height:32px;">{{ $t('menu.menuDialog.range') }}</span>
-        </el-col>
-      </el-row>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.menuDialog.confirm') }}</el-button>
-      </el-col>
-      <el-col :span="4" :offset="8">
-        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.menuDialog.cancel') }}</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import deviceType from '@/jmap/constant/deviceType';
-import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewTrainId',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: '',
-            planMode: 5,
-            headMode: 5,
-            fontSize: 16
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.setTrainDispaly();
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.operation = operate.operation;
-
-            // 非断电激活时设置初始值
-            if (!this.dialogShow) {
-                this.loading = false;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: [this.planMode, this.headMode, this.fontSize].join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.setTrainDispaly();
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setTrainDispaly() {
-            const updatlist = [];
-            const trainList = this.$store.getters['training/viewTrainList']();
-            if (trainList && trainList.length > 0) {
-                const nameFormat = this.trainNameFormatBy(this.planMode);
-                const nameFontSize = this.fontSize;
-                trainList.forEach(elem => {
-                    updatlist.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), {nameFormat, nameFontSize }));
-                });
-
-                this.$store.dispatch('map/updateMapDevices', updatlist);
-            }
-        },
-        trainNameFormatBy(mode) {
-            switch (mode.toString()) {
-            case '1': return 'serviceNumber:tripNumber'; // 表号+车次号
-            case '2': return 'serviceNumber:groupNumber'; // 表号+车组号
-            case '3': return 'targetCode:tripNumber'; // 目的地号+车次号
-            case '4': return 'targetCode:groupNumber'; // 目的地号+车组号
-            case '5': return 'targetCode:serviceNumber:tripNumber'; // 目的地号+表号+车次号
-            case '6': return 'targetCode:serviceNumber:groupNumber'; // 目的地号+表号+车组号
-            }
-
-            return ''; // 无格式类型
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-        .el-dialog .el-radio__label{
-			width: 150px ;
-			white-space: pre-wrap ;
-			display: inline-block ;
-		}
-		.el-radio__input{
-			vertical-align: top;
-		}
-    }
-	.elrow{
-		margin-top:4px;
-	}
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -35,8 +35,6 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true
diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js
index 60299dbbe..89c5550cf 100644
--- a/src/jmapNew/theme/ningbo_01/model.js
+++ b/src/jmapNew/theme/ningbo_01/model.js
@@ -36,8 +36,6 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: false
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
index 85b716fbe..261910193 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
@@ -91,7 +91,7 @@ export default {
             loading: false,
             operate: null,
             operation: '',
-            planMode: 5,
+            planMode: 1,
             headMode: 5,
             fontSize: 30
         };
diff --git a/src/jmapNew/theme/xian_01/model.js b/src/jmapNew/theme/xian_01/model.js
index e8193db1f..bf09f1e11 100644
--- a/src/jmapNew/theme/xian_01/model.js
+++ b/src/jmapNew/theme/xian_01/model.js
@@ -35,7 +35,7 @@ class Model {
             atsAutoTriggerShow: true							// ATS自动触发表示灯显示
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
+            nameFormat: 'serviceNumber:tripNumber',	// 字体格式
             nameFontSize: 30					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
diff --git a/src/jmapNew/theme/xian_02/model.js b/src/jmapNew/theme/xian_02/model.js
index c1d734dec..849144e90 100644
--- a/src/jmapNew/theme/xian_02/model.js
+++ b/src/jmapNew/theme/xian_02/model.js
@@ -40,8 +40,6 @@ class Model {
             isRequestGuide: 0									// 是否请求引导
         };
         this['private'][deviceType.Train] = {
-            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
-            nameFontSize: 10					 				// 字体大小
         };
         this['private'][deviceType.TrainWindow] = {
             trainWindowShow: true

From d942ae79161c4c30869867fff32b3f22ee787830 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 12 Jun 2020 11:31:30 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../display/tipScriptRecordNew.vue            | 242 +++++++++++++++---
 .../scriptRecord/getActionNew.vue             | 186 ++++++++++++++
 2 files changed, 394 insertions(+), 34 deletions(-)
 create mode 100644 src/views/scriptManage/scriptRecord/getActionNew.vue

diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
index 0c3b4b1a1..e46dd9f56 100644
--- a/src/views/scriptManage/display/tipScriptRecordNew.vue
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -1,35 +1,55 @@
 <template>
-  <div>
-    <div class="scriptRecordNew" :style="{bottom:(offsetBottom-15)+'px'}">
-      <div v-show="isShow" class="scriptRecordNewIn">
-        <el-tabs type="card">
-          <el-tab-pane :label="$t('scriptRecord.scriptRecordTitle')+'('+language+')'">
-            <div style="padding:0px 10px;height: 240px;" />
-          </el-tab-pane>
-          <el-tab-pane label="选择剧本角色">
-            <div style="padding:0px 10px;height: 240px;">
-              <add-role ref="addRole" :group="group" @refresh="refresh" />
+  <div class="scriptRecordNew" :style="{bottom:(offsetBottom-15)+'px'}">
+    <div v-show="isShow" class="scriptRecordNewIn">
+      <el-tabs type="card">
+        <el-tab-pane :label="$t('scriptRecord.scriptRecordTitle')+'('+language+')'">
+          <div class="eachScriptPanel">
+            <div class="scriptPanelLeft">
+              <div class="panelLeftSelect">
+                <span style="font-size:13px;">当前剧本角色:</span>
+                <el-select v-model="memberId" placeholder="请选择" :disabled="isPause" @change="changeRole">
+                  <el-option v-for="member in memberList" :key="member.id" :label="member.name" :value="member.id" />
+                </el-select>
+              </div>
+              <el-button-group class="button-group">
+                <el-button v-if="isPause" size="small" type="primary" :disabled="executeDisabled" @click="pauseScript">{{ $t('scriptRecord.drivingPause') }}</el-button>
+                <el-button v-else size="small" type="primary" :disabled="executeDisabled" @click="executePlayScript">恢复</el-button>
+                <el-button size="small" type="danger" @click="dumpScenesData">{{ $t('scriptRecord.resetScript') }}</el-button>
+                <el-button size="small" type="primary" :disabled="backDisabled" @click="saveScenesStage">{{ $t('scriptRecord.saveBackground') }}</el-button>
+                <el-button size="small" type="success" :loading="isSavingScript" @click="saveScenesData">{{ $t('scriptRecord.saveData') }}</el-button>
+              </el-button-group>
             </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-      <div class="scriptRecordNewTitle" @click="minisize">
-        <span class="titleStyle">{{ $t('scriptRecord.scriptRecordTitle') }}</span>
-        <!-- <span class="titleStyle">( {{ $t('scriptRecord.language') }}: {{ $route.query.lang=="en"?$t('scriptRecord.english'):$t('scriptRecord.chinese') }} )</span> -->
-      </div>
+            <div class="scriptPanelRight">
+              <get-action-new ref="getAction" :group="group" :size="size" @setAction="setAction" />
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="选择待出演剧本角色">
+          <div class="eachScriptPanel">
+            <add-role ref="addRole" :group="group" @refresh="refresh" />
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="scriptRecordNewTitle" @click="minisize">
+      <span class="titleStyle">{{ $t('scriptRecord.scriptRecordTitle') }}</span>
     </div>
-    <!-- <div class="selectRoles">
-      <div class="selectRolesTitle">选择成员角色</div>
-      <add-role ref="addRole" :group="group" @refresh="refresh" />
-    </div> -->
   </div>
 </template>
 <script>
+import Vue from 'vue';
 import AddRole from '../scriptRecord/addRole';
+import GetActionNew from '../scriptRecord/getActionNew';
+import {getScriptPlayMemberNew, executeScriptNew, dumpScriptDataNew, saveScriptDataNew, saveScriptScenesNew, updateMapLocationNew, simulationPause} from '@/api/simulation';
+import ConstConfig from '@/scripts/ConstConfig';
+import {getDraftScriptByGroupNew} from '@/api/script';
+import Cookies from 'js-cookie';
+
 export default {
     name:'TipScriptRecordNew',
     components: {
-        AddRole
+        AddRole,
+        GetActionNew
     },
     props: {
         group: {
@@ -44,14 +64,52 @@ export default {
     data() {
         return {
             isShow:true,
-            language:''
+            language:'',
+            memberId:'',
+            isPause:false,
+            executeDisabled: false,
+            backDisabled: false,
+            autoSaveScript: null,
+            isSavingScript: false,
+            memberList:[],
+            size: {
+                width: 300,
+                height: 300
+            }
         };
     },
+    watch:{
+        '$store.state.map.mapViewLoadedCount': function (val) {
+            Vue.prototype.$jlmap.setOptions(this.$store.state.scriptRecord.mapLocation);
+            this.isPause = !(this.$store.state.scriptRecord.simulationPause);
+        },
+        '$store.state.scriptRecord.bgSet': function (val) {
+            this.backDisabled = val;
+        }
+    },
+    beforeDestroy() {
+        this.clearAutoSave();
+        this.$store.dispatch('scriptRecord/updateBgSet', false);
+    },
     mounted() {
+        this.initData();
         this.language = this.$route.query.lang == 'en' ? this.$t('scriptRecord.english') : this.$t('scriptRecord.chinese');
+        getDraftScriptByGroupNew(this.group).then(response=>{
+            this.backDisabled = response.data.bgSet;
+            this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
+        });
     },
     methods:{
         refresh() {
+            this.initData();
+        },
+        initData() {
+            getScriptPlayMemberNew(this.group).then(resp => {
+                const lastData = JSON.stringify(resp.data);
+                this.memberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
+            }).catch(error => {
+                this.$message(error.message);
+            });
         },
         minisize() {
             if (this.isShow) {
@@ -59,28 +117,141 @@ export default {
             } else {
                 this.isShow = true;
             }
+        },
+        changeRole() {
+
+        },
+        covert(data, roleTypeList) {
+            let lastData = data;
+            roleTypeList.forEach(function(element) {
+                const rolename = element.value;
+                if (Cookies.get('user_lang') == 'en') {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                } else {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                }
+            });
+            lastData = JSON.parse(lastData);
+            lastData.forEach(each=>{
+                const name = each.name == undefined ? '' : '-' + each.name;
+                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
+                each.name = each.role + deviceName + name;
+            });
+            return lastData;
+        },
+        setAction() {
+
+        },
+        pauseScript() {
+            simulationPause(this.group).then(resp => {
+                this.$store.dispatch('scriptRecord/updateSimulationPause', true);
+            }).catch(() => {
+                this.$messageBox(this.$t('scriptRecord.pauseFail'));
+            });
+        },
+        saveScenesData() {
+            this.isSavingScript = true;
+            saveScriptDataNew(this.group).then(resp => {
+                this.$message.success(this.$t('scriptRecord.saveDataSucess'));
+                this.isSavingScript = false;
+                // this.initAutoSaveScript();
+            }).catch(error => {
+                this.$messageBox(`${this.$t('scriptRecord.saveDataFail')}: ${error.message}`);
+                this.isSavingScript = false;
+                if (error.code === 40004 || error.code === 40005 || error.code === 40003) {
+                    this.clearAutoSave();
+                } else {
+                    // this.initAutoSaveScript();
+                }
+            });
+        },
+        saveScenesStage() {
+            const data = Vue.prototype.$jlmap.$options;
+            const group = this.$route.query.group;
+            const dataZoom = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY};
+            saveScriptScenesNew(this.group).then(resp => {
+                updateMapLocationNew(group, dataZoom).then(response=>{
+                    this.$store.dispatch('scriptRecord/updateBgSet', true);
+                    this.$message.success(this.$t('scriptRecord.saveBackgroundSuceess'));
+                }).catch(error => {
+                    this.$messageBox(`${this.$t('scriptRecord.updateLocationFail')}: ${error.message}`);
+                });
+            }).catch((error) => {
+                this.$messageBox(`${this.$t('scriptRecord.saveBackgroundFail')}: ${error.message}`);
+            });
+        },
+        initAutoSaveScript() {
+            const timeout = 1000 * 20;
+            this.clearAutoSave(this.autoSaveScript);
+            this.autoSaveScript = setInterval(this.saveScenesData, timeout);
+        },
+        clearAutoSave() {
+            if (this.autoSaveScript) {
+                clearInterval(this.autoSaveScript);
+                this.autoSaveScript = null;
+            }
+        },
+        executePlayScript() {
+            executeScriptNew(this.group).then(resp => {
+                this.$store.dispatch('scriptRecord/updateSimulationPause', false);
+            }).catch(() => {
+                this.$messageBox(this.$t('scriptRecord.recoverFail'));
+            });
+        },
+        dumpScenesData() {
+            this.clearAutoSave();
+            const group = this.group;
+            this.$confirm(this.$t('scriptRecord.clearDataTip'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                dumpScriptDataNew(group).then(resp => {
+                    this.$parent.resetBeginTime();
+                    // this.$parent.$refs['display'].$refs['menuScript'].resetBeginTime();
+                    this.$refs['getAction'].loadInitData();
+                    this.$refs['addRole'].initData();
+                    this.initData();
+                    this.initAutoSaveScript();
+                    this.$store.dispatch('scriptRecord/updateBgSet', false);
+                    this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
+                }).catch(() => {
+                    this.$messageBox(this.$t('scriptRecord.resetDataFail'));
+                });
+            });
         }
     }
 };
 </script>
 <style lang="scss" scoped>
-// .selectRoles{
-//     position: absolute;
-//     width: 700px;
-//     left: 5px;
-//     bottom: 424px;
-//     z-index: 10;
-//     background: #fff;
-//     height: 200px;
-//     border-radius: 5px;
-// }
 .selectRolesTitle{
 
+}
+.button-group{
+    position: absolute;
+    bottom: 0;
+}
+.eachScriptPanel{
+  height: 300px;
+  display: inline-block;
+  width:100%;
+}
+.scriptPanelLeft{
+    width: 330px;
+    height: 100%;
+    vertical-align: top;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+.scriptPanelRight{
+    display: inline-block;
+    width: 680px;
+    vertical-align: top;
 }
 .scriptRecordNew{
     position: absolute;
     width: 700px;
-    max-height: 400px;
     z-index: 10;
     padding-top: 28px;
     left: 50%;
@@ -104,5 +275,8 @@ export default {
     background: #fff;
     border-radius: 5px 5px 0px 0px ;
     box-shadow: -1px -1px 3px #656565;
+}
+.scriptPanelRight{
+
 }
 </style>
diff --git a/src/views/scriptManage/scriptRecord/getActionNew.vue b/src/views/scriptManage/scriptRecord/getActionNew.vue
new file mode 100644
index 000000000..57e27c539
--- /dev/null
+++ b/src/views/scriptManage/scriptRecord/getActionNew.vue
@@ -0,0 +1,186 @@
+<template>
+  <el-scrollbar ref="elActionScrollbar" wrap-class="scrollbar-wrapper" class="scriptBottom" :style="{width:370+'px',height:size.height+'px'}">
+    <el-timeline :reverse="reverse" class="el_timeline">
+      <el-timeline-item v-for="(actionInfo,index) in actionInfoList" :key="index">
+        <el-card>
+          <div class="actionTable">
+            <span class="detail" v-html="actionInfo.detail" />
+            <span class="otherInfo" v-html="actionInfo.otherInfo" />
+            <span v-if="actionInfo.isCoversition">
+              <span class="roleClass">{{ actionInfo.memberName }}</span>
+              <span>{{ $t('scriptRecord.speakTo') }}</span>
+              <span class="roleClass">{{ actionInfo.targetName }}</span>
+              <span>: </span>
+              <span>{{ actionInfo.reply }}</span>
+            </span>
+            <span v-else>
+              <span class="roleClass">{{ actionInfo.memberName }}</span>
+              <span>{{ $t('scriptRecord.executeCommandTips') }}</span>
+              <span class="commandStyle">{{ actionInfo.command }}</span>
+            </span>
+          </div>
+          <div class="btnGroup">
+            <!-- <el-button v-if="actionInfo.visible" type="primary" size="mini" style="margin-left:10px;" @click="modifyAction(actionInfo.row)">{{ $t('scriptRecord.modifyConversitionButton') }}</el-button> -->
+            <!-- <el-button type="danger" size="mini" @click="deleteAction(actionInfo.id)">删除</el-button> -->
+          </div>
+        </el-card>
+      </el-timeline-item>
+    </el-timeline>
+  </el-scrollbar>
+</template>
+<script>
+import Cookies from 'js-cookie';
+import {getScriptAllAction, getScriptPlayMemberNew } from '@/api/simulation';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import CommandHandler from '@/scripts/cmdPlugin/CommandHandler';
+import ConstConfig from '@/scripts/ConstConfig';
+export default {
+    name: 'GetActionNew',
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        size: {
+            type: Object,
+            required: true
+        }
+    },
+    data() {
+        return {
+            actionInfoList: [],
+            deviceCommandList: [],
+            reverse: false,
+            loading: true,
+            // behaviorName:"",
+            memberName: ''
+        };
+    },
+    computed:{
+        // drawWay() {
+        //     const drawWay = this.$route.query.drawWay;
+        //     return drawWay && JSON.parse(drawWay);
+        // }
+    },
+    watch: {
+        actionInfoList: function(val) {
+            this.$nextTick(function() {
+                var div = this.$refs['elActionScrollbar'].$refs['wrap'];
+                div.scrollTop = this.$refs['elActionScrollbar'].wrap.scrollHeight;
+            });
+        }
+    },
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            this.loadOtherData(this.$route.query);
+        },
+        covert(data, roleTypeList) {
+            let lastData = data;
+            roleTypeList.forEach(function(element) {
+                const rolename = element.value;
+                if (Cookies.get('user_lang') == 'en') {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
+                } else {
+                    lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
+                }
+            });
+            lastData = JSON.parse(lastData);
+            lastData.forEach(each=>{
+                const name = each.name == undefined ? '' : '-' + each.name;
+                const deviceName = each.deviceName == undefined ? '' : '-' + each.deviceName;
+                each.name = each.role + deviceName + name;
+            });
+            return lastData;
+        },
+        loadOtherData(obj) {
+            const group = obj.group;
+            getScriptPlayMemberNew(this.group).then(response => {
+                const lastData = JSON.stringify(response.data);
+                const memberVOList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
+                getScriptAllAction(group).then(resp=>{
+                    this.actionInfoList = [];
+                    const actionList = resp.data;
+                    actionList.forEach(element => {
+                        const member = memberVOList.find(elem=>{ return elem.id == element.memberId; });
+                        const memberName = member.name;
+                        switch (element.type) {
+                        case 'Conversation':
+                        {
+                            const target = memberVOList.find(elem=>{ return elem.id == element.targetId; });
+                            const targetName = target.name;
+                            this.actionInfoList.push({id: element.id, isCoversition: true, memberName: memberName, targetName: targetName, reply: element.reply, row: element, visible: true});
+                            break;
+                        }
+                        case 'Command':
+                        {
+                            const command = CommandHandler.getScriptDefinition(element.operationType);
+                            let operateType = command.operate.split('_')[0];
+                            const data = command.operate.toUpperCase();
+                            if (operateType == 'CM') {
+                                operateType = 'ControlConvertMenu';
+                            }
+                            const operateName = CMD[operateType]['CMD_' + data];
+                            const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式'};
+                            const operateTypeName = deviceTypeList[operateType];
+                            this.actionInfoList.push({id: element.id, isCoversition: false, memberName: memberName, command: operateTypeName + '(' + operateName.label + ')', row: element, visible: false});
+                            break;
+                        }
+                        }
+                    });
+                }).catch(error => {
+                    this.$message(error.message);
+                });
+            }).catch(error => {
+                this.$message(error.message);
+            });
+        },
+        reloadTable() {
+            this.loadInitData();
+        }
+        // modifyAction(row) {
+        //     this.$emit('setAction', row);
+        // }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    .actionTable{
+        width:280px;
+        padding: 15px 0px 10px 15px;
+        display: inline-block;
+        line-height: 200%;
+    }
+    .btnGroup{
+        padding: 10px 10px 10px 10px;
+        float: right;
+        vertical-align: top;
+        display: inline-block;
+    }
+    .el_timeline{
+        width: 350px;
+        margin-top:5px;
+        padding-left: 25px;
+    }
+    .el-timeline{
+        font-size:13px;
+    }
+    .roleClass{
+        color:#409EFF
+    }
+    .commandStyle{
+        color:#F00;
+    }
+    .scriptPane{
+        height: 100%;
+        padding-top:200px;
+    }
+    .scriptBottom{
+        margin-left:300px;
+        margin-top: 0px;
+        font-size:13px;
+    }
+</style>

From 0ead3ea016f82f3914bf48293b3ab59d9d41c898 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 12 Jun 2020 13:16:03 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=A1=86=E5=81=9C=E7=A8=B3=E7=8A=B6=E6=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Train/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index e1eab05f6..1bfd52648 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -84,6 +84,7 @@ export default class Train extends Group {
                 maLen: model.maLen,
                 hold:model.hold,
                 jump:model.jump,
+                stop:model.stop,
                 dt: model.dt,
                 model: model
             });

From 2c8c8117b2a67dd81d7d645466ee8f7621a5beb9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 12 Jun 2020 13:16:21 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E8=80=81=E7=89=88=E6=9C=AC=E7=A6=8F?=
 =?UTF-8?q?=E5=B7=9E=E5=88=97=E8=BD=A6=E7=9B=AE=E7=9A=84=E5=9C=B0=E7=A0=81?=
 =?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/jmap/shape/Train/TrainBody.js | 2 +-
 src/jmapNew/shape/Train/index.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
index 1d339a3c9..559d56f6a 100644
--- a/src/jmap/shape/Train/TrainBody.js
+++ b/src/jmap/shape/Train/TrainBody.js
@@ -100,7 +100,7 @@ export default class TrainBody extends Group {
         const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
             ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
             : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
-        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
+        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.targetCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
         const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; //  车组号
         this.textTrainServer = new ETextName({
             zlevel: model.zlevel,
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index e1eab05f6..0ad0d5c58 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -163,7 +163,7 @@ export default class Train extends Group {
         if (style.Train.common.haveTrainBorder) {
             this.createTrainBorder();
         }
-        if (style.Train.directionArrow.hasArrow) {
+        if (style.Train.directionArrow.hasArrow) { // 列车运行上下方箭头（eg:宁波yi）
             const arrowPoint = { x: 0, y: 0 };
             if (model.trainWindowModel) {
                 arrowPoint.x = model.trainWindowModel.point.x;

From e01277ba64b6f9e69fbc13bbe7df479477fbbffb Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 12 Jun 2020 13:19:26 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=A6=E7=AB=99=20?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=A8=A1=E5=BC=8F=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/bejing_01.js  |  47 ++--
 src/jmapNew/config/skinCode/chengdu_01.js |  48 ++--
 src/jmapNew/config/skinCode/chengdu_03.js |  45 ++--
 src/jmapNew/config/skinCode/foshan_01.js  |  44 ++--
 src/jmapNew/config/skinCode/fuzhou_01.js  |  45 ++--
 src/jmapNew/config/skinCode/haerbin_01.js |  46 ++--
 src/jmapNew/config/skinCode/ningbo_01.js  |  46 ++--
 src/jmapNew/config/skinCode/xian_01.js    |  46 ++--
 src/jmapNew/config/skinCode/xian_02.js    |  46 ++--
 src/jmapNew/shape/Station/index.js        | 262 ++++++++++++++--------
 10 files changed, 442 insertions(+), 233 deletions(-)

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index 6c6afa69b..91c7bc09b 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -365,31 +365,46 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',								// 控制模式字体颜色
                     fontWeight: 'normal',								// 控制模式字体粗细
                     textAlign: 'middle',								// 控制模式水平对齐
-                    textVerticalAlign: 'top',							// 控制模式垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText: '紧急站控', // 紧急站控文字内容
-                    interconnectedControlText: '连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',              // 站中控文字内容
-                    // generalAlarmControlText: '总报警'                // 总报警文字内容
+                    textVerticalAlign: 'top'							// 控制模式垂直对齐
                 },
                 lamp: {
                     count: 3,											// 控制模式灯个数
-                    offset: { x: 20, y: 0 },							// 偏移量
+                    offset: { x: 0, y: 0 },								// 偏移量
                     radiusR: 6,											// 控制模式灯的半径
                     distance: 46,										// 控制模式之间灯之间的距离
                     grayColor: '#7F7F7F',								// 控制模式灰色
                     greenColor: '#00FF00',								// 控制模式绿色
                     redColor: '#FF0000',								// 控制模式红色
-                    yellowColor: '#FFFF00',								// 控制模式黄色
-                    emergencyControlShow: true,							// 紧急站控显示
-                    centerControlShow: true,							// 中控显示
-                    substationControlShow: true,						// 站控按钮显示
-                    interconnectedControlShow: false,					// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'								// 控制模式黄色
                 },
-                arrow: {
-                    show: false											// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 },
                 mouseOverStyle: {										// 鼠标悬浮样式
                     fontSize: 10,
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 9c01e1b09..1a8ccd7a1 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -334,31 +334,47 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',						// 字体颜色
                     fontWeight: 'normal',						// 字体粗细
                     textAlign: 'middle',						// 字体水平对齐
-                    textVerticalAlign: 'top',					// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',      // 站中控文字内容
-                    // generalAlarmControlText: '总报警'        // 总报警文字内容
+                    textVerticalAlign: 'top'					// 字体垂直对齐
                 },
                 lamp: {
                     count: 4,									// 控制模式的个数
-                    offset: {x: 20, y: 0},						// 偏移量
+                    offset: {x: 0, y: 0},						// 偏移量
+                    emergencyOffset: {x: 0, y: 0},
                     radiusR: 4,									// 控制模式灯的半径
                     distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#C0C0C0',						// 控制模式灰色
                     greenColor: 'green',						// 控制模式绿色
                     redColor: 'red',						// 控制模式红色
-                    yellowColor: 'yellow',						// 控制模式黄色
-                    emergencyControlShow: true,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: 'yellow'						// 控制模式黄色
                 },
-                arrow: {
-                    show: false									// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 }
             }
         };
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 8983f55ed..e7643052d 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -324,13 +324,7 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',						// 字体颜色
                     fontWeight: 'normal',						// 字体粗细
                     textAlign: 'middle',						// 字体水平对齐
-                    textVerticalAlign: 'top',					// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',      // 站中控文字内容
-                    // generalAlarmControlText: '总报警'        // 总报警文字内容
+                    textVerticalAlign: 'top'					// 字体垂直对齐
                 },
                 lamp: {
                     count: 4,									// 控制模式的个数
@@ -340,15 +334,36 @@ class SkinCode extends defaultStyle {
                     grayColor: '#7F7F7F',						// 控制模式灰色
                     greenColor: '#00FF00',						// 控制模式绿色
                     redColor: '#FF0000',						// 控制模式红色
-                    yellowColor: '#FFFF00',						// 控制模式黄色
-                    emergencyControlShow: true,				// 紧急站控显示
-                    centerControlShow: true,					// 中控显示
-                    substationControlShow: true,				// 站控按钮显示
-                    interconnectedControlShow: true,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'						// 控制模式黄色
                 },
-                arrow: {
-                    show: false									// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 }
             }
         };
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index c36e3c2d2..3163f94b5 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -346,13 +346,7 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',							// 字体颜色
                     fontWeight: 'normal',							// 字体粗细
                     textAlign: 'middle',							// 字体水平对齐
-                    textVerticalAlign: 'top',						// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',          // 站中控文字内容
-                    // generalAlarmControlText: '总报警'            // 总报警文字内容
+                    textVerticalAlign: 'top'						// 字体垂直对齐
                 },
                 lamp: {
                     count: 2,										// 控制模式灯个数
@@ -362,12 +356,36 @@ class SkinCode extends defaultStyle {
                     grayColor: '#7F7F7F',							// 控制模式灰色
                     greenColor: '#00FF00',							// 控制模式绿色
                     redColor: '#FF0000',							// 控制模式红色
-                    yellowColor: '#FFFF00',							// 控制模式黄色
-                    emergencyControlShow: false,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'							// 控制模式黄色
+                },
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 110, y: 0 },
+                    text: '紧急',
+                    arrowShow: true,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: true,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 },
                 arrow: {
                     show: true		 								// 控制模式箭头显隐
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index e863755a3..8160b386d 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -335,13 +335,7 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',							// 字体颜色
                     fontWeight: 'normal',							// 字体粗细
                     textAlign: 'middle',							// 字体水平对齐
-                    textVerticalAlign: 'top',						// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',          // 站中控文字内容
-                    // generalAlarmControlText: '总报警'            // 总报警文字内容
+                    textVerticalAlign: 'top'						// 字体垂直对齐
                 },
                 lamp: {
                     count: 2,										// 控制模式灯个数
@@ -351,15 +345,36 @@ class SkinCode extends defaultStyle {
                     grayColor: '#7F7F7F',							// 控制模式灰色
                     greenColor: '#00FF00',							// 控制模式绿色
                     redColor: '#FF0000',							// 控制模式红色
-                    yellowColor: '#FFFF00',							// 控制模式黄色
-                    emergencyControlShow: false,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'							// 控制模式黄色
                 },
-                arrow: {
-                    show: true		 								// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: true,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 },
                 mouseOverStyle: {										// 鼠标悬浮样式
                     fontSize: null,
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index b0ab0e95d..70ed941ca 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -355,31 +355,47 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',							// 字体颜色
                     fontWeight: 'normal',							// 字体粗细
                     textAlign: 'middle',							// 字体水平对齐
-                    textVerticalAlign: 'top',						// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText: '紧急站控', // 紧急站控文字内容
-                    interconnectedControlText: '连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',          // 站中控文字内容
-                    // generalAlarmControlText: '总报警'            // 总报警文字内容
+                    textVerticalAlign: 'top'						// 字体垂直对齐
                 },
                 lamp: {
                     count: 2,										// 控制模式灯个数
                     offset: { x: 0, y: 0 },							// 控制模式灯偏移量
+                    emergencyOffset: {x: 0, y: 0},
                     radiusR: 4,										// 控制模式灯的半径
                     distance: 36,									// 控制模式之间灯之间的距离
                     grayColor: '#7F7F7F',							// 控制模式灰色
                     greenColor: '#00FF00',							// 控制模式绿色
                     redColor: '#FF0000',							// 控制模式红色
-                    yellowColor: '#FFFF00',							// 控制模式黄色
-                    emergencyControlShow: false,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'							// 控制模式黄色
                 },
-                arrow: {
-                    show: true		 								// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: true,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 },
                 mouseOverStyle: {										// 鼠标悬浮样式
                     fontSize: null,
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 44f653d35..a36b2b6d3 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -223,34 +223,50 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',						// 字体颜色
                     fontWeight: 'normal',						// 字体粗细
                     textAlign: 'middle',						// 字体水平对齐
-                    textVerticalAlign: 'top',					// 字体垂直对齐
-                    centerControlButton: '站遥控按钮', // 中控文字内容
-                    centerControlText: '遥控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText: '紧急站控', // 紧急站控文字内容
-                    interconnectedControlText: '连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',      // 站中控文字内容
-                    // generalAlarmControlText: '总报警'        // 总报警文字内容
+                    textVerticalAlign: 'top'					// 字体垂直对齐
                 },
                 lamp: {
                     count: 4,									// 控制模式的个数
                     offset: { x: 20, y: 0 },						// 偏移量
+                    emergencyOffset: {x: 0, y: 0},
                     radiusR: 6,									// 控制模式灯的半径
                     distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#C0C0C0',						// 控制模式灰色
                     greenColor: 'green',						// 控制模式绿色
                     redColor: 'red',						// 控制模式红色
                     yellowColor: 'yellow',						// 控制模式黄色
-                    emergencyControlShow: true,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: true,						// 中控显示
                     stroke: '#FFFFFF', // 框的颜色
                     fill: 'rgba(0,0,0,0)' // 填充色
                 },
-                arrow: {
-                    show: false									// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '遥控',
+                    buttonText: '站遥控按钮',
+                    buttonShow: true,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 }
             }
         };
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index 24536bca1..c8fe3a3c8 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -350,31 +350,47 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',							// 字体颜色
                     fontWeight: 'normal',							// 字体粗细
                     textAlign: 'middle',							// 字体水平对齐
-                    textVerticalAlign: 'top',						// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',          // 站中控文字内容
-                    // generalAlarmControlText: '总报警'            // 总报警文字内容
+                    textVerticalAlign: 'top'						// 字体垂直对齐
                 },
                 lamp: {
                     count: 2,										// 控制模式灯个数
                     offset: {x: 0, y: 0},							// 控制模式灯偏移量
+                    emergencyOffset: {x: 0, y: 0},
                     radiusR: 4,										// 控制模式灯的半径
                     distance: 36,									// 控制模式之间灯之间的距离
                     grayColor: '#7F7F7F',							// 控制模式灰色
                     greenColor: '#00FF00',							// 控制模式绿色
                     redColor: '#FF0000',							// 控制模式红色
-                    yellowColor: '#FFFF00',							// 控制模式黄色
-                    emergencyControlShow: false,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: '#FFFF00'							// 控制模式黄色
                 },
-                arrow: {
-                    show: true		 								// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: true,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 },
                 mouseOverStyle: {										// 鼠标悬浮样式
                     fontSize: null,
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 21a84dd77..468681d5f 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -394,31 +394,47 @@ class SkinCode extends defaultStyle {
                     fontColor: '#ffffff',						// 字体颜色
                     fontWeight: 'normal',						// 字体粗细
                     textAlign: 'middle',						// 字体水平对齐
-                    textVerticalAlign: 'top',					// 字体垂直对齐
-                    centerControlText: '中控', // 中控文字内容
-                    substationControlText: '站控', // 站控文字内容
-                    emergencyControlText:'紧急站控', // 紧急站控文字内容
-                    interconnectedControlText:'连锁控' // 连锁控文字内容
-                    // stationCenterControlText: '站中控',      // 站中控文字内容
-                    // generalAlarmControlText: '总报警'        // 总报警文字内容
+                    textVerticalAlign: 'top'					// 字体垂直对齐
                 },
                 lamp: {
                     count: 4,									// 控制模式的个数
                     offset: {x: 20, y: 0},						// 偏移量
+                    emergencyOffset: {x: 0, y: 0},
                     radiusR: 4,									// 控制模式灯的半径
                     distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#C0C0C0',						// 控制模式灰色
                     greenColor: 'green',						// 控制模式绿色
                     redColor: 'red',						// 控制模式红色
-                    yellowColor: 'yellow',						// 控制模式黄色
-                    emergencyControlShow: true,					// 紧急站控显示
-                    centerControlShow: true,						// 中控显示
-                    substationControlShow: true,					// 站控按钮显示
-                    interconnectedControlShow: false,				// 联锁控显示
-                    centerControlButtonShow: false						// 中控显示
+                    yellowColor: 'yellow'						// 控制模式黄色
                 },
-                arrow: {
-                    show: false									// 控制模式箭头显隐
+                emergencyControl: {									// 紧急站控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '紧急',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                centerControl: {									// 中控
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '中控',
+                    buttonShow: false,
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                substationControl: {								// 站控按钮
+                    show: true,
+                    offset: { x: 0, y: 0 },
+                    text: '站控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
+                },
+                interconnectedControl: {							// 联锁控
+                    show: false,
+                    offset: { x: 0, y: 0 },
+                    text: '联锁控',
+                    arrowShow: false,
+                    grayColor: '#7F7F7F'
                 }
             }
         };
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 3d4386f49..78436a7a5 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -174,73 +174,41 @@ export default class Station extends Group {
         const model = this.model;
         if (model.visible && model.createControlMode) {
             // 紧急站控
-            if (this.style.Station.StationControl.lamp.emergencyControlShow) {
-                this.emergencyControl = new ESingleControl({
-                    _subType: 'emergency',
-                    style: this.style,
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    point: {
-                        x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x,
-                        y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
-                    },
-                    context: this.style.Station.StationControl.text.emergencyControlText,
-                    pop: false
-                });
-                this.add(this.emergencyControl);
-            }
+            this.createEmergencyControl();
+
             // 中控按钮
-            if (this.style.Station.StationControl.lamp.centerControlShow) {
-                this.centerControl = new ESingleControl({
-                    _subType: 'center',
-                    style: this.style,
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    point: {
-                        x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
-                        y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
-                    },
-                    context: this.style.Station.StationControl.text.centerControlText,
-                    pop: false
-                });
-                this.add(this.centerControl);
-            }
+            this.createCenterControl();
+
             // 站控按钮
-            if (this.style.Station.StationControl.lamp.substationControlShow) {
-                this.substationControl = new ESingleControl({
-                    _subType: 'substation',
-                    style: this.style,
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    point: {
-                        x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
-                        y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
-                    },
-                    context: this.style.Station.StationControl.text.substationControlText,
-                    pop: false
-                });
-                this.add(this.substationControl);
-            }
+            this.createSubstationControl();
+
             // 联锁控
-            if (this.style.Station.StationControl.lamp.interconnectedControlShow) {
-                this.interconnectedControl = new ESingleControl({
-                    _subType: 'interconnected',
-                    style: this.style,
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    point: {
-                        x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x,
-                        y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
-                    },
-                    context: this.style.Station.StationControl.text.interconnectedControlText || '联锁控',
-                    pop: false
-                });
-                this.add(this.interconnectedControl);
-            }
-            // 箭头
-            if (this.style.Station.StationControl.arrow.show) {
-                const point = arrow(this.model.controlModePoint.x, this.model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
-                this.arrowsControl = new EArrow({
+            this.createInterconnectedControl();
+        }
+        this.setState(model);
+    }
+
+    createEmergencyControl() { // 紧急站控
+        const model = this.model;
+        if (this.style.Station.StationControl.emergencyControl.show) {
+            this.emergencyControl = new ESingleControl({
+                _subType: 'emergency',
+                style: this.style,
+                zlevel: this.zlevel,
+                z: this.z,
+                point: {
+                    x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y
+                },
+                context: this.style.Station.StationControl.emergencyControl.text,
+                pop: false
+            });
+            this.add(this.emergencyControl);
+            if (this.style.Station.StationControl.emergencyControl.arrowShow) {
+                const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 2 + this.style.Station.StationControl.emergencyControl.offset.x;
+                const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
+                const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+                this.emergencyArrowsControl = new EArrow({
                     zlevel: this.zlevel,
                     z: this.z,
                     style: this.style,
@@ -249,44 +217,137 @@ export default class Station extends Group {
                     point: point,
                     x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
                     y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
-                    fill: this.style.Station.StationControl.lamp.grayColor,
+                    fill: this.style.Station.StationControl.emergencyControl.grayColor,
                     lineWidth: 1,
                     stroke: this.style.sidelineColor
                 });
-                this.add(this.arrowsControl);
+                this.add(this.emergencyArrowsControl);
             }
-            // 中控按钮
-            if (this.style.Station.StationControl.lamp.centerControlButtonShow) {
-                this.centerControlButton = new ESingleControl({
-                    _subType: 'button',
-                    style: this.style,
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    point: {
-                        x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
-                        y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
-                    },
-                    context: this.style.Station.StationControl.text.centerControlButton,
-                    pop: false
-                });
-                this.add(this.centerControlButton);
-                const arcRect = this.centerControlButton.getArcBoundingRect();
-                this.arcBorder = new Rect({
-                    zlevel: this.zlevel,
-                    z: this.z,
-                    silent: true,
-                    shape: arcRect,
-                    style: {
-                        lineDash: null,
-                        stroke: this.style.Station.StationControl.lamp.stroke,
-                        fill: this.style.Station.StationControl.lamp.fill
-                    }
-                });
-                this.add(this.arcBorder);
-            }
-
         }
-        this.setState(model);
+    }
+
+    createCenterControl() { // 中控按钮
+        const model = this.model;
+        if (this.style.Station.StationControl.centerControl.show) {
+            this.centerControl = new ESingleControl({
+                _subType: 'center',
+                style: this.style,
+                zlevel: this.zlevel,
+                z: this.z,
+                point: {
+                    x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.centerControl.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.centerControl.offset.y
+                },
+                context: this.style.Station.StationControl.centerControl.text,
+                pop: false
+            });
+            this.add(this.centerControl);
+            if (this.style.Station.StationControl.centerControl.arrowShow) {
+                const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x;
+                const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
+                const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+                this.centerArrowsControl = new EArrow({
+                    zlevel: this.zlevel,
+                    z: this.z,
+                    style: this.style,
+                    count: this.count,
+                    drict: 1,
+                    point: point,
+                    x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
+                    fill: this.style.Station.StationControl.centerControl.grayColor,
+                    lineWidth: 1,
+                    stroke: this.style.sidelineColor
+                });
+                this.add(this.centerArrowsControl);
+            }
+        }
+        // 中控按钮
+        if (this.style.Station.StationControl.centerControl.buttonShow) { // 宁波一 显示
+            this.centerControlButton = new ESingleControl({
+                _subType: 'button',
+                style: this.style,
+                zlevel: this.zlevel,
+                z: this.z,
+                point: {
+                    x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
+                },
+                context: this.style.Station.StationControl.centerControl.buttonText,
+                pop: false
+            });
+            this.add(this.centerControlButton);
+            const arcRect = this.centerControlButton.getArcBoundingRect();
+            this.arcBorder = new Rect({
+                zlevel: this.zlevel,
+                z: this.z,
+                silent: true,
+                shape: arcRect,
+                style: {
+                    lineDash: null,
+                    stroke: this.style.Station.StationControl.lamp.stroke,
+                    fill: this.style.Station.StationControl.lamp.fill
+                }
+            });
+            this.add(this.arcBorder);
+        }
+    }
+
+    createSubstationControl() { // 站控按钮
+        const model = this.model;
+        if (this.style.Station.StationControl.substationControl.show) {
+            this.substationControl = new ESingleControl({
+                _subType: 'substation',
+                style: this.style,
+                zlevel: this.zlevel,
+                z: this.z,
+                point: {
+                    x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.substationControl.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y
+                },
+                context: this.style.Station.StationControl.substationControl.text,
+                pop: false
+            });
+            this.add(this.substationControl);
+            if (this.style.Station.StationControl.substationControl.arrowShow) {
+                const x = this.model.controlModePoint.x + this.style.Station.StationControl.substationControl.offset.x;
+                const y = this.model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y;
+                const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+                this.substationArrowsControl = new EArrow({
+                    zlevel: this.zlevel,
+                    z: this.z,
+                    style: this.style,
+                    count: this.count,
+                    drict: 1,
+                    point: point,
+                    x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
+                    fill: this.style.Station.StationControl.substationControl.grayColor,
+                    lineWidth: 1,
+                    stroke: this.style.sidelineColor
+                });
+                this.add(this.substationArrowsControl);
+            }
+        }
+    }
+
+    createInterconnectedControl() { // 联锁控
+        const model = this.model;
+        if (this.style.Station.StationControl.interconnectedControl.show) { // 成都三会显示
+            this.interconnectedControl = new ESingleControl({
+                _subType: 'interconnected',
+                style: this.style,
+                zlevel: this.zlevel,
+                z: this.z,
+                point: {
+                    x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.interconnectedControl.offset.x,
+                    y: model.controlModePoint.y + this.style.Station.StationControl.interconnectedControl.offset.y
+                },
+                context: this.style.Station.StationControl.interconnectedControl.text || '联锁控',
+                pop: false
+            });
+            this.add(this.interconnectedControl);
+        }
     }
 
     handleCenter() { // 中控
@@ -301,13 +362,15 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor);
         this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
-        this.arrowsControl && this.arrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
+        this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
     }
 
     handleEmergency() { // 紧急站控
         this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.redColor);
+        this.emergencyControl && this.emergencyControl.setTextColor(this.style.Station.StationControl.lamp.redColor); // 紧急 颜色
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
+        this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
     }
 
     recover() {
@@ -317,6 +380,9 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.text.fontColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor);
+
+        this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
+        this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
     }
 
     // 设置状态

From 207cd06cd978c35ddad00c87f20a73cbbfa9b5d6 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 12 Jun 2020 13:42:33 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BD=9B=E5=B1=B1?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/foshan_01/menus/menuBar.vue | 138 +++++++++---------
 1 file changed, 71 insertions(+), 67 deletions(-)

diff --git a/src/jmapNew/theme/foshan_01/menus/menuBar.vue b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
index fe1e8f4f4..8be5a4bba 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
@@ -356,35 +356,36 @@ export default {
                             }
                         ]
                     },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.setDetainTrainAll
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.cancelDetainTrainAll
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.cancelUpDetainTrainAll
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.cancelDownDetainTrainAll
-                            }
-                        ]
-                    },
+                    // {
+                    //     title: '批处理命令',
+                    //     operate: OperationEvent.Command.mBar.detainControl,
+                    //     click: this.undeveloped,
+                    //     children: [
+                    //         {
+                    //             title: '全线扣车',
+                    //             operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                    //             click: this.setDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                    //             click: this.cancelDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消上行全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                    //             click: this.cancelUpDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消下行全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                    //             click: this.cancelDownDetainTrainAll
+                    //         }
+                    //     ]
+                    // },
                     {
                         title: '信息管理',
-                        operate: '',
+                        operate: OperationEvent.Command.mBar.detainControl,
                         children: [
                             {
                                 title: '调度日志',
@@ -402,6 +403,7 @@ export default {
                     },
                     {
                         title: '帮助',
+                        operate: OperationEvent.Command.mBar.detainControl,
                         children: [
                             {
                                 title: '关于ITS GPC 工作站',
@@ -622,35 +624,36 @@ export default {
                             }
                         ]
                     },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.setDetainTrainAll
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.cancelDetainTrainAll
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.cancelUpDetainTrainAll
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.cancelDownDetainTrainAll
-                            }
-                        ]
-                    },
+                    // {
+                    //     title: '批处理命令',
+                    //     operate: OperationEvent.Command.mBar.detainControl,
+                    //     click: this.undeveloped,
+                    //     children: [
+                    //         {
+                    //             title: '全线扣车',
+                    //             operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                    //             click: this.setDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                    //             click: this.cancelDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消上行全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                    //             click: this.cancelUpDetainTrainAll
+                    //         },
+                    //         {
+                    //             title: '取消下行全线扣车',
+                    //             operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                    //             click: this.cancelDownDetainTrainAll
+                    //         }
+                    //     ]
+                    // },
                     {
                         title: '信息管理',
-                        operate: '',
+                        operate: OperationEvent.Command.mBar.detainControl,
                         children: [
                             {
                                 title: '调度日志',
@@ -668,6 +671,7 @@ export default {
                     },
                     {
                         title: '帮助',
+                        operate: OperationEvent.Command.mBar.detainControl,
                         children: [
                             {
                                 title: '关于ITS GPC 工作站',
@@ -808,7 +812,7 @@ export default {
             };
             this.tempClassA = index;
             this.tempClassB = -1;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -829,7 +833,7 @@ export default {
                 operation: item.operate.operation
             };
             this.tempClassB = index;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -847,7 +851,7 @@ export default {
             const operate = {
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -862,7 +866,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -876,7 +880,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -891,7 +895,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -906,7 +910,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -921,7 +925,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -935,7 +939,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -949,7 +953,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -963,7 +967,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -977,7 +981,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -991,7 +995,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

From 2e44c6942914028ed624c23220c88b4aed97a7cc Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 12 Jun 2020 14:34:18 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E8=80=81=E7=89=88=E6=9C=AC=E7=A6=8F?=
 =?UTF-8?q?=E5=B7=9E=E5=88=97=E8=BD=A6=E7=9B=AE=E7=9A=84=E5=9C=B0=E7=A0=81?=
 =?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/ningbo_01.js      | 12 ++++++-
 .../components/menus/dialog/standControl.vue  | 32 +++++++------------
 .../theme/fuzhou_01/menus/menuSection.vue     | 17 +++-------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 6a4301278..3c2fadabf 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -534,7 +534,17 @@ class SkinCode extends defaultStyle {
                 fontFamily: 'consolas',
                 trainBodyLineWidth: 1, // 车身line宽
                 changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
-                specialTrainType: [], // 特殊列车类型需设置显示格式
+                specialTrainType: [
+                    {
+                        type: 'MANUAL',
+                        serviceNumber: '',
+                        nameFormat: 'groupNumber:targetCode'
+                    },
+                    {
+                        type: 'HEAD',
+                        nameFormat: 'groupNumber:targetCode'
+                    }
+                ], // 特殊列车类型需设置显示格式
                 lrPadding: 4, // 两边间隔
                 upPadding: 4, // 上边距离
                 trainSidelineColor: '#ABFE9B',
diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
index c8577b263..55985dff9 100644
--- a/src/jmapNew/theme/components/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -130,6 +130,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '../../utils/menuOperate';
+import { mapGetters } from 'vuex';
 
 export default {
     name: 'StandDetainTrain',
@@ -161,6 +162,9 @@ export default {
         };
     },
     computed: {
+        ...mapGetters('map', [
+            'mapConfig'
+        ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
@@ -213,7 +217,7 @@ export default {
                     }
                 }
                 this.radio = '2';
-                if (this.selected.right) { // 判断站台行驶方向
+                if ((this.selected.right && this.mapConfig.upDirection === 'right') || (!this.selected.right && this.mapConfig.upDirection === 'left')) { // 判断站台行驶方向
                     this.radio = '1';
                 }
 
@@ -237,7 +241,7 @@ export default {
                 this.radio1 = '2';
             } else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
                 this.earlyDepar = true;
-                if (!this.selected.right) {
+                if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
                     this.radio2 = '2';
                 } else {
                     this.radio2 = '1';
@@ -246,14 +250,14 @@ export default {
                 this.AutomaticBuckle = true;
                 this.autoRadio1 = '1';
                 this.autoRadio = '1';
-                if (!this.selected.right) {
+                if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
                     this.autoRadio = '2';
                 }
             } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
                 this.AutomaticBuckle = true;
                 this.autoRadio1 = '2';
                 this.autoRadio = '1';
-                if (!this.selected.right) {
+                if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
                     this.autoRadio = '2';
                 }
             }
@@ -303,30 +307,18 @@ export default {
             }
         },
         setDetainTrainAuto() { // 区间自动扣车
-            this.sendCommand(menuOperate.StationStand.setDetainTrainAuto, {
-                leftDirection: this.autoRadio == '2', // 1 上行 2 下行
-                rightDirection: this.autoRadio == '1'
-            });
+            this.sendCommand(menuOperate.StationStand.setDetainTrainAuto);
         },
         cancelDetainTrainAuto() { // 取消区间自动扣车
-            this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto, {
-                leftDirection: this.autoRadio == '2', // 1 上行 2 下行
-                rightDirection: this.autoRadio == '1'
-            });
+            this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto);
         },
         // 设置扣车
         setDetainTrain() {
-            this.sendCommand(menuOperate.StationStand.setDetainTrain, {
-                leftDirection: this.radio == '2', // 1 上行 2 下行
-                rightDirection: this.radio == '1'
-            });
+            this.sendCommand(menuOperate.StationStand.setDetainTrain);
         },
         // 取消扣车
         cancelDetainTrain() {
-            this.sendCommand(menuOperate.StationStand.cancelDetainTrain, {
-                leftDirection: this.radio == '2', // 1 上行 2 下行
-                rightDirection: this.radio == '1'
-            });
+            this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
         },
         // 提前发车
         earlyDeparture() {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
index 7824937d6..91683e07d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
@@ -230,18 +230,9 @@ export default {
         },
         // 故障解锁
         fault() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Section.fault.menu.operation,
-                param: {
-                    Section_Code: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            commitOperate(menuOperate.Section.fault, {sectionCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.sectionCmdControl.doShow(step, this.selected);
+                    this.$refs.sectionCmdControl.doShow(operate, this.selected);
                 }
             });
         },
@@ -252,7 +243,7 @@ export default {
                 code: `${this.selected.code}`,
                 operation: OperationEvent.Section.split.menu.operation,
                 param: {
-                    Section_Code: `${this.selected.code}`
+                    sectionCode: `${this.selected.code}`
                 }
             };
             this.$store.dispatch('training/next', step).then(({ valid }) => {
@@ -269,7 +260,7 @@ export default {
                 code: `${this.selected.code}`,
                 operation: OperationEvent.Section.active.menu.operation,
                 param: {
-                    Section_Code: `${this.selected.code}`
+                    sectionCode: `${this.selected.code}`
                 }
             };
             this.$store.dispatch('training/next', step).then(({ valid }) => {

From 64a7e0e1abb935d60553c59fe69a9fbed7dfe79d Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 12 Jun 2020 15:34:53 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=85=83=E7=B4=A0=E7=82=B9=E5=87=BB=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=20=E8=B0=83=E6=95=B4=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopMenu/item.vue                  |  7 ++++---
 src/iscs/iscs.js                                 |  4 +++-
 src/iscs/transformHandle.js                      |  2 +-
 src/jmapNew/theme/xian_01/menus/index.vue        |  3 +++
 .../iscsSystem/config/bas/tunnelVentilation.vue  | 16 +++++++++++++++-
 .../iscs/iscsSystem/config/canvas/iscsCanvas.vue |  3 ++-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/PopMenu/item.vue b/src/components/PopMenu/item.vue
index ab24713ae..7e1acef42 100644
--- a/src/components/PopMenu/item.vue
+++ b/src/components/PopMenu/item.vue
@@ -9,7 +9,7 @@
         <i class="el-icon-arrow-right" />
       </div>
       <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}">
-        <div class="menu-pop">
+        <div class="menu-pop pop-menu">
           <div v-show="isShow" class="arrow  el-icon-arrow-down" />
           <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" @close="close" />
           <div v-show="isShow" class="arrow  el-icon-arrow-up" />
@@ -56,7 +56,7 @@ export default {
     data() {
         return {
             active: -1,
-            allowedColor: '#666',
+            allowedColor: '#000',
             disabledColor: '#ccc'
         };
     },
@@ -162,11 +162,12 @@ export default {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			flex-direction: row;
 			padding-right: 3px;
 		}
 
 		.menu-item {
-			background: $bg;
+			// background: $bg;
 			list-style: none;
 		}
 
diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js
index 48fd66dee..c5621657e 100644
--- a/src/iscs/iscs.js
+++ b/src/iscs/iscs.js
@@ -236,8 +236,10 @@ class Iscs {
     }
 
     resize(opt) {
+        // console.log(opt, 'resize');
+        // debugger;
         this.$iscsZr.resize(opt);
-        this.$painter.updateZrSize(opt);
+        this.$painter.updateZrSize(opt); // 判断元素显示隐藏
     }
 
     refresh() {
diff --git a/src/iscs/transformHandle.js b/src/iscs/transformHandle.js
index ca8c0cd12..d0ec9cbf3 100644
--- a/src/iscs/transformHandle.js
+++ b/src/iscs/transformHandle.js
@@ -1,4 +1,4 @@
-import deviceType from './constant/deviceType';
+// import deviceType from './constant/deviceType';
 import {createTransform, createBoundingRect} from './utils/parser';
 
 class TransformHandle {
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue
index 552409d38..a2ca173fc 100644
--- a/src/jmapNew/theme/xian_01/menus/index.vue
+++ b/src/jmapNew/theme/xian_01/menus/index.vue
@@ -96,6 +96,9 @@ export default {
 		padding: 0;
 		padding-left: 20px;
 	}
+	.xian-01__systerm.pop-menu .container{
+		border-left: 1px solid #ccc;
+	}
 	.xian-01__systerm.pop-menu .dsp-block {
 		display: block;
 		text-align: left;
diff --git a/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue b/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
index 7ffdf1588..7788ea9a1 100644
--- a/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
+++ b/src/views/iscs/iscsSystem/config/bas/tunnelVentilation.vue
@@ -2,7 +2,7 @@
   <div class="bigSystemBox">
     <div class="title-name">{{ $route.query.stationName }}机电隧道通风</div>
     <div class="">
-      <iscsSystem ref="iscsPlate" :width-canvas="1300" :canvas-height="700" />
+      <iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="700" />
     </div>
   </div>
 </template>
@@ -14,8 +14,22 @@ export default {
     },
     data() {
         return {
+            width: 1300
         };
     },
+    watch: {
+        '$store.state.iscs.selectedCount': function() {
+            const device = this.$store.state.iscs.selected;
+            if (device && device._type === 'IscsButton' && device.function === 'OperatingButton') {
+                this.width = 1300;
+                this.$refs.iscsPlate.show('29');
+            } else if (device && device._type === 'IscsButton' && device.function === 'GoBack') {
+                this.width = 1300;
+                this.$refs.iscsPlate.show('28');
+            }
+            // console.log(this.width, '宽度');
+        }
+    },
     mounted() {
         this.$refs.iscsPlate.show('28');
     },
diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index 864f15923..4e482c72f 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -153,8 +153,9 @@ export default {
             this.$nextTick(() => {
                 // this.width = this.$store.state.config.width;
                 // this.height = this.$store.state.config.height;
-                this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
+                // this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
             });
+            this.$iscs && this.$iscs.resize({ width: this.widthCanvas, height: this.canvasHeight });
         },
         iscsDestroy() {
             if (this.$iscs) {