From 67bf5babb03dee5da8e5e6e9ea83b3f7e42d5a06 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 7 Sep 2021 13:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E4=B8=89=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AB=AF=20=E4=BF=A1=E5=8F=B7=E6=9C=BA=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuzhou_01/menus/menuDeplotButton.vue      | 77 +++++++++----------
 .../theme/fuzhou_01/menus/menuSignal.vue      | 20 ++++-
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
index 7ccf517ad..922d27939 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
@@ -26,7 +26,7 @@
       <button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation)">
         <span class="buttonColor">钮解</span>
       </button>
-      <button :id="Command.cancel.clearMbm.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Command.cancel.clearMbm.operation)">
+      <button :id="Signal.cancelTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.cancelTrainRoute.button.operation)">
         <span class="buttonColor">取消</span>
       </button>
       <button :id="Section.fault.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor,color:'#DA2D29'}" @click="buttonDown(Section.fault.button.operation)">
@@ -69,7 +69,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import Handler from '@/scripts/cmdPlugin/Handler';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+// import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     name:'MenuDeplotButton',
     components: {
@@ -186,46 +186,45 @@ export default {
         buttonDown(operation) {
             // 清空当前的选择的设备
             this.deviceList = [];
-            if (operation != this.Command.cancel.clearMbm.operation) {
-                const operate = {
-                    operation: operation
-                };
+            // if (operation != this.Command.cancel.clearMbm.operation) {
+            const operate = {
+                operation: operation
+            };
 
-                // 以下 会弹出密码框 （区故解，人解列车进路 (总人解)，引导总锁，上电解锁） 待修改
-                const operationList = [
-                    this.Section.fault.button.operation,
-                    this.Signal.humanTrainRoute.button.operation,
-                    this.Station.guideLock.button.operation,
-                    this.Station.powerUnLock.button.operation
-                ];
+            // 以下 会弹出密码框 （区故解，人解列车进路 (总人解)，引导总锁，上电解锁） 待修改
+            const operationList = [
+                this.Section.fault.button.operation,
+                this.Signal.humanTrainRoute.button.operation,
+                this.Station.guideLock.button.operation,
+                this.Station.powerUnLock.button.operation
+            ];
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.operation = operation;
-                        this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        // 判断是否需要 弹窗密码框
-                        if (operationList.includes(operation)) {
-                            operate['operateNext'] = this.Command.close.password.operation;
-                            this.$refs.password.doShow(operate);
-                        }
-                        this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.operation = operation;
+                    this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // 判断是否需要 弹窗密码框
+                    if (operationList.includes(operation)) {
+                        operate['operateNext'] = this.Command.close.password.operation;
+                        this.$refs.password.doShow(operate);
                     }
-                });
-
-            } else {
-                const operate = {
-                    start: true,
-                    operation: operation
-                };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/setButtonOperation', null);
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        Handler.clear(); // 清空操作组
-                    }
-                });
-            }
+                    this.$store.dispatch('training/emitTipFresh');
+                }
+            });
+            // } else {
+            //     const operate = {
+            //         start: true,
+            //         operation: operation
+            //     };
+            //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/setButtonOperation', null);
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             Handler.clear(); // 清空操作组
+            //         }
+            //     });
+            // }
         }
     }
 };
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
index 4a06cead0..e394dd0d6 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
@@ -247,6 +247,7 @@ export default {
         },
         operationHandler(buttonOperation, selectType) {
             switch (buttonOperation) {
+            // 信号机封锁
             case OperationEvent.Signal.lock.button.operation: {
                 commitOperate(menuOperate.Signal.lock, {signalCode: selectType.code}, 3).then(({valid, operate}) => {
                     if (valid) {
@@ -260,7 +261,8 @@ export default {
                 });
                 break;
             }
-            case OperationEvent.Signal.lock.unlock.operation: {
+            // 信号机解封
+            case OperationEvent.Signal.unlock.button.operation: {
                 // this.unlock(selectType);
                 commitOperate(menuOperate.Signal.unlock, {signalCode: selectType.code}, 3).then(({valid, operate}) => {
                     if (valid) {
@@ -274,6 +276,22 @@ export default {
                 });
                 break;
             }
+            // 取消进路
+            case OperationEvent.Signal.cancelTrainRoute.button.operation: {
+                commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode: selectType.code}, 3).then(({valid, operate}) => {
+                    if (valid) {
+                        // this.$refs.routeLock.doShow(operate, this.selected);
+                    } else {
+                        this.$refs.noticeInfo.doShow();
+                    }
+                }).catch(error=>{
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
+                });
+                break;
+            }
+            // 人解进路
+            // 排列进路
             default: {
                 break;
             }