From 21f4b004c9222c6324156416699663641113c3de Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jan 2021 16:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=20=E5=BC=80=E6=94=BE=E8=87=AA=E5=8A=A8=E8=BF=9B=E8=B7=AF/?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=87=AA=E5=8A=A8=E8=BF=9B=E8=B7=AF=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/xian_02/menus/menuSignal.vue        | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 0e58b33f5..28aa72961 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -54,13 +54,13 @@ export default {
                     },
                     {
                         label: '开放自动进路',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                        handler: this.setAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
                     },
                     {
                         label: '关闭自动进路',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                        handler: this.cancelAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
                     },
                     {
                         label: '终端信号封锁',
@@ -117,13 +117,13 @@ export default {
                     },
                     {
                         label: '开放自动进路',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                        handler: this.setAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
                     },
                     {
                         label: '关闭自动进路',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                        handler: this.cancelAutoInterlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
                     },
                     {
                         label: '终端信号封锁',
@@ -451,20 +451,13 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 进路交人工控
-        humanControl() {
-            const routeCodeList = [];
-            this.routeList.forEach(item => {
-                if (item.startSignalCode === this.selected.code) {
-                    routeCodeList.push(item.code);
-                }
-            });
+        // 取消联锁自动进路
+        cancelAutoInterlock() {
             const step = {
                 code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.humanControl.menu.operation,
+                operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
                 param: {
-                    signalCode: this.selected.code,
-                    routeCodeList: routeCodeList
+                    signalCode: this.selected.code
                 }
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@@ -473,7 +466,7 @@ export default {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
                         operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '关闭自动进路'},
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
                         param: step.param
                     });
                 } else {
@@ -483,20 +476,13 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // 进路交自动控
-        atsAutoControl() {
-            const routeCodeList = [];
-            this.routeList.forEach(item => {
-                if (item.startSignalCode === this.selected.code) {
-                    routeCodeList.push(item.code);
-                }
-            });
+        // 设置联锁自动进路
+        setAutoInterlock() {
             const step = {
                 code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                operation: OperationEvent.Signal.setAutoInterlock.menu.operation,
                 param: {
-                    signalCode: this.selected.code,
-                    routeCodeList: routeCodeList
+                    signalCode: this.selected.code
                 }
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@@ -505,7 +491,7 @@ export default {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
                         operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '开放自动进路'},
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
                         param: step.param
                     });
                 } else {