From f8e36732d8e3cb47740e7848b758a8641323a69e Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue, 5 Nov 2024 10:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E5=B2=94=E6=8C=A4?=
 =?UTF-8?q?=E5=B2=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/alarm/alarmInfoEnum.ts         | 3 +++
 src/components/alarm/setAlarmMock.vue         | 2 ++
 src/components/alarm/setAlarmText.vue         | 2 ++
 src/components/rangeConfigApp/RangeConfig.vue | 1 +
 src/pages/AlarmInfoList.vue                   | 1 +
 src/pages/DecisionInfoManage.vue              | 6 +++++-
 src/protos/alertConst.ts                      | 3 ++-
 xian-ncc-da-message                           | 2 +-
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts
index 76c6380..fce1206 100644
--- a/src/components/alarm/alarmInfoEnum.ts
+++ b/src/components/alarm/alarmInfoEnum.ts
@@ -24,6 +24,7 @@ export enum showAlertTypeData {
   '联锁区失表',
   '一级联锁',
   '应急触发',
+  '道岔挤岔',
   I = 'I类信息',
   II = 'II类信息',
   III = 'III类信息',
@@ -55,6 +56,7 @@ export enum showAlertTypeData {
   SWITCH_LOST_INTERLOCK_AREA = '联锁区失表',
   INTERLOCK_LEVEL_ONE = '一级联锁',
   PLATFORM_EMERG_STOP = '应急触发',
+  SWITCH_JAMMED = '道岔挤岔',
 }
 
 export enum saveAlertTypeData {
@@ -85,6 +87,7 @@ export enum saveAlertTypeData {
   联锁区失表 = 'SWITCH_LOST_INTERLOCK_AREA',
   一级联锁 = 'INTERLOCK_LEVEL_ONE',
   应急触发 = 'PLATFORM_EMERG_STOP',
+  道岔挤岔 = 'SWITCH_JAMMED',
 }
 
 export const GuardConfigTypeData = {
diff --git a/src/components/alarm/setAlarmMock.vue b/src/components/alarm/setAlarmMock.vue
index 0e12fa6..63633d0 100644
--- a/src/components/alarm/setAlarmMock.vue
+++ b/src/components/alarm/setAlarmMock.vue
@@ -104,6 +104,7 @@ const optionsAlertType = [
   '计轴大面积橙光带',
   '列车信号故障',
   '应急触发',
+  '道岔挤岔',
 ];
 const mapAlertType = new Map([
   ['蓝显', ['station']],
@@ -117,6 +118,7 @@ const mapAlertType = new Map([
   ['计轴大面积橙光带', ['Section']],
   ['列车信号故障', ['LogicSection', 'Turnout']],
   ['应急触发', ['Platform']],
+  ['道岔挤岔', ['Turnout']],
 ]);
 let selectGraphic: JlGraphic[] = [];
 
diff --git a/src/components/alarm/setAlarmText.vue b/src/components/alarm/setAlarmText.vue
index 6d06c0c..eb7bdc3 100644
--- a/src/components/alarm/setAlarmText.vue
+++ b/src/components/alarm/setAlarmText.vue
@@ -159,6 +159,7 @@ const optionsAlertType = [
   '计轴橙光带',
   '列车信号故障',
   '应急触发',
+  '道岔挤岔',
 ];
 const mapAlertType = new Map([
   ['蓝显', ['station']],
@@ -167,6 +168,7 @@ const mapAlertType = new Map([
   ['计轴橙光带', ['LogicSection', 'Turnout']],
   ['列车信号故障', ['LogicSection', 'Turnout']],
   ['应急触发', ['Platform']],
+  ['道岔挤岔', ['Turnout']],
 ]);
 enum DeviceType {
   station = 'DEVICE_TYPE_RTU',
diff --git a/src/components/rangeConfigApp/RangeConfig.vue b/src/components/rangeConfigApp/RangeConfig.vue
index 4e3244c..82389e8 100644
--- a/src/components/rangeConfigApp/RangeConfig.vue
+++ b/src/components/rangeConfigApp/RangeConfig.vue
@@ -131,6 +131,7 @@ const optionsAlertType = [
   '列车信号故障',
   '一级联锁',
   '应急触发',
+  '道岔挤岔',
 ];
 
 enum DeviceType {
diff --git a/src/pages/AlarmInfoList.vue b/src/pages/AlarmInfoList.vue
index 2748b55..c6bf285 100644
--- a/src/pages/AlarmInfoList.vue
+++ b/src/pages/AlarmInfoList.vue
@@ -496,6 +496,7 @@ const optionsAlertType = [
   '联锁区红光带',
   '联锁区橙光带',
   '应急触发',
+  '道岔挤岔',
 ];
 
 //时间校验
diff --git a/src/pages/DecisionInfoManage.vue b/src/pages/DecisionInfoManage.vue
index 15daf37..113a288 100644
--- a/src/pages/DecisionInfoManage.vue
+++ b/src/pages/DecisionInfoManage.vue
@@ -412,6 +412,7 @@ const optionsAlertType = [
   '联锁区橙光带',
   '联锁区失表',
   '应急触发',
+  '道岔挤岔',
 ];
 const searchOptionsAlertType = ['全部', ...optionsAlertType];
 let optionsLocationType = ref<string[]>([]);
@@ -419,7 +420,10 @@ let optionsLocationList: AreaConfigItem[] = [];
 async function searchLocationType() {
   try {
     const alertType = (saveAlertTypeData as never)[creatForm.alertType];
-    optionsLocationList = await getDeviceAreaByAlarmType(+creatForm.lineId, alertType);
+    optionsLocationList = await getDeviceAreaByAlarmType(
+      +creatForm.lineId,
+      alertType
+    );
     optionsLocationType.value = optionsLocationList.map(
       (item) => item.areaName
     );
diff --git a/src/protos/alertConst.ts b/src/protos/alertConst.ts
index 588158b..d5c0b1f 100644
--- a/src/protos/alertConst.ts
+++ b/src/protos/alertConst.ts
@@ -36,7 +36,8 @@ export namespace alert {
         AXLE_LED_ORANGE_INTERLOCK_AREA = 21,
         SWITCH_LOST_INTERLOCK_AREA = 22,
         INTERLOCK_LEVEL_ONE = 23,
-        PLATFORM_EMERG_STOP = 24
+        PLATFORM_EMERG_STOP = 24,
+        SWITCH_JAMMED = 25
     }
     export enum TipTimeConfig {
         HOLIDAYS_MORN_PEAK = 0,
diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index c8ca178..a7b7268 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit c8ca17875615e4fd3483a7b15c11a1bc2f2f9cd5
+Subproject commit a7b726826b89520f047c268415702df8116d225f