diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts index fce1206..987f9a8 100644 --- a/src/components/alarm/alarmInfoEnum.ts +++ b/src/components/alarm/alarmInfoEnum.ts @@ -25,6 +25,11 @@ export enum showAlertTypeData { '一级联锁', '应急触发', '道岔挤岔', + 'zc联锁故障', + '列车定位丢失', + '列车完整性', + '列车故障救援', + 'ats卡滞', I = 'I类信息', II = 'II类信息', III = 'III类信息', @@ -57,6 +62,11 @@ export enum showAlertTypeData { INTERLOCK_LEVEL_ONE = '一级联锁', PLATFORM_EMERG_STOP = '应急触发', SWITCH_JAMMED = '道岔挤岔', + INTERLOCKED_ZC_FAULT = 'zc联锁故障', + TRAIN_LOST_LOCATION = '列车定位丢失', + TRAIN_INTEGRITY_ALARM = '列车完整性', + TRAIN_FAULT_HELP = '列车故障救援', + INTERLOCKED_ATS_STUCK = 'ats卡滞', } export enum saveAlertTypeData { @@ -88,6 +98,11 @@ export enum saveAlertTypeData { 一级联锁 = 'INTERLOCK_LEVEL_ONE', 应急触发 = 'PLATFORM_EMERG_STOP', 道岔挤岔 = 'SWITCH_JAMMED', + zc联锁故障 = 'INTERLOCKED_ZC_FAULT', + 列车定位丢失 = 'TRAIN_LOST_LOCATION', + 列车完整性 = 'TRAIN_INTEGRITY_ALARM', + 列车故障救援 = 'TRAIN_FAULT_HELP', + ats卡滞 = 'INTERLOCKED_ATS_STUCK', } export const GuardConfigTypeData = { diff --git a/src/components/alarm/setAlarmText.vue b/src/components/alarm/setAlarmText.vue index eb7bdc3..c965411 100644 --- a/src/components/alarm/setAlarmText.vue +++ b/src/components/alarm/setAlarmText.vue @@ -160,6 +160,7 @@ const optionsAlertType = [ '列车信号故障', '应急触发', '道岔挤岔', + '列车完整性' ]; const mapAlertType = new Map([ ['蓝显', ['station']], @@ -169,6 +170,7 @@ const mapAlertType = new Map([ ['列车信号故障', ['LogicSection', 'Turnout']], ['应急触发', ['Platform']], ['道岔挤岔', ['Turnout']], + ['列车完整性', ['LogicSection']], ]); enum DeviceType { station = 'DEVICE_TYPE_RTU', diff --git a/src/pages/DecisionInfoManage.vue b/src/pages/DecisionInfoManage.vue index 113a288..757976f 100644 --- a/src/pages/DecisionInfoManage.vue +++ b/src/pages/DecisionInfoManage.vue @@ -413,6 +413,11 @@ const optionsAlertType = [ '联锁区失表', '应急触发', '道岔挤岔', + 'zc联锁故障', + '列车定位丢失', + '列车完整性', + '列车故障救援', + 'ats卡滞', ]; const searchOptionsAlertType = ['全部', ...optionsAlertType]; let optionsLocationType = ref([]); diff --git a/src/protos/alertConst.ts b/src/protos/alertConst.ts index d5c0b1f..0896c0e 100644 --- a/src/protos/alertConst.ts +++ b/src/protos/alertConst.ts @@ -37,7 +37,12 @@ export namespace alert { SWITCH_LOST_INTERLOCK_AREA = 22, INTERLOCK_LEVEL_ONE = 23, PLATFORM_EMERG_STOP = 24, - SWITCH_JAMMED = 25 + SWITCH_JAMMED = 25, + INTERLOCKED_ZC_FAULT = 26, + TRAIN_LOST_LOCATION = 27, + TRAIN_INTEGRITY_ALARM = 28, + TRAIN_FAULT_HELP = 29, + INTERLOCKED_ATS_STUCK = 30 } export enum TipTimeConfig { HOLIDAYS_MORN_PEAK = 0, diff --git a/xian-ncc-da-message b/xian-ncc-da-message index a7b7268..0f95f00 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit a7b726826b89520f047c268415702df8116d225f +Subproject commit 0f95f00449d14672b382f03727b34e339131786b