Merge remote-tracking branch 'origin/test'

src/jmapNew/config/skinCode/ningbo_03.js

@@ -262,6 +262,7 @@ class SkinCode extends defaultStyle {
                 lampSpace: 60 // 灯间距
             },
             StationControl: {
+				disPlayNone: true, // 不显示
                 text: {
                     distance: 12,								// 灯和文字之间的距离
                     fontSize: 12,								// 字体大小

src/jmapNew/map.js

@@ -248,8 +248,8 @@ class Jlmap {
         this.$painter.setLevelVisible(list);
     }
 
-    render(list) {
+    render(list = []) {
-        (list || []).forEach(elem => {
+        list.forEach(elem => {
             const code = elem.code;
             const type = elem._type;
             // const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@@ -304,46 +304,9 @@ class Jlmap {
         return false;
 	}
 
-    // 后处理
+    setUpdateMapDevice(list = []) {
-    postHandle(list) {
-        list.forEach(elem => {
-            const code = elem.code;
-            const type = elem._type;
-            if (type == deviceType.Switch) {
-                const item = this.mapDevice[code];
-                if (item) {
-                    const sectionA = this.mapDevice[item.sectionACode];
-                    const sectionB = this.mapDevice[item.sectionBCode];
-                    const sectionC = this.mapDevice[item.sectionCCode];
-                    if (sectionA && sectionB && sectionC) {
-                        item['cutOff'] = sectionA.cutOff;
-                    }
-                }
-
-                this.$painter.update(item);
-            }
-
-            if (type == deviceType.Section) {
-                const item = this.mapDevice[code];
-                if (item) {
-                    const swch = this.mapDevice[item.relSwitchCode];
-                    if (swch) {
-                        const sectionA = this.mapDevice[swch.sectionACode];
-                        const sectionB = this.mapDevice[swch.sectionBCode];
-                        const sectionC = this.mapDevice[swch.sectionCCode];
-                        if (sectionA && sectionB && sectionC) {
-                            swch['cutOff'] = sectionA.cutOff;
-                        }
-
-                        this.$painter.update(swch);
-                    }
-                }
-            }
-        });
-    }
-    setUpdateMapDevice(list) {
         store.commit('map/updateMapDevice', list);
-        (list || []).forEach(elem => {
+        list.forEach(elem => {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
@@ -351,9 +314,9 @@ class Jlmap {
         });
     }
     // 模式选择 -> 更新
-    updateShowMode(list, showMode) {
+    updateShowMode(list=[], showMode=false) {
         this.showConfig.showMode = showMode;
-        (list || []).forEach(elem => {
+        list.forEach(elem => {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@@ -365,9 +328,9 @@ class Jlmap {
     getShowConfig() {
         return this.showConfig;
     }
-    updateShowStation(list, stationCode) {
+    updateShowStation(list=[], stationCode=false) {
         this.stationCode = stationCode;
-        (list || []).forEach(elem => {
+        list.forEach(elem => {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@@ -418,10 +381,10 @@ class Jlmap {
             });
         }
     }
-    updatePrdType(list, val, showMode) {
+    updatePrdType(list = [], val = '', showMode = false) {
         this.showConfig.prdType = val;
         this.showConfig.showMode = showMode;
-        (list || []).forEach(item => {
+        list.forEach(item => {
             const code = item.code;
             const type = item._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, item, this.showConfig);
@@ -430,13 +393,17 @@ class Jlmap {
             this.$painter.updateShowMode(oDevice);
         });
     }
-    update(list) {
+    update(list=[]) {
-        this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
+		this.setUpdateMapDevice(list); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
+		const codeList = [];
         const controlTransferList = [];
 		const signalDeviceList = [];
-        (list || []).forEach((elem, index) => {
+		const selected = store.state.menuOperation.selected;
+
+        list.forEach((elem, index) => {
             const code = elem.code;
 			const type = elem._type;
+
             if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态
                 store.dispatch('map/updateRouteState', elem);
                 const route = this.logicData.routeData[code];
@@ -501,6 +468,34 @@ class Jlmap {
                         psdDevice.fault = elem.fault;
                         this.$painter.update(psdDevice);
                     }
+                } else if (elem.deviceType == 'SWITCH') {
+					const oDevice = this.mapDevice[code]
+					if (oDevice) {
+						const sectionA = this.mapDevice[oDevice.sectionACode];
+						const sectionB = this.mapDevice[oDevice.sectionBCode];
+						const sectionC = this.mapDevice[oDevice.sectionCCode];
+						if (sectionA && sectionB && sectionC) {
+							oDevice['cutOff'] = sectionA.cutOff;
+						}
+					}
+
+					this.$painter.update(oDevice);
+				} else if (elem.deviceType == 'SECTION') {
+					const oDevice = this.mapDevice[code]
+					if (oDevice) {
+						const sDevice = this.mapDevice[oDevice.relSwitchCode];
+						if (sDevice) {
+							const sectionA = this.mapDevice[sDevice.sectionACode];
+							const sectionB = this.mapDevice[sDevice.sectionBCode];
+							const sectionC = this.mapDevice[sDevice.sectionCCode];
+							if (sectionA && sectionB && sectionC) {
+								sDevice['cutOff'] = sectionA.cutOff;
+							}
+
+							this.$painter.update(sDevice);
+							codeList.push(sDevice.code);
+						}
+					}
 				} else if (elem.deviceType === 'DIRECTION_ROD' && elem.uniqueCode) {
                     store.state.map.map.directionRodList.forEach(item => {
                         if (elem.uniqueCode === item.uniqueCode) {
@@ -510,6 +505,7 @@ class Jlmap {
                         }
                     });
 				}
+
 				const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
                 if (elem.dispose) {
                     this.$painter.delete(oDevice);
@@ -517,6 +513,8 @@ class Jlmap {
                     this.$painter.update(oDevice);
 				}
 			}
+
+			codeList.push(code);
         });
 
         if (controlTransferList.length > 0) {
@@ -527,9 +525,12 @@ class Jlmap {
             store.dispatch('map/setActiveTrainList');
             this.isUpdateShowTrainList = false;
 		}
+
+		if (selected && codeList.includes(selected.code)) {
+			store.commit('menuOperation/setSelected', {device: {...selected}});
+		}
+
         this.handleRouteSignalStatus(signalDeviceList);
-        // 状态后处理
-        this.postHandle(list || []);
 
         if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
     }

src/jmapNew/shape/StationTurnBack/index.js

@@ -157,7 +157,13 @@ export default class StationTurnBack extends Group {
             });
         }
     }
-
+    getShapeTipPoint() {
+        const rect = this.control.getBoundingRect();
+        return {
+            x: rect.x + rect.width,
+            y: rect.y
+        };
+    }
     setShowMode() {
         const showMode = this.model.showMode;
         const showConditions = (this.style.StationTurnBack || {}).displayCondition;

src/jmapNew/shape/Switch/index.js

@@ -604,13 +604,25 @@ export default class Switch extends Group {
         this.name.getNameText().setStyle({textFill: '#7F7F7F'});
     }
     preReset(normalPosition, reversePosition ) {
-        if (this.style.Switch.coverBlock.preResetColor) { // 范围且封锁时显示
+        const coverBlock = this.style.Switch.coverBlock;
+        if (coverBlock && coverBlock.preResetColor) { // 范围且封锁时显示
             if (normalPosition) {
                 this.shapeModelB.show();
-                this.shapeModelB.setColor(this.style.Switch.coverBlock.preResetColor);
+                this.shapeModelB.setColor(coverBlock.preResetColor);
             } else if (reversePosition) {
                 this.shapeModelA.show();
-                this.shapeModelA.setColor(this.style.Switch.coverBlock.preResetColor);
+                this.shapeModelA.setColor(coverBlock.preResetColor);
+            }
+        } else {
+            const sectionReset = this.style.Section.sectionMiddle;
+            if (sectionReset && sectionReset.preResetColor) {
+                if (normalPosition) {
+                    this.shapeModelB.show();
+                    this.shapeModelB.setColor(sectionReset.preResetColor);
+                } else if (reversePosition) {
+                    this.shapeModelA.show();
+                    this.shapeModelA.setColor(sectionReset.preResetColor);
+                }
             }
         }
     }

src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue

@@ -229,11 +229,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         stopTask() {
             if (this.task) {

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue

@@ -74,11 +74,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue

@@ -92,11 +92,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue

@@ -112,11 +112,6 @@ export default {
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operate.operateNext) : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue

@@ -48,11 +48,6 @@ export default {
             return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, messages) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue

@@ -113,11 +113,6 @@ export default {
             return disabled;
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         getProtectedSectionName(row) {
             let name = '';

src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue

@@ -114,11 +114,6 @@ export default {
             return '变通策略管理';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(selected, opts) {
             this.tempData = [];

src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue

@@ -166,11 +166,6 @@ export default {
             return '站台详细信息';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(selected, opts) {
             this.tempData = [];

src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue

@@ -179,9 +179,6 @@ export default {
         }
     },
     mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
         this.timer = setInterval(() => {
             if (!this.$store.state.menuOperation.break) {
                 if (this.timeCountCommand > 0) {

src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue

@@ -59,11 +59,6 @@ export default {
             return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue

@@ -73,11 +73,6 @@ export default {
             return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue

@@ -87,11 +87,6 @@ export default {
             return '定义车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue

@@ -81,11 +81,6 @@ export default {
             return '删除车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
             if (map) {

src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue

@@ -97,11 +97,6 @@ export default {
             return '删除计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 如果不是断点激活，则需要对初始值进行初始化

src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue

@@ -87,11 +87,6 @@ export default {
             return '修改计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue

@@ -79,11 +79,6 @@ export default {
             return 'ATP切除功能';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue

@@ -87,11 +87,6 @@ export default {
             return '平移车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue

@@ -105,11 +105,6 @@ export default {
             return '平移计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 如果不是断点激活，则需要对初始值进行初始化

src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue

@@ -87,11 +87,6 @@ export default {
             return '设置头码车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue

@@ -79,11 +79,6 @@ export default {
             return '设置计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue

@@ -71,11 +71,6 @@ export default {
             return '设置人工车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/beijing_01/menus/menuButton.vue

@@ -293,9 +293,6 @@ export default {
         }
     },
     watch: {
-        '$store.state.config.canvasOffsetCount': function (val) {
-            this.resetPosition();
-        },
         '$store.state.menuOperation.buttonOperation': function (val, old) {
             this.updateButtonShow(val, old);
         },
@@ -303,15 +300,7 @@ export default {
             this.selectedChange();
         }
     },
-    mounted() {
-        this.resetPosition();
-    },
     methods: {
-        resetPosition() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            });
-        },
         updateButtonShow(val, old) {
             if (old) {
                 // 恢复旧按钮显示

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue

@@ -73,11 +73,6 @@ export default {
             return [];
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, message) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue

@@ -93,11 +93,6 @@ export default {
             return '增加用户';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             // 非断电激活时设置初始值

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue

@@ -65,11 +65,6 @@ export default {
             return '删除用户';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 非断电激活时设置初始值

src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue

@@ -101,11 +101,6 @@ export default {
             return '用户编辑页面';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 非断电激活时设置初始值

src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue

@@ -81,11 +81,6 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -81,11 +81,6 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue

@@ -73,11 +73,6 @@ export default {
             return '关于ControlMonitor';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             // 非断电激活时设置初始值

src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue

@@ -121,11 +121,6 @@ export default {
             return '用户管理';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             // 非断电激活时设置初始值

src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue

@@ -106,11 +106,6 @@ export default {
             });
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.message = '';

src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue

@@ -96,11 +96,6 @@ export default {
             return '添加计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue

@@ -79,11 +79,6 @@ export default {
             return '删除计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue

@@ -96,11 +96,6 @@ export default {
             return '平移计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue

@@ -140,11 +140,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue

@@ -59,11 +59,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue

@@ -186,11 +186,6 @@ export default {
             return '设备标签';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue

@@ -181,9 +181,6 @@ export default {
         }
     },
     mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
         this.timer = setInterval(() => {
             if (!this.$store.state.menuOperation.break) {
                 if (this.timeCountCommand > 0) {

src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue

@@ -181,11 +181,6 @@ export default {
             return list;
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(step, selected) {
             // this.operate = operate || {};

src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue

@@ -62,11 +62,6 @@ export default {
             return [];
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.domIdConfirm = '';

src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue

@@ -93,11 +93,6 @@ export default {
             return '增加用户';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             // 非断电激活时设置初始值

src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue

@@ -67,11 +67,6 @@ export default {
             return '删除用户';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 非断电激活时设置初始值

src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue

@@ -101,11 +101,6 @@ export default {
             return '用户编辑页面';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             // 非断电激活时设置初始值

src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue

@@ -100,11 +100,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(position) {
             // this.operate = operate || {};

src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue

@@ -141,11 +141,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue

@@ -59,11 +59,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};
@@ -83,7 +78,7 @@ export default {
         },
         cancel() {
             const operate = {
-                operation: this.operate.type,
+                // operation: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
 

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue

@@ -70,11 +70,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue

@@ -75,11 +75,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue

@@ -92,11 +92,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue

@@ -112,11 +112,6 @@ export default {
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue

@@ -48,11 +48,6 @@ export default {
             return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, messages) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue

@@ -118,11 +118,6 @@ export default {
             return '查询进路状态';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected, tempData) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue

@@ -130,11 +130,6 @@ export default {
             'mapConfig'
         ])
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         getProtectedSectionName(row) {
             let name = '';

src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue

@@ -123,11 +123,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected, tempData) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue

@@ -138,11 +138,6 @@ export default {
             'mapConfig'
         ])
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         getProtectedSectionName(row) {
             let name = '';

src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue

@@ -69,11 +69,6 @@ export default {
             return '无岔区段属性对话框';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue

@@ -26,23 +26,26 @@
       >
         <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
         <el-row style="margin-top: -13px;">
-          <el-radio-group :id="domIdDetainCar" v-model="radio" @change="choose">
+          <el-radio-group  v-model="radio" @change="choose">
             <el-col :span="24">
               <el-radio
+			   :id="domIdDetainCar"
                 label="01"
                 style="display: block; text-align: left; float: left; margin-right: 10px;"
               >本站台
               </el-radio>
               <el-radio
+			    :id="isUpDirection? domIdDetainChoose: ''"
                 v-if="radio1 == 2"
                 :disabled="!isUpDirection"
-                label="02"
+                :label="`${isUpDirection}`"
                 style="display: block; text-align: left; float: left; margin-right: 10px;"
               >上行全线
               </el-radio>
               <el-radio
+			    :id="isUpDirection ? '': domIdDetainChoose"
                 v-if="radio1 == 2"
-                label="03"
+                :label="`${!isUpDirection}`"
                 :disabled="isUpDirection"
                 style="display: block; text-align: left; float: left;"
               >下行全线</el-radio>
@@ -297,6 +300,9 @@ export default {
         domIdDetainCar() {
             return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
 		},
+		domIdDetainChoose() {
+			return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
+		},
         domIdChoose() {
             if (this.radio1 == '1') { // 跳停
                 return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
@@ -380,11 +386,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected, tempDate = null) {
             this.selected = selected;
@@ -434,7 +435,9 @@ export default {
         },
         choose(upDown) { // 取消扣车 请求code码
             const operate = {
-                operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
+				operation: upDown == '01'
+					? OperationEvent.StationStand.cancelDetainTrain.choose.operation
+					: OperationEvent.Command.common.choose.operation,
                 val: this.radio
             };
             if (this.radio == '02' || this.radio == '03') {

src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue

@@ -130,11 +130,6 @@ export default {
             return '站台信息';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(selected, opts) {
             this.tempData = [];

src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue

@@ -196,11 +196,6 @@ export default {
 
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
         },

src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue

@@ -80,11 +80,6 @@ export default {
             return '设置列车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.dialogShow = true;

src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue

@@ -100,11 +100,6 @@ export default {
             return '新建车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
         },

src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue

@@ -80,11 +80,6 @@ export default {
             return '删除列车识别号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
             if (map) {

src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue

@@ -95,11 +95,6 @@ export default {
             return '删除车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
         },

src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue

@@ -321,11 +321,6 @@ export default {
             return '列车信息显示';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue

@@ -93,11 +93,6 @@ export default {
             return '修改车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
         },

src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue

@@ -132,11 +132,6 @@ export default {
             return '移动列车识别号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue

@@ -110,11 +110,6 @@ export default {
             return '移动车组号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(map) {
         },

src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue

@@ -137,11 +137,6 @@ export default {
             return '移动列车识别号';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/chengdu_03/menus/menuButton.vue

@@ -209,9 +209,6 @@ export default {
         }
     },
     watch: {
-        '$store.state.config.canvasOffsetCount': function (val) {
-            this.resetPosition();
-        },
         '$store.state.menuOperation.buttonOperation': function (val, old) {
             this.updateButtonShow(val, old);
         },
@@ -219,9 +216,6 @@ export default {
             this.selectedChange();
         }
     },
-    mounted() {
-        this.resetPosition();
-    },
     beforeDestroy() {
         this.buttonDown(this.Command.cancel.clearMbm.operation);
     },
@@ -266,11 +260,6 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        resetPosition() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            });
-        },
         updateButtonShow(val, old) {
             if (old) {
                 // 恢复旧按钮显示
@@ -700,7 +689,6 @@ export default {
                     if (station.controlMode == 'Local' || station.controlMode == 'Emergency') {
                         if (buttonOperation && this.commandTypeList.includes(model._type)) {
                             this.deviceList.push(model);
-                            // debugger;
                             if (buttonOperation === this.Signal.arrangementRoute.button.operation) {
                                 this.arrangementRouteOperation(this.deviceList);
                             } else if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {

src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue

@@ -62,11 +62,6 @@ export default {
             return [];
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.domIdConfirm = '';

src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue

@@ -83,11 +83,6 @@
                 return '增加用户'
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
         methods: {
             doShow(operate) {
                 //非断电激活时设置初始值

src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue

@@ -57,11 +57,6 @@
                 return '删除用户'
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
         methods: {
             doShow(operate, selected) {
                 //非断电激活时设置初始值

src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue

@@ -91,11 +91,6 @@
                 return '用户编辑页面'
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
         methods: {
             doShow(operate, selected) {
                 //非断电激活时设置初始值

src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue

@@ -63,11 +63,6 @@
                 return '关于ControlMonitor'
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
         methods: {
             doShow(operate) {
                 //非断电激活时设置初始值

src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue

@@ -66,11 +66,6 @@ export default {
             return '设置限速';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue

@@ -103,11 +103,6 @@
                 return '用户管理'
             }
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
         methods: {
             doShow(operate) {
                 //非断电激活时设置初始值

src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue

@@ -94,11 +94,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         loadInitData(operate) {
             this.model.username = '';

src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue

@@ -193,11 +193,6 @@ export default {
             return '设置临时限速';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue

@@ -189,9 +189,6 @@ export default {
     },
     mounted() {
         this.loadTableData();
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
     },
     methods: {
         updateTableValue(code, result, success) {

src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue

@@ -95,11 +95,6 @@ export default {
             return '添加计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue

@@ -78,11 +78,6 @@ export default {
             return '删除计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue

@@ -95,11 +95,6 @@ export default {
             return '平移计划车';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue

@@ -103,7 +103,6 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.setNameDisplay();
-            this.$store.dispatch('training/tipReload');
         });
     },
     methods: {

src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue

@@ -142,11 +142,6 @@ export default {
         //     }
         // }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue

@@ -59,11 +59,6 @@ export default {
         //     }
         // },
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/chengdu_03/operationConfig.js

@@ -641,16 +641,16 @@ export default {
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
+            operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value,
             skinCode: '04',
-            trainingName: '取消扣车({10}-{12}站台)',
+            trainingName: '全线取消扣车',
-            trainingRemark: '设置取消扣车功能(上行全线)',
+            trainingRemark: '设置取消扣车功能({12}全线)',
             trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' },
+                { deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' },
-                { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
         {

src/jmapNew/theme/components/menus/childDialog/confirmControl.vue

@@ -107,11 +107,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/components/menus/childDialog/confirmControlSpeed.vue

@@ -83,11 +83,6 @@ export default {
             return '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             if (!this.dialogShow) {

src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue

@@ -60,11 +60,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(messages) {
             this.dialogShow = true;

src/jmapNew/theme/components/menus/childDialog/passwordInputBox.vue

@@ -115,11 +115,6 @@ export default {
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate) {
             this.operate = operate || {};

src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue

@@ -155,9 +155,6 @@ export default {
         }
     },
     mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
         this.timer = setInterval(() => {
             if (this.timeCountConfirm > 0) {
                 this.timeCountConfirm--;

src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue

@@ -101,11 +101,6 @@ export default {
         }
     },
     watch:{},
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/components/menus/dialog/routeControl.vue

@@ -121,11 +121,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/components/menus/dialog/routeDetail.vue

@@ -110,11 +110,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected, tempData) {
             this.selected = selected;

src/jmapNew/theme/components/menus/dialog/routeHandControl.vue

@@ -152,11 +152,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected, tempData) {
             this.selected = selected;

src/jmapNew/theme/components/menus/dialog/sectionControl.vue

@@ -112,11 +112,6 @@ export default {
             }
         }
     },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
     methods: {
         doShow(operate, selected) {
             this.selected = selected;