From 5181c897e7484d04f723f85e6d5f14e6d9c4b681 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 31 Oct 2024 16:21:49 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 26f8581f55ced6d65c54706830ccecd9d08d728c Author: joylink_zhaoerwei Date: Thu Oct 31 16:20:21 2024 +0800 增加应急触发 commit f0495153e666edac05d51dd0744a385dc2af4757 Author: joylink_zhaoerwei Date: Wed Oct 30 13:45:15 2024 +0800 计轴配置 --- src/components/alarm/alarmInfoEnum.ts | 2 ++ src/components/rangeConfigApp/RangeConfig.vue | 1 + src/pages/AlarmInfoList.vue | 1 + src/protos/alertConst.ts | 3 ++- xian-ncc-da-message | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts index 51150f1..a66a273 100644 --- a/src/components/alarm/alarmInfoEnum.ts +++ b/src/components/alarm/alarmInfoEnum.ts @@ -53,6 +53,7 @@ export enum showAlertTypeData { AXLE_LED_ORANGE_INTERLOCK_AREA = '联锁区橙光带', SWITCH_LOST_INTERLOCK_AREA = '联锁区失表', INTERLOCK_LEVEL_ONE = '一级联锁', + PLATFORM_EMERG_STOP = '应急触发', } export enum saveAlertTypeData { @@ -82,6 +83,7 @@ export enum saveAlertTypeData { 联锁区橙光带 = 'AXLE_LED_ORANGE_INTERLOCK_AREA', 联锁区失表 = 'SWITCH_LOST_INTERLOCK_AREA', 一级联锁 = 'INTERLOCK_LEVEL_ONE', + 应急触发 = 'PLATFORM_EMERG_STOP', } export const GuardConfigTypeData = { diff --git a/src/components/rangeConfigApp/RangeConfig.vue b/src/components/rangeConfigApp/RangeConfig.vue index c92c2b1..4e3244c 100644 --- a/src/components/rangeConfigApp/RangeConfig.vue +++ b/src/components/rangeConfigApp/RangeConfig.vue @@ -130,6 +130,7 @@ const optionsAlertType = [ '道岔大面积失表', '列车信号故障', '一级联锁', + '应急触发', ]; enum DeviceType { diff --git a/src/pages/AlarmInfoList.vue b/src/pages/AlarmInfoList.vue index 3d125ca..2748b55 100644 --- a/src/pages/AlarmInfoList.vue +++ b/src/pages/AlarmInfoList.vue @@ -495,6 +495,7 @@ const optionsAlertType = [ '列车信号故障', '联锁区红光带', '联锁区橙光带', + '应急触发', ]; //时间校验 diff --git a/src/protos/alertConst.ts b/src/protos/alertConst.ts index fe40096..588158b 100644 --- a/src/protos/alertConst.ts +++ b/src/protos/alertConst.ts @@ -35,7 +35,8 @@ export namespace alert { AXLE_LED_RED_INTERLOCK_AREA = 20, AXLE_LED_ORANGE_INTERLOCK_AREA = 21, SWITCH_LOST_INTERLOCK_AREA = 22, - INTERLOCK_LEVEL_ONE = 23 + INTERLOCK_LEVEL_ONE = 23, + PLATFORM_EMERG_STOP = 24 } export enum TipTimeConfig { HOLIDAYS_MORN_PEAK = 0, diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 91cfbc3..c8ca178 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 91cfbc3ee5574419615ae177661239cdc0d7d53e +Subproject commit c8ca17875615e4fd3483a7b15c11a1bc2f2f9cd5