From f1e6121a8f0c394fdce3eecef92ced313fd28e7c Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Mon, 8 Apr 2024 16:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=BA=8C=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BA=E6=95=85=E9=9A=9C=E8=B0=83=E6=95=B4&=E5=8D=97?=
 =?UTF-8?q?=E4=BA=AC=E4=BA=8C=E8=BF=9B=E8=B7=AF=E6=8E=92=E5=88=97=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/components/menus/dialog/setFault.vue |  6 +++---
 .../theme/nanjing_02/menus/dispatchWorkMenuButton.vue  | 10 +++++++---
 .../theme/nanjing_02/menus/localWorkMenuButton.vue     | 10 +++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index b2cf9e71c..a17fdf082 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -277,9 +277,9 @@ export default {
                     ];
                 } else if (selected._type === 'Signal' && this.popClass === 'nanjing-02__systerm') {
                     this.faultList = [
-                        {label: '无法开放(非CTC)', value: 'NO_OPEN'},
-                        {label: '编号闪', value: 'LIGHTING_UNIT_FAULT_NAME'},
-                        {label: '机头闪', value: 'LIGHTING_UNIT_FAULT_HEAD'}
+                        {label: '红灯断丝', value: 'R_WIRE_FAULT'},
+                        {label: '绿灯断丝', value: 'G_WIRE_FAULT'},
+                        {label: '黄灯断丝', value: 'Y_WIRE_FAULT'}
                     ];
                 } else if (selected._type === 'Section' && this.popClass === 'nanjing-02__systerm') {
                     this.faultList = [
diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
index 8f1143174..f31673af1 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
@@ -664,9 +664,9 @@ export default {
                 this.param = { routeCode: this.route.code };
             }
             this.tempData = [];
-            this.selectRouteList.forEach(el => {
-                this.tempData.push(el);
-            });
+            // this.selectRouteList.forEach(el => {
+            //     this.tempData.push(el);
+            // });
         },
         // 校验上次点击信号机
         checkSignal() {
@@ -786,6 +786,10 @@ export default {
                     }
                 });
                 this.tempData = [...overlapList];
+            } else if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE || row.cmdType === CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE) {
+                this.selectRouteList.forEach(el => {
+                    this.tempData.push(el);
+                });
             }
 
             if (this.tempData.length) {
diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
index 3e67306f9..c73506d99 100644
--- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
@@ -740,9 +740,9 @@ export default {
                 this.param = { routeCode: this.route.code };
             }
             this.tempData = [];
-            this.selectRouteList.forEach(el => {
-                this.tempData.push(el);
-            });
+            // this.selectRouteList.forEach(el => {
+            //     this.tempData.push(el);
+            // });
         },
         // 校验上次点击信号机
         checkSignal() {
@@ -862,6 +862,10 @@ export default {
                     }
                 });
                 this.tempData = [...overlapList];
+            } else if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE || row.cmdType === CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE) {
+                this.selectRouteList.forEach(el => {
+                    this.tempData.push(el);
+                });
             }
 
             if (this.tempData.length) {