merge

src/jmapNew/config/skinCode/ningbo_01.js

@@ -255,7 +255,8 @@ class SkinCode extends defaultStyle {
                     redColor: 'red',							// 控制模式红色
                     yellowColor: 'yellow',						// 控制模式黄色
                     stroke: '#FFFFFF', 							// 框的颜色
-                    fill: 'rgba(0,0,0,0)' // 填充色
+                    fill: 'rgba(0,0,0,0)', 						// 填充色
+					textColorNoChange: true
                 },
                 emergencyControl: {									// 紧急站控
                     show: true,

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,										// 公里标显示

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) {
@@ -641,6 +640,10 @@ class Jlmap {
         });
     }
 
+	clearEvent() {
+		this.$zr.curEvent = null;
+	}
+
     clear() {
         this.lineCode = '';
         this.style = {};

src/jmapNew/shape/Section/EMouse.js

@@ -154,6 +154,7 @@ class EMouse extends Group {
     }
 
     mouseout(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) {
@@ -168,6 +169,7 @@ class EMouse extends Group {
 				instance.mouseEvent.mouseLeave(e);
 			}
 		}
+    }
 
     mouseEnter(e) {
         this.TextName && this.TextName.show();

src/jmapNew/shape/Station/index.js

@@ -414,9 +414,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) {
+        if (!this.style.Station.stationText.isSpecialType) {
-            // simulationRoleList
-        } else {
             this.stationText.setColor('#1fdc1f');
         }
 
@@ -445,9 +443,7 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
-        if (this.style.Station.stationText.isSpecialType) {
+        if (!this.style.Station.stationText.isSpecialType) {
-
-        } else {
             this.stationText.setColor('#fff');
         }
     }
@@ -465,9 +461,7 @@ export default class Station extends Group {
         //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
         //     }
         // }
-        if (this.style.Station.stationText.isSpecialType) {
+        if (!this.style.Station.stationText.isSpecialType) {
-
-        } else {
             this.stationText.setColor('#fff');
         }
     }
@@ -490,9 +484,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() {
@@ -508,7 +499,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();
         }
@@ -519,6 +511,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);
@@ -537,6 +531,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;
     //     // // 新版地图使用新版状态变更方式

src/jmapNew/shape/Switch/EMouse.js

@@ -71,7 +71,7 @@ class EMouse extends Group {
     }
 
     mouseout(e) {
-        // if (!this.device.model.down) {
+        if (!this.device.model.down) {
 			this.switchBorder && this.switchBorder.hide();
 			this.device.setTextStyle({
 				textFill: this.device.style.backgroundColor
@@ -85,7 +85,7 @@ class EMouse extends Group {
 			if (instance && instance.mouseEvent && instance.mouseEvent.mouseLeave) {
 				instance.mouseEvent.mouseLeave(e);
 			}
-        // }
+        }
     }
 
     mouseover(e) {

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);
         },

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);

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);
         },

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);
         },

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);
         },

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);
         },

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);
         },

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;

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);

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);
         },

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;

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;

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;

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);
         },

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;

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;

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;

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>

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);

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);

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);

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);
         },

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);
         },

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);
         },

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);

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);
         },

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);

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() {

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() {

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);
         },

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);
         },

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);
         },

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);
         },

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);
         },

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);
         },

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() {

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() {

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() {

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);
         },

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() {

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);

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);
         },

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);
         },

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);

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) {

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) {

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) {

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);
         },

src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/buttonConfirm.vue

@@ -65,8 +65,8 @@
 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,

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);

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);
         },

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() {

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);
         },

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');
         },

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');

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;

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);

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);

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);

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);

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);

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);

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);
         },

src/jmapNew/theme/ningbo_01/menus/index.vue

@@ -86,6 +86,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>

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();
                 }
             });
         }

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,

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;

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);

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;

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();

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') {
+                if (sationEle) {
-                    this.status = 'Center';
+                    if (sationEle.controller != this.$store.state.user.id) {
-                } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') {
+                        this.status = false;
-                    this.status = 'Local';
+                    } 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(() => {

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);

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);

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);

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);