Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly

src/jmapNew/theme/components/menus/passiveDialog/control.vue

@@ -222,16 +222,16 @@ export default {
                         this.requestInfo = info;
                         this.disabledAgree = true;
                         this.updateTableData(controlTransferList);
-                        const operate = {
+                        // const operate = {
-                            start: true,
+                        //     start: true,
-                            operation: OperationEvent.StationControl.controlResponse.menu.operation
+                        //     operation: OperationEvent.StationControl.controlResponse.menu.operation
-                        };
+                        // };
-                        this.$store.dispatch('training/emitTipFresh');
+                        // this.$store.dispatch('training/emitTipFresh');
-                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                        // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
-                            if (valid) {
+                        //     if (valid) {
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            }
+                        //     }
-                        });
+                        // });
                     }
                 } else {
                     // 后端倒计时

src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenu.vue

@@ -427,7 +427,7 @@ export default {
 	.__socpe {
 		.el-dialog,
 		.el-dialog__wrapper {
-			pointer-events: none !important;
+			// pointer-events: none !important;
 		}
 
 		.el-dialog__header,

src/jmapNew/theme/ningbo_03/menus/localWorkMenu.vue

@@ -424,7 +424,7 @@ export default {
 	.__socpe {
 		.el-dialog,
 		.el-dialog__wrapper {
-			pointer-events: none !important;
+			// pointer-events: none !important;
 		}
 
 		.el-dialog__header,

src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue

@@ -120,7 +120,8 @@ export default {
             ratedValue: 0,
             maxTimeValue: '',
             currentTime: 0,
-            ratedValue11: ''
+            ratedValue11: '',
+            changeIgnore: false
         };
     },
     computed: {
@@ -165,6 +166,11 @@ export default {
                     this.currentTime = stand.parkingTime;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -181,6 +187,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const stand = this.stationStandList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!stand;
                 this.$refs.table.setCurrentRow(stand);
                 setTimeout(() => {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -191,6 +198,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -218,16 +226,22 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -237,7 +251,9 @@ export default {
             if (!val) { return; }
             const step = {
                 operation: OperationEvent.Command.common.choose1.operation,
-                val: val
+                param: {
+                    val: val
+                }
             };
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {

src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue

@@ -61,6 +61,7 @@ export default {
             allChecked: false,
             dialogShow: false,
             loading: false,
+            changeIgnore: false,
             operate: '',
             selectSignalCode: ''
         };
@@ -99,6 +100,11 @@ export default {
         },
         'selected': function(val) {
             this.status = !val || val.callOn;
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -115,9 +121,11 @@ export default {
             this.operate = operate;
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.selectSignalCode = selected.code;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
+                this.selectSignalCode = selected.code;
+                this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -127,6 +135,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -170,10 +179,14 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 // code: `${val.code}`,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code,
+                // val: val.code,
                 param: {
                     signalCode: val.code
                 }
@@ -182,8 +195,8 @@ export default {
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: val});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });

src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue

@@ -31,7 +31,7 @@
         <el-checkbox v-model="checked">显示复制路径</el-checkbox>
       </el-col>
       <el-col :span="14" style="padding-left: 8px;">
-        <el-tabs v-model="activeName" type="card">
+        <el-tabs :id="domIdRouteTabs" v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="设置进路" name="first">
             <el-row>
               <el-col :span="18">
@@ -208,6 +208,7 @@ export default {
             checked: false,
             unlockType: 'auto',
             forbidRoute: false,
+            changeIgnore: false,
             route: null
         };
     },
@@ -259,6 +260,9 @@ export default {
         domIdUnlockType() {
             return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
         },
+        domIdRouteTabs() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.domId : '';
+        },
         title() {
             return '进路命令';
         }
@@ -268,9 +272,23 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
+        handleClick() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.operation,
+                param: {
+                    activeName: this.activeName
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
         changeUnlockType() {
             const step = {
                 operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
@@ -293,6 +311,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
                 this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -314,6 +333,7 @@ export default {
             this.$refs.singleTable4.setCurrentRow();
             this.activeName = 'first';
             this.unlockType = 'auto';
+            this.changeIgnore = false;
             this.$refs.table.bodyWrapper.scrollTop = 0;
         },
         // 始端信号机点击
@@ -326,6 +346,10 @@ export default {
                     this.tempData.push(item);
                 }
             });
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
                 param: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue

@@ -82,6 +82,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue

@@ -177,6 +177,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -196,9 +201,12 @@ export default {
 
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                this.changeIgnore = true;
                 this.$refs.singleTable1.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
                 this.isSetSpeed && this.$refs.singleTable2.setCurrentRow(sure ? this.limitList[this.initParams.value / 5 - 1] : 0);
+                setTimeout(()=> {
+                    this.changeIgnore = false;
+                }, 200);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -214,13 +222,15 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                this.changeIgnore = true;
                 let index = 0;
                 const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
                 this.$refs.singleTable1.setCurrentRow(section);
-                this.speedLimitValue = this.initParams.value || 0;
+                // this.speedLimitValue = this.initParams.value || 0;
+                this.speedLimitValue = section ? this.getLimitSpeed(section.code) : 0;
                 setTimeout(()=> {
                     this.$refs.singleTable1.bodyWrapper.scrollTop = index * 20;
+                    this.changeIgnore = false;
                 }, 200);
                 this.$emit('updateDone');
                 this.$store.dispatch('training/emitTipFresh');
@@ -230,18 +240,19 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.speedLimitValue = 0;
-            this.sure && (this.currentSelect = null);
+            this.currentSelect = null;
-            this.sure && this.$refs.singleTable1.setCurrentRow();
+            this.$refs.singleTable1.setCurrentRow();
-            this.sure && this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
+            this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
             this.$store.dispatch('training/emitTipFresh');
         },
         commit(isClose = true) {
+            const hasSpeed = this.isSetSpeed ? this.speedLimitValue == this.initParams.value : true;
             if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code &&
-				this.speedLimitValue == this.initParams.value) {
+				hasSpeed) {
                 const cacheMap = this.getCacheMap();
                 const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
                 const operate = {
@@ -274,20 +285,21 @@ export default {
         selectLine1(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : this.getLimitSpeed(val.code)});
             this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect, {value: this.speedLimitValue});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -296,19 +308,20 @@ export default {
         selectLine2(val) {
             if (!val) { return; }
             this.speedLimitValue = val.value;
+            this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
             this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
                 operation: OperationEvent.Command.common.select.operation,
-                val: val.value
+                param: {
+                    val: val.value
+                }
             };
 
-            this.changeIgnore = false;
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue

@@ -97,6 +97,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue

@@ -141,6 +141,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -161,8 +166,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                const section = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.changeIgnore = !!section;
+                this.$refs.table.setCurrentRow(section);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -180,6 +186,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!section;
                 this.$refs.table.setCurrentRow(section);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -191,8 +198,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
+            this.currentSelect = null;
-            this.sure && this.$refs.table.setCurrentRow();
+            this.changeIgnore = false;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -234,21 +242,25 @@ export default {
         handleChangeLine(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue

@@ -102,6 +102,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue

@@ -143,6 +143,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -161,8 +166,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -178,9 +184,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -191,8 +198,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
+            this.changeIgnore = false;
-            this.sure && this.$refs.table.setCurrentRow();
+            this.currentSelect = null;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -233,21 +241,25 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue

@@ -136,6 +136,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -151,8 +156,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -163,9 +169,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -176,8 +183,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
+            this.currentSelect = null;
-            this.sure && this.$refs.table.setCurrentRow();
+            this.changeIgnore = false;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -190,7 +198,7 @@ export default {
                 const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
                 const operate = {
                     cmdType: this.sure && isOK ? this.cmdType : null,
-                    operation: isClose ? OperationEvent.Signal.lock.confirm.operation : OperationEvent.Signal.unlock.confirm.operation,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                     over: this.sure,
                     param: {signalCode: this.currentSelect.code}
                 };
@@ -218,21 +226,25 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(_ => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue

@@ -87,6 +87,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue

@@ -142,6 +142,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -156,8 +161,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -168,9 +174,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                // this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -223,8 +230,12 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
                 // code: val.code,
@@ -234,12 +245,10 @@ export default {
                 }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(_ => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue

@@ -133,6 +133,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue

@@ -64,7 +64,8 @@ export default {
             operate: null,
             allChecked: false,
             dialogShow: false,
-            loading: false
+            loading: false,
+            changeIgnore: false
         };
     },
     computed: {
@@ -116,22 +117,33 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
+                    // this.$refs.table.setCurrentRow(this.selected);
-                    this.$refs.table.setCurrentRow(this.selected);
                 }
             }).catch(() => {
                 console.log();
@@ -152,17 +164,19 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
                 this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
-                this.handleCurrentChange(signal);
+                // this.handleCurrentChange(signal);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },

src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue

@@ -105,6 +105,11 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue

@@ -86,6 +86,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue

@@ -93,7 +93,8 @@ export default {
             station:{},
             stationCode: '',
             stationName:'',
-            message:''
+            message:'',
+            changeIgnore: false
         };
     },
     computed: {
@@ -151,6 +152,11 @@ export default {
             } else {
                 this.status = true;
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -167,6 +173,7 @@ export default {
             this.dialogShow = true;
             this.$nextTick(function () {
                 const stand = this.centralizedStaionList.find(el => el.code == selected.code);
+                this.changeIgnore = !!stand;
                 this.$refs.table.setCurrentRow(stand);
                 this.$store.dispatch('training/emitTipFresh');
             });
@@ -195,6 +202,7 @@ export default {
             this.dialogShow = false;
             this.status = true;
             this.$store.dispatch('menuOperation/setSelected', {device: {}});
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('socket/shiftMsgQueue');
@@ -213,16 +221,22 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue

@@ -61,7 +61,8 @@ export default {
             allChecked: false,
             dialogShow: false,
             loading: false,
-            isActive: false
+            isActive: false,
+            changeIgnore: false
         };
     },
     computed: {
@@ -105,6 +106,11 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -121,6 +127,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -131,6 +138,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -154,13 +162,17 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
                 // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-            this.$store.dispatch('menuOperation/setSelected', {device: val});
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue

@@ -143,6 +143,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -163,8 +168,9 @@ export default {
             this.currentSelect = sure ? this.$store.getters['map/getDeviceByCode'](this.initSelect.code) : null;
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                const switchEle = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                this.changeIgnore = !!switchEle;
+                this.$refs.table.setCurrentRow(switchEle);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -182,6 +188,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -236,8 +243,12 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
                 // code: val.code,
@@ -245,11 +256,9 @@ export default {
                 val: val.code
             };
 
-            this.changeIgnore = false;
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue

@@ -89,7 +89,8 @@ export default {
             selectedSwitch: {},
             mode: '',
             position: '',
-            reserved: ''
+            reserved: '',
+            changeIgnore: false
 
         };
     },
@@ -130,6 +131,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -177,11 +183,12 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(() => {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
-                this.handleCurrentChange(switchEle);
+                // this.handleCurrentChange(switchEle);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -190,6 +197,7 @@ export default {
             this.dialogShow = false;
             this.mode = '';
             this.position = '';
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -232,19 +240,15 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
-            commitOperate(menuOperate.Switch.turnout, {code:val.code}).then(({valid, operate})=>{
+            this.position = '';
-                // if (valid) {
+            const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
-                this.position = '';
+            this.selectedSwitchCode = val.code;
-                const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.selectedSwitch = switchModel;
-                this.selectedSwitchCode = val.code;
+            if (this.changeIgnore) {
-                this.selectedSwitch = switchModel;
+                this.changeIgnore = false;
-                // this.mode = elem.auto ? 'artificial' : 'auto';
+                return;
-                // if (!elem.auto) {
+            }
-                //     if (elem.normalPosition) { this.position = 'reverse'; }
+            commitOperate(menuOperate.Switch.turnout, {code:val.code});
-                //     if (elem.reversePosition) { this.position = 'normal'; }
-                // }
-                // }
-            });
         },
         getSwitchPosition(code) {
             const elem = this.$store.getters['map/getDeviceByCode'](code);

src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue

@@ -83,6 +83,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {

src/jmapNew/theme/ningbo_03/menus/menuSection.vue

@@ -80,10 +80,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
                             handler: this.handlerInitOpen
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
                             handler: this.handlerOpen
                         }
                     ]
@@ -93,10 +95,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
                             handler: this.handlerInitClose
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
                             handler: this.handlerClose
                         }
                     ]
@@ -109,10 +113,12 @@ export default {
                             children: [
                                 {
                                     label: '初始化',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
                                     handler: this.handlerInitSetLimit
                                 },
                                 {
                                     label: '确定/取消',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
                                     handler: this.handlerSetLimit
                                 }
                             ]
@@ -122,10 +128,12 @@ export default {
                             children: [
                                 {
                                     label: '初始化',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
                                     handler: this.handlerInitCancelLimit
                                 },
                                 {
                                     label: '确定/取消',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
                                     handler: this.handlerCancelLimit
                                 }
                             ]
@@ -134,6 +142,7 @@ export default {
                 },
                 {
                     label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_section_detail,
                     handler: this.handlerDetail
                 }
             ],
@@ -313,32 +322,77 @@ export default {
                 }
             });
         },
-        handlerInitOpen() {
+        handlerInitOpen(item) {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
         },
-        handlerOpen() {
+        handlerOpen(item) {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitClose() {
+        handlerInitClose(item) {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
         },
-        handlerClose() {
+        handlerClose(item) {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitSetLimit() {
+        handlerInitSetLimit(item) {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
         },
-        handlerSetLimit() {
+        handlerSetLimit(item) {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitCancelLimit() {
+        handlerInitCancelLimit(item) {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
         },
-        handlerCancelLimit() {
+        handlerCancelLimit(item) {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
         },
-        handlerDetail() {
+        handlerDetail(item) {
-            this.$refs.sectionShow.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionShow.rightClickShow(item.operate, this.selected);
         }
     }
 };

src/jmapNew/theme/ningbo_03/menus/menuSignal.vue

@@ -86,14 +86,17 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Signal.guide.initMenu,
                             handler: this.handlerInitGuide
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Signal.guide.menu,
                             handler: this.handlerGuide
                         },
                         {
                             label: '清除',
+                            operate: OperationEvent.Signal.cancelGuide.menu,
                             handler: this.handlerCancelGuide
                         }
                     ]
@@ -104,10 +107,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Signal.lock.initMenu,
                             handler: this.handlerInitAllowLock
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Signal.lock.menu,
                             handler: this.handlerAllowLock
                         }
                     ]
@@ -117,6 +122,7 @@ export default {
                     children: [
                         {
                             label: '命令',
+                            operate: OperationEvent.Signal.arrangementRoute.menu,
                             handler: this.handlerRouteCommand
                         },
                         {
@@ -136,6 +142,7 @@ export default {
                 },
                 {
                     label: '信号指示模式',
+                    operate: OperationEvent.Signal.reopenSignal.menu,
                     handler: this.handlerSignalModel,
                     cmdType: ''
                 },
@@ -144,10 +151,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
                             handler: this.handlerInitBlock
                         },
                         {
                             label: '确认/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
                             handler: this.handlerBlock
                         }
                     ]
@@ -157,16 +166,19 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
                             handler: this.handlerInitUnblock
                         },
                         {
                             label: '确认/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
                             handler: this.handlerUnblock
                         }
                     ]
                 },
                 {
                     label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
                     handler: this.handlerDetail
                 }
             ],
@@ -199,12 +211,6 @@ export default {
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
-                const operate = {
-                    code: `${this.selected.code}`,
-                    userOperationType: 'rightClick',
-                    operation: OperationEvent.Command.commandRight.right.operation
-                };
-                this.$store.dispatch('trainingNew/next', operate);
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -266,41 +272,101 @@ export default {
         undeveloped() {
 
         },
-        handlerInitGuide() {
+        handlerInitGuide(item) {
-            this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.initMenu, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalGuide.rightClickShow(item.operate, false, this.selected);
         },
-        handlerGuide() {
+        handlerGuide(item) {
-            this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.menu, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalGuide.rightClickShow(item.operate, true, this.selected);
         },
-        handlerCancelGuide() {
+        handlerCancelGuide(item) {
-            this.$refs.cancelSignal.rightClickShow(OperationEvent.Signal.cancelGuide.menu, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.cancelSignal.rightClickShow(item.operate, this.selected);
         },
-        handlerInitAllowLock() {
+        handlerInitAllowLock(item) {
-            this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.initMenu, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalCanBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerAllowLock() {
+        handlerAllowLock(item) {
-            this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.menu, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalCanBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerRouteCommand() {
+        handlerRouteCommand(item) {
-            this.$refs.routeCommand.rightClickShow(OperationEvent.Signal.arrangementRoute.menu, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.routeCommand.rightClickShow(item.operate, this.selected);
         },
-        handlerSignalModel() {
+        handlerSignalModel(item) {
-            this.$refs.signalModel.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalModel.rightClickShow(item.operate, this.selected);
         },
-        handlerInitBlock() {
+        handlerInitBlock(item) {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerBlock() {
+        handlerBlock(item) {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitUnblock() {
+        handlerInitUnblock(item) {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerUnblock() {
+        handlerUnblock(item) {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerDetail() {
+        handlerDetail(item) {
-            this.$refs.signalDetail.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_detail, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalDetail.rightClickShow(item.operate, this.selected);
         }
     }
 };

src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue

@@ -25,6 +25,7 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'StationStandMenu',
@@ -58,26 +59,32 @@ export default {
             menuNormal: [
                 {
                     label: '开放/关闭',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose,
                     handler: this.handlerOpenOrClose
                 },
                 {
                     label: '设置/取消扣车',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot,
                     handler: this.handlerDetain
                 },
                 {
                     label: '设置站间列车数量',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum,
                     handler: this.undeveloped
                 },
                 {
                     label: '分配停站时间',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime,
                     handler: this.handlerAllocateTime
                 },
                 {
                     label: '授权转移',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_transfer,
                     handler: this.handlerStationTransfer
                 },
                 {
                     label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_detail,
                     handler: this.handlerDetail
                 }
             ],
@@ -161,20 +168,45 @@ export default {
                 }
             });
         },
-        handlerOpenOrClose() {
+        handlerOpenOrClose(item) {
-            this.$refs.standControl.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standControl.rightClickShow(item.operate, this.selected);
         },
-        handlerDetain() {
+        handlerDetain(item) {
-            this.$refs.standDetain.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standDetain.rightClickShow(item.operate, this.selected);
         },
-        handlerAllocateTime() {
+        handlerAllocateTime(item) {
-            this.$refs.allocateTime.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.allocateTime.rightClickShow(item.operate, this.selected);
         },
-        handlerStationTransfer() {
+        handlerStationTransfer(item) {
-            this.$refs.stationTransfer.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.stationTransfer.rightClickShow(item.operate, this.selected);
         },
-        handlerDetail() {
+        handlerDetail(item) {
-            this.$refs.standDetail.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standDetail.rightClickShow(item.operate, this.selected);
         },
         undeveloped() {
             this.$alert('实现中......', '提示', {

src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue

@@ -71,6 +71,7 @@ export default {
             menuNormal: [
                 {
                     label: '命令',
+                    operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
                     handler: this.handlerCommand
 
                 },
@@ -79,10 +80,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
                             handler: this.handlerInitBlock
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
                             handler: this.handlerBlock
                         }
                     ]
@@ -92,10 +95,12 @@ export default {
                     children: [
                         {
                             label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
                             handler: this.handlerInitUnblock
                         },
                         {
                             label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
                             handler: this.handlerUnblock
                         }
                     ]
@@ -105,17 +110,20 @@ export default {
                     children: [
                         {
                             label: '请求或授权/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
                             handler: this.handlerActive
                         },
                         {
                             label: '显示',
                             disabled: true,
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure,
                             handler: this.undeveloped
                         }
                     ]
                 },
                 {
                     label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
                     handler: this.handlerDetail
                 }
             ],
@@ -145,12 +153,6 @@ export default {
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
-                const operate = {
-                    code: `${this.selected.code}`,
-                    userOperationType: 'rightClick',
-                    operation: OperationEvent.Command.commandRight.right.operation
-                };
-                this.$store.dispatch('trainingNew/next', operate);
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -230,26 +232,61 @@ export default {
         hookLock() {
             this.$refs.switchHookLock.doShow(this.selected);
         },
-        handlerCommand() {
+        handlerCommand(item) {
-            this.$refs.switchCommand.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchCommand.rightClickShow(item.operate, this.selected);
         },
-        handlerInitBlock() {
+        handlerInitBlock(item) {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerBlock() {
+        handlerBlock(item) {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitUnblock() {
+        handlerInitUnblock(item) {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_init, false, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerUnblock() {
+        handlerUnblock(item) {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_sure, true, this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerActive() {
+        handlerActive(item) {
-            this.$refs.switchActive.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchActive.rightClickShow(item.operate, this.selected);
         },
-        handlerDetail() {
+        handlerDetail(item) {
-            this.$refs.switchDetail.rightClickShow('', this.selected);
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchDetail.rightClickShow(item.operate, this.selected);
         }
     }
 };

src/jmapNew/theme/ningbo_03/menus/menuTrain.vue

@@ -34,7 +34,6 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 // import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'MenuTrain',
@@ -240,11 +239,7 @@ export default {
             // this.menu = MenuContextHandler.covert(this.menuNormal);
             this.menu = [];
             this.menuNormal.forEach(menuItem => {
-                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
-                if (menuItem.roleDisabled) {
-                    status = true;
-                }
-                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
                 menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
                 this.menu.push(menuItem);
             });

src/scripts/cmdPlugin/OperationHandler.js

@@ -723,6 +723,10 @@ export const OperationEvent = {
             Signal_command_unlockType: {
                 operation: '00c058',
                 domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
+            },
+            Signal_command_routeTabs: {
+                operation: '00c059',
+                domId: '_Tips-ningBo-Signal_command_routeTabs{BOTTOM}'
             }
         },
         commandRight: {

src/store/modules/trainingNew.js

@@ -78,7 +78,9 @@ const training = {
             Handler.judgeIsTextSendOperation();
         },
         clearStepInfo: (state, stepInfo) => {
-            state.stepInfo = {};
+            if (state.stepInfo.id == stepInfo.stepId) {
+                state.stepInfo = {};
+            }
         },
         clearTrainingData: (state) => {
             state.teachMode = '';
@@ -164,8 +166,8 @@ const training = {
         setStepInfo: ({ commit }, stepInfo) => {
             commit('setStepInfo', stepInfo);
         },
-        clearStepInfo: ({ commit }) => {
+        clearStepInfo: ({ commit }, stepInfo) => {
-            commit('clearStepInfo');
+            commit('clearStepInfo', stepInfo);
         },
         clearTrainingData: ({ commit }) => {
             commit('clearTrainingData');

src/utils/subscribeCallback.js

@@ -181,7 +181,7 @@ function handle(data) {
         store.dispatch('trainingNew/setStepInfo', msg);
         break;
     case 'Simulation_Training_Step_Finish':
-        store.dispatch('trainingNew/clearStepInfo');
+        store.dispatch('trainingNew/clearStepInfo', msg);
         break;
     case 'Simulation_Training_Audio_MATCH_RESULT':
         store.dispatch('trainingNew/handleMatchVoice', msg);

src/views/newMap/display/memberManage/membersManage.vue

@@ -257,6 +257,9 @@ export default {
                         this.memberData[item.id].labelName = '车务段段长-' + (item.name ? `-${item.name }` : '');
                         trainMasterList.push(this.memberData[item.id]);
                         break;
+                    case 'PARENT_DEPARTMENT':
+                        this.memberData[item.id].labelName = '上级部门' + (item.name ? `-${item.name }` : '');
+                        break;
                 // DEVICE_MANAGER:'设备管理员' deviceManager
                     }
                 });

src/views/newMap/display/trainingDesign/designPane.vue

@@ -207,10 +207,7 @@ export default {
         },
         getRoleList() {
             const memberData = this.$store.state.training.memberData;
-            let activeTrainList = [];
+            const activeTrainList = this.$store.state.map.activeTrainList;
-            if (this.$store.state.training.started) {
-                activeTrainList = this.$store.state.map.activeTrainList;
-            }
             // 获取仿真成员列表
             const result = covertMemberData(activeTrainList, Object.values(memberData));
             let list = [];

src/views/newMap/display/trainingList/scenePlayRole.vue

@@ -69,7 +69,9 @@ export default {
             const memberData = this.$store.state.training.memberData;
             const newMemberData = {};
             playerList.forEach(playerId => {
-                newMemberData[playerId] = memberData[playerId];
+                if (memberData[playerId] && (memberData[playerId].type === 'STATION_SUPERVISOR' || memberData[playerId].type === 'DISPATCHER')) {
+                    newMemberData[playerId] = memberData[playerId];
+                }
             });
             const result = covertMemberData([], Object.values(newMemberData));
             let list = [];