From 1668b25337edf7c2b1c2f6eb96a7310c9ef956bb Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 25 Aug 2020 16:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/menus/menuButton.vue     | 36 +++++++++++--------
 .../theme/haerbin_01/operationConfig.js       | 24 ++++++++-----
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index 11c0ee495..6cc0bd8c2 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -20,7 +20,7 @@
           <div class="nav-border">
             <div class="nav-border-top">
               <el-button :id="commandId" class="fl" :class="{'disabled': canCommand}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand" @click="command">执行</el-button>
-              <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="doClose">取消</el-button>
+              <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="cancle">取消</el-button>
             </div>
             <div class="nav-border-bottom">
               <el-table
@@ -167,6 +167,11 @@ export default {
         '$store.state.training.prdType': function (val) {
             this.initMenus();
             this.initRouteMenus();
+        },
+        '$store.state.training.started':function (val) {
+            if (!val) {
+                this.doClose();
+            }
         }
     },
     mounted() {
@@ -450,22 +455,25 @@ export default {
                 this.$refs.noticeInfo.doShow(error.message);
             });
         },
-        doClose() {
+        cancle() {
             if (this.$store.state.training.mode != TrainingMode.TEACH) {
-                this.deviceHighLight(this.oldDevice, false); // 当前选中
-                this.operate = ''; // 清空指令
-                this.cmdType = '';
-                if (this.oldClickObj) {
-                    this.deviceHighLight(this.oldClickObj, false);
-                }
-                this.handleBasicMenu();
-                this.param = {};
-                this.tempData = []; // 清空执行栏
-                this.canCommand = true; // 执行变为禁用
-                this.oldClickObj = null; // 清空上次点击信号机
-                this.clearAllMenuShow();
+                this.doClose();
             }
         },
+        doClose() {
+            this.deviceHighLight(this.oldDevice, false); // 当前选中
+            this.operate = ''; // 清空指令
+            this.cmdType = '';
+            if (this.oldClickObj) {
+                this.deviceHighLight(this.oldClickObj, false);
+            }
+            this.handleBasicMenu();
+            this.param = {};
+            this.tempData = []; // 清空执行栏
+            this.canCommand = true; // 执行变为禁用
+            this.oldClickObj = null; // 清空上次点击信号机
+            this.clearAllMenuShow();
+        },
         initMenus() {
             this.basicParamList = this.$store.state.training.prdType === '01' ? [
                 { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
diff --git a/src/jmapNew/theme/haerbin_01/operationConfig.js b/src/jmapNew/theme/haerbin_01/operationConfig.js
index d75ba6970..a06acac47 100644
--- a/src/jmapNew/theme/haerbin_01/operationConfig.js
+++ b/src/jmapNew/theme/haerbin_01/operationConfig.js
@@ -440,7 +440,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【ATP进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"ATP"}'
         },
         {
             maxDuration: 15,
@@ -456,7 +457,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【ATP进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"ATP"}'
         },
         {
             maxDuration: 15,
@@ -472,7 +474,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消ATP】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"ATP"}'
         },
         {
             maxDuration: 15,
@@ -488,7 +491,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
                 { deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消ATP】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"ATP"}'
         },
         {
             maxDuration: 15,
@@ -684,7 +688,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"GROUND"}'
         },
         {
             maxDuration: 15,
@@ -700,7 +705,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"GROUND"}'
         },
         {
             maxDuration: 15,
@@ -716,7 +722,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"GROUND"}'
         },
         {
             maxDuration: 15,
@@ -732,7 +739,8 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+            ],
+            config:'{routeType:"GROUND"}'
         },
         {
             maxDuration: 15,