From 36364f9f26cbbbe414e23678222d699930cce5eb Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Sat, 20 Feb 2021 17:14:52 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A21=20=E9=97=AE=E9=A2=98=EF=BC=9A=E9=81=93=E5=B2=94?=
 =?UTF-8?q?=E5=92=8C=E5=8C=BA=E6=AE=B5=20=E9=80=89=E6=8B=A9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8E=E9=AB=98=E4=BA=AE=E5=9C=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E5=90=8E=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                  |  1 -
 src/jmapNew/shape/Section/EMouse.js | 28 +++++++++++++++-------------
 src/jmapNew/shape/Switch/EMouse.js  | 26 +++++++++++++-------------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 8131e2a24..b616e4738 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -143,7 +143,6 @@ class Jlmap {
             this.$painter.updateScreen(options);
         } else {
             this.$options.update(options);
-			console.log(options, this.$options);
             this.$painter.updateTransform(this.$options);
         }
         if (this.$options.disabled == true) {
diff --git a/src/jmapNew/shape/Section/EMouse.js b/src/jmapNew/shape/Section/EMouse.js
index e7bb0f6de..046a2042e 100644
--- a/src/jmapNew/shape/Section/EMouse.js
+++ b/src/jmapNew/shape/Section/EMouse.js
@@ -154,19 +154,21 @@ class EMouse extends Group {
     }
 
     mouseout(e) {
-        if (this.device.model.switchSection && this.device.model.relSwitchCode) {
-            const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-                instance.mouseEvent.mouseout(e);
-            }
-        }
-        this.TextName && this.TextName.hide();
-        this.sectionTextBorder && this.sectionTextBorder.hide();
-        this.lineBorder && this.lineBorder.hide();
-        const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
-        if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
-            instance.mouseEvent.mouseLeave(e);
-        }
+		if (!this.device.model.down) {
+			if (this.device.model.switchSection && this.device.model.relSwitchCode) {
+				const instance = this.getInstanceByCode(this.device.model.relSwitchCode);
+				if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
+					instance.mouseEvent.mouseout(e);
+				}
+			}
+			this.TextName && this.TextName.hide();
+			this.sectionTextBorder && this.sectionTextBorder.hide();
+			this.lineBorder && this.lineBorder.hide();
+			const instance = this.getInstanceByCode(this.device.model.trainWindowCode);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
+				instance.mouseEvent.mouseLeave(e);
+			}
+		}
     }
 
     mouseEnter(e) {
diff --git a/src/jmapNew/shape/Switch/EMouse.js b/src/jmapNew/shape/Switch/EMouse.js
index 1a69f881f..d1da3c538 100644
--- a/src/jmapNew/shape/Switch/EMouse.js
+++ b/src/jmapNew/shape/Switch/EMouse.js
@@ -71,21 +71,21 @@ class EMouse extends Group {
     }
 
     mouseout(e) {
-        // if (!this.device.model.down) {
-        this.switchBorder && this.switchBorder.hide();
-        this.device.setTextStyle({
-            textFill: this.device.style.backgroundColor
-        });
-        this.textRect && this.textRect.hide();
-        this.device.setState(this.device.model);
+        if (!this.device.model.down) {
+			this.switchBorder && this.switchBorder.hide();
+			this.device.setTextStyle({
+				textFill: this.device.style.backgroundColor
+			});
+			this.textRect && this.textRect.hide();
+			this.device.setState(this.device.model);
 
-        const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
-        const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
-        const instance = this.getInstanceByCode(parentSection.trainWindowCode);
-        if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
-            instance.mouseEvent.mouseLeave(e);
+			const section = store.getters['map/getDeviceByCode'](this.device.model.sectionACode) || {};
+			const parentSection = store.getters['map/getDeviceByCode'](section.parentCode) || {};
+			const instance = this.getInstanceByCode(parentSection.trainWindowCode);
+			if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
+				instance.mouseEvent.mouseLeave(e);
+			}
         }
-        // }
     }
 
     mouseover(e) {

From faf2bc09a1a8de6736ba616714d903fa5e78cc9d Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Sat, 20 Feb 2021 17:24:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A21=20=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue  | 1 -
 src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
index 6b0e6dcef..8daa10ebc 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
@@ -66,7 +66,6 @@ import {commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
-    name: 'ConfirmTip',
     data() {
         return {
             dialogShow: false,
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
index f823e1b03..df1752dc2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
@@ -20,7 +20,7 @@ import OperateConfirm from './dialog/childDialog/operateConfirm';
 import ButtonConfirm from './dialog/childDialog/buttonConfirm';
 
 export default {
-    name: 'StationControlLight',
+    name: 'StationStationLight',
     components: {
         PopMenu,
         PasswordInput,

From 6d7abac8d8c884e10d420afc043b6dd891c36567 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Sat, 20 Feb 2021 18:23:26 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=20=E5=8C=97?=
 =?UTF-8?q?=E4=BA=AC1=20=E5=AE=81=E6=B3=A21=20=E9=97=AE=E9=A2=98=EF=BC=9A?=
 =?UTF-8?q?=20=E5=85=B3=E4=BA=8E=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=B8=A4=E6=AC=A1=E6=93=8D=E4=BD=9C=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=93=8D=E4=BD=9C=E4=B8=AD=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=97=A0=E6=95=85=E9=AB=98=E4=BA=AE=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/map.js                            |  4 ++++
 .../beijing_01/menus/dialog/alxeEffective.vue |  1 +
 .../menus/dialog/routeSelection.vue           |  1 +
 .../menus/dialog/standBackStrategy.vue        |  1 +
 .../beijing_01/menus/dialog/standDetail.vue   |  1 +
 .../menus/dialog/stationCmdControl.vue        |  1 +
 .../menus/dialog/stationHumanControlAll.vue   |  1 +
 .../dialog/stationSetRouteControlAll.vue      |  1 +
 .../beijing_01/menus/dialog/trainDefine.vue   |  4 ++--
 .../beijing_01/menus/dialog/trainDelete.vue   |  1 +
 .../menus/dialog/trainDeletePlan.vue          |  3 +++
 .../beijing_01/menus/dialog/trainEdit.vue     |  4 ++--
 .../beijing_01/menus/dialog/trainFlag.vue     |  4 ++--
 .../beijing_01/menus/dialog/trainMove.vue     |  4 ++--
 .../menus/dialog/trainMoveEvently.vue         |  3 +++
 .../beijing_01/menus/dialog/trainSetHead.vue  |  4 ++--
 .../beijing_01/menus/dialog/trainSetPlan.vue  |  4 ++--
 .../beijing_01/menus/dialog/trainSetWork.vue  |  4 ++--
 src/jmapNew/theme/beijing_01/menus/index.vue  | 19 +++++++++++++++++++
 .../menus/dialog/cancelAllLimit.vue           |  1 +
 .../components/menus/dialog/routeControl.vue  |  1 +
 .../components/menus/dialog/routeDetail.vue   |  1 +
 .../menus/dialog/routeHandControl.vue         |  1 +
 .../menus/dialog/sectionControl.vue           |  1 +
 .../components/menus/dialog/sectionUnLock.vue |  1 +
 .../components/menus/dialog/setFault.vue      |  3 +++
 .../menus/dialog/setTrainOperation.vue        |  3 +++
 .../menus/dialog/speedCmdControl.vue          |  1 +
 .../components/menus/dialog/standControl.vue  |  2 +-
 .../components/menus/dialog/standDetail.vue   |  2 +-
 .../menus/dialog/standJumpStopControl.vue     |  2 +-
 .../components/menus/dialog/standRunLevel.vue |  2 +-
 .../components/menus/dialog/standStopTime.vue |  2 +-
 .../menus/dialog/stationCmdControl.vue        |  1 +
 .../menus/dialog/stationHumanControlAll.vue   |  7 +++++--
 .../dialog/stationSetRouteControlAll.vue      |  1 +
 .../components/menus/dialog/switchControl.vue |  1 +
 .../menus/dialog/switchHookLock.vue           |  1 +
 .../components/menus/dialog/trainAddPlan.vue  |  1 +
 .../components/menus/dialog/trainControl.vue  |  1 +
 .../menus/dialog/trainSpeedLimit.vue          |  1 +
 .../ningbo_01/menus/dialog/alxeEffective.vue  |  1 +
 .../ningbo_01/menus/dialog/buttonDown.vue     |  7 +++++--
 .../dialog/childDialog/buttonConfirm.vue      |  1 +
 .../ningbo_01/menus/dialog/routeSelection.vue |  1 +
 .../ningbo_01/menus/dialog/routerCommand.vue  |  1 +
 .../menus/dialog/sectionAlxeReset.vue         |  7 +++++--
 .../menus/dialog/standBulkBuckleTrain.vue     |  2 +-
 .../menus/dialog/stationBackStrategy.vue      |  1 +
 .../ningbo_01/menus/dialog/stationControl.vue |  1 +
 .../ningbo_01/menus/dialog/trainDefine.vue    |  4 ++--
 .../ningbo_01/menus/dialog/trainDelete.vue    |  1 +
 .../ningbo_01/menus/dialog/trainMove.vue      |  1 +
 .../ningbo_01/menus/dialog/trainSetHead.vue   |  1 +
 .../ningbo_01/menus/dialog/trainSetPlan.vue   |  1 +
 .../ningbo_01/menus/dialog/trainSetWork.vue   |  1 +
 .../menus/dialog/trainSetWorkATP.vue          |  1 +
 .../menus/dialog/turnBackControl.vue          |  1 +
 src/jmapNew/theme/ningbo_01/menus/index.vue   | 19 +++++++++++++++++++
 .../ningbo_01/menus/menuStationStand.vue      | 18 ------------------
 60 files changed, 126 insertions(+), 46 deletions(-)

diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index b616e4738..03c2971a0 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -640,6 +640,10 @@ class Jlmap {
         });
     }
 
+	clearEvent() {
+		this.$zr.curEvent = null;
+	}
+
     clear() {
         this.lineCode = '';
         this.style = {};
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
index 248909bea..40bdfdea3 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
@@ -293,6 +293,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
index 54818b9de..d25914d36 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
@@ -159,6 +159,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.restoreBeforeDevices();
+			this.$root.$emit('dialogClose', this.selected);
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
index 113f6ad75..511f5a541 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
@@ -177,6 +177,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
index 15a9d8250..b2de8a649 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
@@ -232,6 +232,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
index d4b1e7c2c..35dc51e08 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
@@ -225,6 +225,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
index e8673779a..855283f97 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
@@ -75,6 +75,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
index 1a4b552b8..bb8ada826 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
@@ -93,6 +93,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
index 13f7eab80..5a868ad19 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -161,13 +162,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
index 5ff117093..a36d08900 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -105,6 +105,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
index 9c7df6196..04dfa92b5 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
@@ -76,6 +76,7 @@ export default {
                     { required: true, message: '请选择车站', trigger: 'change' }
                 ]
             },
+			selected: null,
             dialogShow: false,
             loading: false
         };
@@ -101,6 +102,7 @@ export default {
         doShow(operate, selected) {
             // 如果不是断点激活，则需要对初始值进行初始化
             this.dialogShow = true;
+			this.selected = selected;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
             });
@@ -108,6 +110,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
index 7eaf6b555..bffcb78f0 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -161,13 +162,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
index 108b62163..91b1de513 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
@@ -101,6 +101,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -140,13 +141,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
index 2d96c86dd..861288b9a 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -161,13 +162,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
index 889a901e4..0d7d9bebb 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
@@ -84,6 +84,7 @@ export default {
                     { required: true, message: '请选择车站', trigger: 'change' }
                 ]
             },
+			selected: null,
             dialogShow: false,
             loading: false
         };
@@ -108,6 +109,7 @@ export default {
     methods: {
         doShow(operate, selected) {
             // 如果不是断点激活，则需要对初始值进行初始化
+			this.selected = selected;
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
@@ -116,6 +118,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
         },
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
index c91975e53..6ca4b3723 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -161,13 +162,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
index b5cb7162b..a6c59a776 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
@@ -91,6 +91,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -143,13 +144,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
index 02c119c25..2921c611d 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
@@ -93,6 +93,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -145,13 +146,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/beijing_01/menus/index.vue b/src/jmapNew/theme/beijing_01/menus/index.vue
index 385ea0189..d6485c8c0 100644
--- a/src/jmapNew/theme/beijing_01/menus/index.vue
+++ b/src/jmapNew/theme/beijing_01/menus/index.vue
@@ -72,6 +72,25 @@ export default {
             this.$store.dispatch('config/updateMenuBar');
             this.$refs['menuSignal'].setRouteSignal();
         });
+
+		this.$root.$on('dialogOpen', e => {
+			if (this.selected == e &&
+				this.selected &&
+				this.selected.instance) {
+				this.selected.instance.__over = true;
+				this.selected.instance.mouseEvent.mouseover();
+			}
+		})
+
+		this.$root.$on('dialogClose', e => {
+			if (this.selected == e &&
+				this.selected &&
+				this.selected.instance) {
+				this.selected.instance.__over = false;
+				this.selected.instance.mouseEvent.mouseout();
+				this.$jlmap.clearEvent();
+			}
+		})
     }
 };
 </script>
