From ce8b36179d2c4a5a3f7a95f398881852721d5bf6 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 27 Sep 2023 14:34:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E8=8C=83=E5=9B=B4=E5=88=92=E5=88=86=20?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=20=E5=88=A0=E9=99=A4=20?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=81=94=E9=94=81=202=20=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=88=92=E5=88=86=20=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=20=E8=81=94=E9=94=81=E5=8C=BA=E7=BA=A2?=
 =?UTF-8?q?=E5=85=89=E5=B8=A6=EF=BC=8C=E8=81=94=E9=94=81=E5=8C=BA=E6=A9=99?=
 =?UTF-8?q?=E5=85=89=E5=B8=A6=203=20=E8=8C=83=E5=9B=B4=E5=88=92=E5=88=86?=
 =?UTF-8?q?=20=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B=20=E2=80=9C=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=81=94=E9=94=81=E2=80=9D=20=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA=E6=95=85=E9=9A=9C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E4=B8=94=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=BE=E5=A4=87=EF=BC=88=E9=9B=86=E4=B8=AD?=
 =?UTF-8?q?=E7=AB=99=EF=BC=89=204=20=E5=86=B3=E7=AD=96=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=20=E6=B7=BB=E5=8A=A0SWITCH=5FLOST=5FINTERLOC?=
 =?UTF-8?q?K=5FAREA=EF=BC=88=E8=81=94=E9=94=81=E5=8C=BA=E5=A4=B1=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=89=205=20=E5=91=8A=E8=AD=A6=E6=8F=90=E7=A4=BA=E5=AF=B9SW?=
 =?UTF-8?q?ITCH=5FLOST=5FINTERLOCK=5FAREA=EF=BC=88=E8=81=94=E9=94=81?=
 =?UTF-8?q?=E5=8C=BA=E5=A4=B1=E8=A1=A8=EF=BC=89=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=206=20=E5=86=B3=E7=AD=96=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=20=E9=9A=90=E8=97=8F=20=E2=80=9C=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=81=94=E9=94=81=E2=80=9D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/alarm/alarmInfoEnum.ts         |  8 ++---
 src/components/rangeConfigApp/RangeConfig.vue | 29 ++++++++++++++++---
 src/pages/DecisionInfoManage.vue              |  1 +
 src/protos/alertConst.ts                      |  4 +--
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts
index 609b3fc..9b7afbd 100644
--- a/src/components/alarm/alarmInfoEnum.ts
+++ b/src/components/alarm/alarmInfoEnum.ts
@@ -21,8 +21,8 @@ export enum showAlertTypeData {
   '全线蓝显',
   '联锁区红光带',
   '联锁区橙光带',
-  '一级联锁' = 26,
-  '二级联锁' = 27,
+  '联锁区失表',
+  '一级联锁',
   I = 'I类信息',
   II = 'II类信息',
   III = 'III类信息',
@@ -51,8 +51,8 @@ export enum showAlertTypeData {
   ALL_LINE_BLUE_DISPLAY = '全线蓝显',
   AXLE_LED_RED_INTERLOCK_AREA = '联锁区红光带',
   AXLE_LED_ORANGE_INTERLOCK_AREA = '联锁区橙光带',
+  SWITCH_LOST_INTERLOCK_AREA = '联锁区失表',
   INTERLOCK_LEVEL_ONE = '一级联锁',
-  INTERLOCK_LEVEL_TWO = '二级联锁',
 }
 
 export enum saveAlertTypeData {
@@ -80,8 +80,8 @@ export enum saveAlertTypeData {
   全线蓝显 = 'ALL_LINE_BLUE_DISPLAY',
   联锁区红光带 = 'AXLE_LED_RED_INTERLOCK_AREA',
   联锁区橙光带 = 'AXLE_LED_ORANGE_INTERLOCK_AREA',
+  联锁区失表 = 'SWITCH_LOST_INTERLOCK_AREA',
   一级联锁 = 'INTERLOCK_LEVEL_ONE',
-  二级联锁 = 'INTERLOCK_LEVEL_TWO',
 }
 
 export const GuardConfigTypeData = {
diff --git a/src/components/rangeConfigApp/RangeConfig.vue b/src/components/rangeConfigApp/RangeConfig.vue
index 3ebe6e8..e66046f 100644
--- a/src/components/rangeConfigApp/RangeConfig.vue
+++ b/src/components/rangeConfigApp/RangeConfig.vue
@@ -130,10 +130,7 @@ const optionsAlertType = [
   '计轴大面积橙光带',
   '道岔大面积失表',
   '列车信号故障',
-  '联锁区红光带',
-  '联锁区橙光带',
   '一级联锁',
-  '二级联锁',
 ];
 
 enum DeviceType {
@@ -149,6 +146,26 @@ enum DeviceTypeShow {
   DEVICE_TYPE_PLATFORM = 'Platform',
 }
 
+watch(
+  () => rangeConfig.alertTypes,
+  (alertTypes) => {
+    if (alertTypes[0] == '一级联锁') {
+      alertTypes.splice(1);
+    }
+    if (
+      alertTypes[0] !== '一级联锁' &&
+      alertTypes.slice(1).includes('一级联锁')
+    ) {
+      for (let i = 0; i < alertTypes.length; i++) {
+        if (alertTypes[i] == '一级联锁') {
+          alertTypes.splice(i, 1);
+          break;
+        }
+      }
+    }
+  }
+);
+
 let selectGraphic: JlGraphic[] = [];
 watch(
   () => rangeConfigStore.selectedGraphics,
@@ -173,7 +190,11 @@ watch(
         }
         return select;
       }) as JlGraphic[];
-      selectGraphic.push(...deviceFilter);
+      if (rangeConfig.alertTypes[0] !== '一级联锁') {
+        selectGraphic.push(...deviceFilter);
+      } else if (deviceFilter.length) {
+        selectGraphic = [deviceFilter[0]];
+      }
       selectGraphic = Array.from(new Set(selectGraphic));
       getRangeConfigApp().updateSelected(...selectGraphic);
       device.value = selectGraphic.map((g) => g.code) as string[];
diff --git a/src/pages/DecisionInfoManage.vue b/src/pages/DecisionInfoManage.vue
index cba99e8..309ba7c 100644
--- a/src/pages/DecisionInfoManage.vue
+++ b/src/pages/DecisionInfoManage.vue
@@ -332,6 +332,7 @@ const optionsAlertType = [
   '列车信号故障',
   '联锁区红光带',
   '联锁区橙光带',
+  '联锁区失表',
 ];
 let optionsLocationType = ref<string[]>([]);
 let optionsLocationList: AreaConfigItem[] = [];
diff --git a/src/protos/alertConst.ts b/src/protos/alertConst.ts
index 06a337e..fe40096 100644
--- a/src/protos/alertConst.ts
+++ b/src/protos/alertConst.ts
@@ -34,8 +34,8 @@ export namespace alert {
         ALL_LINE_BLUE_DISPLAY = 19,
         AXLE_LED_RED_INTERLOCK_AREA = 20,
         AXLE_LED_ORANGE_INTERLOCK_AREA = 21,
-        INTERLOCK_LEVEL_ONE = 26,
-        INTERLOCK_LEVEL_TWO = 27
+        SWITCH_LOST_INTERLOCK_AREA = 22,
+        INTERLOCK_LEVEL_ONE = 23
     }
     export enum TipTimeConfig {
         HOLIDAYS_MORN_PEAK = 0,