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

src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue

@@ -122,9 +122,14 @@
         <span class="status_detailInfo" style="color: #e61013">{{ alamMessage }}</span>
       </div>
       <div class="delayTime">
+        <<<<<<< HEAD
         <span class="status_lable">延时<br />时间</span>
         <span class="status_detailInfo" style="color: #e61013">{{ delayInfo }} {{ delayTime }}</span>
         <!-- <span class="status_detailInfo" style="color: #e61013">非进路解锁延时  07 秒</span> -->
+        =======
+        <span class="status_lable">延时<br />时间</span>
+        <span class="status_detailInfo" style="color: #e61013">{{ delayTime }}</span>
+        >>>>>>> 5d1297176fb6d1137d44a095e2e76c0157239c37
       </div>
     </div>
     <password-box ref="password" pop-class="fuzhou-01__systerm" @checkOver="passWordCommit" />
@@ -150,7 +155,6 @@ export default {
       inter: null,
       operation: '0',
       delayTime: '',
-      delayInfo: '',
       promptInfo: '',
       alamMessage: '',
       deviceList: [],
@@ -210,6 +214,20 @@ export default {
         }
       }
     },
+    // 执行操作
+    trainingOperation(operate) {
+      this.$store
+        .dispatch('training/nextNew', operate)
+        .then(({ valid }) => {
+          if (valid) {
+            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true })
+          }
+        })
+        .catch((error) => {
+          console.error(error)
+          this.$refs.noticeInfo.doShow()
+        })
+    },
     passWordCommit(data) {
       let operate = {}
       if (data.overNext) {
@@ -233,20 +251,6 @@ export default {
       }
       this.trainingOperation(operate)
     },
-    // 执行操作
-    trainingOperation(operate) {
-      this.$store
-        .dispatch('training/nextNew', operate)
-        .then(({ valid }) => {
-          if (valid) {
-            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true })
-          }
-        })
-        .catch((error) => {
-          console.error(error)
-          this.$refs.noticeInfo.doShow()
-        })
-    },
     resetMbmButton() {
       this.$store.dispatch('menuOperation/setButtonOperation', null)
       Handler.clear() // 清空操作组