diff --git a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
index cf9c350b3..c05595f6a 100644
--- a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
@@ -180,6 +180,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
index 980b92462..91cb6c5db 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
@@ -156,6 +156,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
index ce00fdf0b..dc6032943 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
@@ -141,6 +141,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
index cf3f40f02..ec523db63 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
@@ -209,6 +209,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$refs.tempTable.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
index b2ca65b77..45ad7f771 100644
--- a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
@@ -152,6 +152,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
index 7f070326c..6c878c999 100644
--- a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
@@ -241,6 +241,7 @@ export default {
             this.message = '';
             this.selectedCode = '';
             this.messageText2 = '';
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
             this.timer && clearInterval(this.timer);
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index dbc58b78b..c164a19fe 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -110,6 +110,7 @@ export default {
             },
             groupNumber: '',
             field: '',
+			selected: null,
             rules: {
                 faultType: [
                     { required: true, message: '请选择故障类型', trigger: 'change'}
@@ -171,6 +172,7 @@ export default {
             this.field = field == this.field ? '' : field;
         },
         doShow(operate, selected, judge) {
+			this.selected = selected;
             if (!this.dialogShow) {
                 this.switchName = '';
                 this.stationName = '';
@@ -207,6 +209,7 @@ export default {
             this.dialogShow = false;
             this.form.faultType = '';
             this.$refs.form.resetFields();
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
diff --git a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
index 8518070dc..de47aa62e 100644
--- a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
@@ -93,6 +93,7 @@ export default {
             },
             groupNumber: '',
             field: '',
+			selected: null,
             rules: {
                 groupNumber2: [
                     { required: true, message: '请选择被动车', trigger: 'change'}
@@ -145,6 +146,7 @@ export default {
             this.field = field == this.field ? '' : field;
         },
         doShow(operate, selected) {
+			this.selected = selected;
             if (!this.dialogShow) {
                 this.operation = operate.operation;
                 this.cmdType = operate.cmdType;
@@ -161,6 +163,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$refs.form.resetFields();
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
diff --git a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
index db7250da3..7d6355582 100644
--- a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
@@ -342,6 +342,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
index 0cd8b8b10..4f7117315 100644
--- a/src/jmapNew/theme/components/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -275,7 +275,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.operation = '';
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/standDetail.vue b/src/jmapNew/theme/components/menus/dialog/standDetail.vue
index 53023af28..271828484 100644
--- a/src/jmapNew/theme/components/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standDetail.vue
@@ -216,7 +216,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
index 2dd211086..417b03bcc 100644
--- a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
@@ -246,7 +246,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
index 6d3156a54..7044beffa 100644
--- a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
@@ -292,7 +292,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
index 216caa62b..38280e40b 100644
--- a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
@@ -160,7 +160,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             // mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
index ff98f626a..1159d8702 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
@@ -255,6 +255,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         command() {
diff --git a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
index 1a3f8ca26..2a5dfb80f 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
@@ -47,7 +47,8 @@ export default {
         return {
             dialogShow: false,
             loading: false,
-            operation: null
+            operation: null,
+			selected: null
         };
     },
     computed: {
@@ -72,8 +73,9 @@ export default {
         }
     },
     methods: {
-        doShow(operate) {
+        doShow(operate, selected) {
             if (!this.dialogShow) {
+				this.selected = selected;
                 this.loading = false;
                 this.operation = operate.operation;
             }
@@ -86,6 +88,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
diff --git a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
index 9725b6b3b..2f6096e04 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
@@ -104,6 +104,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
diff --git a/src/jmapNew/theme/components/menus/dialog/switchControl.vue b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
index fad27fc2f..5b7d08234 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
@@ -197,6 +197,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
index 83e16fff3..c1145df09 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchHookLock.vue
@@ -118,6 +118,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
diff --git a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
index efd645a19..31bde3ccf 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
@@ -163,6 +163,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             // this.mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
index 1450e58bb..ca118bac8 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
@@ -313,6 +313,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
         },
diff --git a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
index 13ccf033e..04b49f9e8 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
@@ -111,6 +111,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
index aa774370c..cb406bab8 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -255,6 +255,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
index 3a71065dd..2bfa759e8 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
@@ -45,7 +45,8 @@ export default {
             time: '',
             status: '',
             confirmIndex: false,
-            timer: null
+            timer: null,
+			selected: null
         };
     },
     computed: {
@@ -60,8 +61,9 @@ export default {
 
     },
     methods: {
-        doShow(operate) {
+        doShow(operate,selected) {
             this.message = operate.message || '';
+			this.selected = selected;
             this.dialogShow = true;
             this.confirmIndex = false;
             this.operation = operate.operation;
@@ -71,6 +73,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             if (this.timer) { clearInterval(this.timer); }
         },
         confirm1() {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
index 8daa10ebc..83814b18a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue
@@ -65,6 +65,7 @@
 import {commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+
 export default {
     data() {
         return {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
index b709f72f0..8de4622ba 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -165,6 +165,7 @@ export default {
             this.dialogShow = false;
             this.row = null;
             this.restoreBeforeDevices();
+			this.$root.$emit('dialogClose', this.selected);
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
index 0e80d00c9..69f1f8250 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
@@ -93,6 +93,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
index fd5735ff9..ae097ce7a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
@@ -53,7 +53,8 @@ export default {
             dialogShow: false,
             loading: false,
             operation: '',
-            sectionCode: ''
+            sectionCode: '',
+			selected: null
         };
     },
     computed: {
@@ -91,8 +92,9 @@ export default {
         }
     },
     methods: {
-        doShow(operate) {
+        doShow(operate, selected) {
             if (!this.dialogShow) {
+				this.selected = selected;
                 this.sectionCode = '';
                 this.operation = operate.operation || '';
             }
@@ -104,6 +106,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
         },
         sectionSelectChange() {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
index b2b0baefc..d06e791b3 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
@@ -162,7 +162,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.operation = '';
-			this.$root.$emit('dialogClose');
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
index bdf975809..f3aac2332 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
@@ -146,6 +146,7 @@ export default {
         doClose() {
             this.loading = false;
 			this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
 			this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index 22cac360c..55327a02f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -221,6 +221,7 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.restoreBeforeDevices();
+			this.$root.$emit('dialogClose', this.selected);
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('socket/shiftMsgQueue');
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
index cc506848f..cba5d629b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
@@ -161,13 +162,12 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
     /deep/ .el-row {
         margin: 10px
     }
 
     .ningbo-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
         position: relative;
         left: -5px;
         top: -18px;
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
index 5a073f00c..4bd264aa6 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
@@ -105,6 +105,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
index 5d6039626..c9156a2e9 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
@@ -109,6 +109,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
index 97b22964b..12f9d9f36 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
@@ -114,6 +114,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
index 4c7dd7a09..ce3abf05f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
@@ -116,6 +116,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
index 27933cb06..f526e9b6e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
@@ -90,6 +90,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
index 451bf2818..39b1540a4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
@@ -104,6 +104,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
             mouseCancelState(this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
index 61e031580..7d0c1970f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
@@ -130,6 +130,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
index 5cca49624..43f203077 100644
--- a/src/jmapNew/theme/ningbo_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -83,6 +83,25 @@ export default {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
         });
+
+		this.$root.$on('dialogOpen', e => {
+			if (this.selected == e &&
+				this.selected &&
+				this.selected.instance) {
+				this.selected.instance.__over = true;
+				this.selected.instance.mouseEvent.mouseover();
+			}
+		})
+
+		this.$root.$on('dialogClose', e => {
+			if (this.selected == e &&
+				this.selected &&
+				this.selected.instance) {
+				this.selected.instance.__over = false;
+				this.selected.instance.mouseEvent.mouseout();
+				this.$jlmap.clearEvent();
+			}
+		})
     }
 };
 </script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index 3898f70c0..d60c8fd59 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -175,24 +175,6 @@ export default {
             }
         }
     },
-	mounted() {
-		this.$root.$on('dialogOpen', e => {
-			if (this.selected == e &&
-				this.selected &&
-				this.selected.instance) {
-				this.selected.instance.__over = true;
-				this.selected.instance.mouseEvent.mouseover();
-			}
-	})
-
-		this.$root.$on('dialogClose', e => {
-			if (this.selected &&
-				this.selected.instance) {
-				this.selected.instance.__over = false;
-				this.selected.instance.mouseEvent.mouseout();
-			}
-		})
-	},
     methods: {
         clickEvent() {
             const self = this;

From 48b1bc9ae4fa0ddeb76b01bf2d6249e66b124881 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Mon, 22 Feb 2021 09:19:20 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A21=20=E9=97=AE=E9=A2=98=EF=BC=9A=201.=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=90=8E=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=EF=BC=9B=202.=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=96=87=E5=AD=97=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/ningbo_01.js                   | 7 ++++---
 .../theme/ningbo_01/menus/menuDialog/areaSelection.vue     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 8def6e6ec..60fbf2370 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -252,10 +252,11 @@ class SkinCode extends defaultStyle {
                     distance: 46,								// 控制模式之间灯之间的距离
                     grayColor: '#C0C0C0',						// 控制模式灰色
                     greenColor: 'green',						// 控制模式绿色
-                    redColor: 'red',						// 控制模式红色
+                    redColor: 'red',							// 控制模式红色
                     yellowColor: 'yellow',						// 控制模式黄色
-                    stroke: '#FFFFFF', // 框的颜色
-                    fill: 'rgba(0,0,0,0)' // 填充色
+                    stroke: '#FFFFFF', 							// 框的颜色
+                    fill: 'rgba(0,0,0,0)', 						// 填充色
+					textColorNoChange: true
                 },
                 emergencyControl: {									// 紧急站控
                     show: true,
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
index 9864740aa..405664b91 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
@@ -174,7 +174,7 @@ export default {
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
-                    // this.doClose();
+                    this.doClose();
                 }
             });
         }

From 1d41095b46edee6e558bedf3f2e032e791d47515 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Feb 2021 10:13:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=20=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E5=87=BD=E6=95=B0=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20=E5=AE=81=E6=B3=A2=E4=B8=89=E5=8F=B7=E7=BA=BF=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E6=9D=83=E8=BD=AC=E7=A7=BB=20=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=8E=A7=E5=88=B6=E4=BB=A3=E7=A0=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/config/skinCode/ningbo_03.js      |  3 +-
 src/jmapNew/theme/beijing_01/planConvert.js   |  5 ++-
 src/jmapNew/theme/chengdu_01/planConvert.js   |  5 ++-
 src/jmapNew/theme/chengdu_03/planConvert.js   |  5 ++-
 src/jmapNew/theme/foshan_01/planConvert.js    |  5 ++-
 src/jmapNew/theme/fuzhou_01/planConvert.js    |  5 ++-
 src/jmapNew/theme/haerbin_01/planConvert.js   |  5 ++-
 src/jmapNew/theme/nanjing_02/planConvert.js   |  5 ++-
 src/jmapNew/theme/ningbo_01/planConvert.js    |  4 ++-
 .../menus/menuDialog/standDetain.vue          |  7 +++-
 .../menus/menuDialog/stationRequest.vue       | 33 ++++++++++---------
 src/jmapNew/theme/ningbo_03/planConvert.js    |  5 ++-
 src/jmapNew/theme/race_01/planConvert.js      |  5 ++-
 src/jmapNew/theme/xian_01/planConvert.js      |  5 ++-
 src/jmapNew/theme/xian_02/planConvert.js      |  5 ++-
 15 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js
index 57517f7cf..ac57e4a03 100644
--- a/src/jmapNew/config/skinCode/ningbo_03.js
+++ b/src/jmapNew/config/skinCode/ningbo_03.js
@@ -241,7 +241,8 @@ class SkinCode extends defaultStyle {
                 borderColor:'', // 字体边框颜色
                 textBorderWidth:0, // 字体边框宽度
                 isSpecialType:true, // 特雷兹特殊类型
-                noneModeColor:'#ff0' // 无模式时字体颜色
+                noneModeColor:'#ff0', // 无模式时字体颜色
+                currentModeColor:'#0f0' // 当前被控制时字体颜色
             },
 
             kmPostShow: false,										// 公里标显示
diff --git a/src/jmapNew/theme/beijing_01/planConvert.js b/src/jmapNew/theme/beijing_01/planConvert.js
index 8b191f6ab..204947410 100644
--- a/src/jmapNew/theme/beijing_01/planConvert.js
+++ b/src/jmapNew/theme/beijing_01/planConvert.js
@@ -152,7 +152,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/chengdu_01/planConvert.js b/src/jmapNew/theme/chengdu_01/planConvert.js
index efd829f05..5dc1696f8 100644
--- a/src/jmapNew/theme/chengdu_01/planConvert.js
+++ b/src/jmapNew/theme/chengdu_01/planConvert.js
@@ -152,7 +152,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/chengdu_03/planConvert.js b/src/jmapNew/theme/chengdu_03/planConvert.js
index 05c33d047..b401381ac 100644
--- a/src/jmapNew/theme/chengdu_03/planConvert.js
+++ b/src/jmapNew/theme/chengdu_03/planConvert.js
@@ -127,7 +127,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/foshan_01/planConvert.js b/src/jmapNew/theme/foshan_01/planConvert.js
index 41fa7a3ba..c1645c6b1 100644
--- a/src/jmapNew/theme/foshan_01/planConvert.js
+++ b/src/jmapNew/theme/foshan_01/planConvert.js
@@ -147,7 +147,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/fuzhou_01/planConvert.js b/src/jmapNew/theme/fuzhou_01/planConvert.js
index 8121b8f53..885344ca4 100644
--- a/src/jmapNew/theme/fuzhou_01/planConvert.js
+++ b/src/jmapNew/theme/fuzhou_01/planConvert.js
@@ -327,7 +327,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle));
                             if (model) {
diff --git a/src/jmapNew/theme/haerbin_01/planConvert.js b/src/jmapNew/theme/haerbin_01/planConvert.js
index 15244247a..8dc000647 100644
--- a/src/jmapNew/theme/haerbin_01/planConvert.js
+++ b/src/jmapNew/theme/haerbin_01/planConvert.js
@@ -209,7 +209,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             // var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle));
                             if (model) {
diff --git a/src/jmapNew/theme/nanjing_02/planConvert.js b/src/jmapNew/theme/nanjing_02/planConvert.js
index ab805878b..dc9c54f56 100644
--- a/src/jmapNew/theme/nanjing_02/planConvert.js
+++ b/src/jmapNew/theme/nanjing_02/planConvert.js
@@ -217,7 +217,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             // var model = createSeriesModel(opt, Object.assign({ color: '#000' }, lineStyle));
                             if (model) {
diff --git a/src/jmapNew/theme/ningbo_01/planConvert.js b/src/jmapNew/theme/ningbo_01/planConvert.js
index 89f9f257d..7a2b3ba9c 100644
--- a/src/jmapNew/theme/ningbo_01/planConvert.js
+++ b/src/jmapNew/theme/ningbo_01/planConvert.js
@@ -174,7 +174,9 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
index 4f38c81b1..7a7cc1c7b 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
@@ -186,8 +186,13 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (isClose) {
                         this.$store.dispatch('menuOperation/setSelected', {device: {}});
+                        this.doClose();
+                    } else {
+                        if (this.activeName == 'second') {
+                            // this.judgeStatus();
+                            this.status = !this.status;
+                        }
                     }
-                    isClose && this.doClose();
                 }
             }).catch(() => {
                 isClose && this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
index db1a063e5..d9e99cca2 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
@@ -21,10 +21,10 @@
     <div class="message" style="color:#ff0000;font-size:14px;margin-left:10px">{{ message }}</div>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="status==''" @click="commit(true)">确定(O)</el-button>
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="status" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdApply" :disabled="status==''" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" :disabled="status" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -50,7 +50,7 @@ export default {
     },
     data() {
         return {
-            status: '',
+            status: true,
             operate: null,
             loading: false,
             dialogShow: false,
@@ -107,16 +107,13 @@ export default {
         'selected': function(val) {
             if (val) {
                 const sationEle = this.$store.getters['map/getDeviceByCode'](val.code);
-                if (this.prdType == '01' && sationEle && sationEle.controlMode == 'Center') {
-                    this.status = 'Center';
-                } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') {
-                    this.status = 'Local';
+                if (sationEle) {
+                    if (sationEle.controller != this.$store.state.user.id) {
+                        this.status = false;
+                    } else {
+                        this.status = true;
+                    }
                 }
-                // if (this.prdType == '02') {
-                //
-                // } else {
-                //     this.status = sationEle && sationEle.controlMode == 'Center';
-                // }
             }
         }
     },
@@ -165,20 +162,24 @@ export default {
             });
         },
         commit(isClose = true) {
-            debugger;
             const val = this.selected || {};
             const steps = {
                 operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                 over: true,
                 param: {stationCodes:[val.code]}
             };
-
+            // CMD_STATION_CONTROL_TRANSFER
+            // CMD_STATION_CONTROL_DEVOLVE
+            // CMD_STATION_CONTROL_REVOKE
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
-            steps.cmdType = this.status == 'Center' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+            steps.cmdType = CMD.Station.CMD_STATION_CONTROL_APPLY;
 
             this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
                 if (valid) {
-                    isClose && this.doClose();
+                    if (isClose) {
+                        this.$store.dispatch('menuOperation/setSelected', {device: {}});
+                        this.doClose();
+                    }
                     this.$emit('commandSuccess', val.code);
                 }
             }).catch(() => {
diff --git a/src/jmapNew/theme/ningbo_03/planConvert.js b/src/jmapNew/theme/ningbo_03/planConvert.js
index f6a32c79d..7fc493075 100644
--- a/src/jmapNew/theme/ningbo_03/planConvert.js
+++ b/src/jmapNew/theme/ningbo_03/planConvert.js
@@ -212,7 +212,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/race_01/planConvert.js b/src/jmapNew/theme/race_01/planConvert.js
index 0571f01d7..859ae8d99 100644
--- a/src/jmapNew/theme/race_01/planConvert.js
+++ b/src/jmapNew/theme/race_01/planConvert.js
@@ -149,7 +149,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/xian_01/planConvert.js b/src/jmapNew/theme/xian_01/planConvert.js
index 316b24446..c4728cbd9 100644
--- a/src/jmapNew/theme/xian_01/planConvert.js
+++ b/src/jmapNew/theme/xian_01/planConvert.js
@@ -162,7 +162,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);
diff --git a/src/jmapNew/theme/xian_02/planConvert.js b/src/jmapNew/theme/xian_02/planConvert.js
index 1d9f23f58..945bc8fbd 100644
--- a/src/jmapNew/theme/xian_02/planConvert.js
+++ b/src/jmapNew/theme/xian_02/planConvert.js
@@ -216,7 +216,10 @@ export default {
                         /** 如果是备用车，按车次添加线*/
                         if (train.backup) {
                             /** 创建一条完成的服务数据*/
-                            opt.name += j;
+                            // opt.name += j;
+                            const length = opt.name.length;
+                            const optName = parseInt(opt.name) + j;
+                            opt.name = optName.toString().padStart(length, '0');
                             var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
                             if (model) {
                                 models.push(model);

From 4b8782cf0547e8af2a399d0b0c9306113b795878 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Feb 2021 10:15:01 +0800
Subject: [PATCH 6/6] =?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

---
 src/jmapNew/shape/Station/index.js            | 34 +++++++++++--------
 src/jmapNew/theme/ningbo_03/menus/menuBar.vue | 22 +++++++++++-
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 878fe4cba..4bb97ecbc 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -386,9 +386,7 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor);
         this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色
-        if (this.style.Station.stationText.isSpecialType) {
-            // simulationRoleList
-        } else {
+        if (!this.style.Station.stationText.isSpecialType) {
             this.stationText.setColor('#1fdc1f');
         }
 
@@ -417,9 +415,7 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
-        if (this.style.Station.stationText.isSpecialType) {
-
-        } else {
+        if (!this.style.Station.stationText.isSpecialType) {
             this.stationText.setColor('#fff');
         }
     }
@@ -437,9 +433,7 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
-        if (this.style.Station.stationText.isSpecialType) {
-
-        } else {
+        if (!this.style.Station.stationText.isSpecialType) {
             this.stationText.setColor('#fff');
         }
     }
@@ -462,9 +456,6 @@ export default class Station extends Group {
         if (this.style.Station.stationText.noneModeFlash) {
             this.stationText.setAnimateStyle(this.noneBeforeMode);
         }
-        if (this.style.Station.stationText.isSpecialType) {
-            this.stationText.setColor(this.style.Station.stationText.noneModeColor);
-        }
     }
 
     recover() {
@@ -480,7 +471,8 @@ export default class Station extends Group {
         this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         if (this.style.Station.stationText.isSpecialType) {
-
+            this.stationText.setColor(this.style.Station.stationText.noneModeColor);
+            // sationEle.controller
         } else {
             this.stationText && this.stationText.stopAnimate();
         }
@@ -491,6 +483,8 @@ export default class Station extends Group {
         if (!this.isShowShape) return;
         this.recover();
         model.controlMode && this['handle' + model.controlMode]();
+        model.controller && this.handleComplexControl(model.controller);
+
         if (this.style.Station.syncCentralizeStation && model.controlMode && model.centralized) {
             model.chargeStationCodeList.forEach(item => {
                 const device = store.getters['map/getDeviceByCode'](item);
@@ -509,6 +503,16 @@ export default class Station extends Group {
         }
     }
 
+    handleComplexControl(controller) {
+        // debugger;
+        // store.state.user.id
+        // if (controller == ) {
+        //     this.stationText.setColor(this.style.Station.stationText.currentModeColor);
+        // } else {
+        //     debugger;
+        // }
+    }
+
     // setState(model) {
     //     if (!this.isShowShape) return;
     //     // // 新版地图使用新版状态变更方式
@@ -574,11 +578,11 @@ export default class Station extends Group {
             this.on('mouseout', e => { this.EMouse.mouseout(e); });
             this.on('mouseover', e => { this.EMouse.mouseover(e); });
         } else if (this.style.Station.StationControl.mouseOverStyle) {
-			this.EMouse = new EMouse(this);
+            this.EMouse = new EMouse(this);
             this.add(this.EMouse);
             this.on('mouseout', e => { this.EMouse.mouseout(e); });
             this.on('mouseover', e => { this.EMouse.mouseover(e); });
-		}
+        }
     }
     setShowMode() {
     }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index d72b16f29..a20f1103d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -1311,7 +1311,10 @@ export default {
         ]),
         ...mapGetters('map', [
             'stationList'
-        ])
+        ]),
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
     },
     watch: {
         tempClassA() {
@@ -1336,12 +1339,29 @@ export default {
         },
         '$store.state.training.prdType': function () {
             this.initMenu();
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) {
+                this.checkRoleChange(list);
+            }
+        },
+        '$store.state.training.simulationUserList':function(list) {
+            debugger;
         }
+
     },
     mounted() {
         this.initMenu();
     },
     methods: {
+        checkRoleChange(list) {
+            list.forEach(item => {
+                if ((item.messageType === 'PLAY_CHANGE' || item.messageType == 'ONLINE') && item.userId == this.userId ) {
+                    // this.switchShowStation(this.centralizedMap[item.deviceCode]);
+                }
+            });
+        },
+
         handleShow(item) {
             if (item.hide) {
                 return false;