From a6c6de76eb5c2675272d22c139636a41aeb44db8 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 22 Nov 2024 15:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=AB=99=E6=89=A3?= =?UTF-8?q?=E8=BD=A6=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/alarm/alarmInfoEnum.ts | 3 +++ src/components/alarm/setAlarmText.vue | 9 ++++++++- src/pages/AlarmInfoList.vue | 1 + xian-ncc-da-message | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts index b8c3c6a..45b2b58 100644 --- a/src/components/alarm/alarmInfoEnum.ts +++ b/src/components/alarm/alarmInfoEnum.ts @@ -31,6 +31,7 @@ export enum showAlertTypeData { '列车故障救援', 'ats卡滞', '列车报点', + '车站扣车', I = 'I类信息', II = 'II类信息', III = 'III类信息', @@ -69,6 +70,7 @@ export enum showAlertTypeData { TRAIN_FAULT_HELP = '列车故障救援', INTERLOCKED_ATS_STUCK = 'ats卡滞', TRAIN_RECORD = '列车报点', + HOLD_PLATFORM_STAY_TRAIN_MORE = '车站扣车', } export enum saveAlertTypeData { @@ -106,6 +108,7 @@ export enum saveAlertTypeData { 列车故障救援 = 'TRAIN_FAULT_HELP', ats卡滞 = 'INTERLOCKED_ATS_STUCK', 列车报点 = 'TRAIN_RECORD', + 车站扣车 = 'HOLD_PLATFORM_STAY_TRAIN_MORE', } export const GuardConfigTypeData = { diff --git a/src/components/alarm/setAlarmText.vue b/src/components/alarm/setAlarmText.vue index 3eadc64..8ce414a 100644 --- a/src/components/alarm/setAlarmText.vue +++ b/src/components/alarm/setAlarmText.vue @@ -160,7 +160,7 @@ const setAlartTextData = ref<{ }, ], }); -const needShowTrainGroup = ['列车信号故障', '列车报点']; +const needShowTrainGroup = ['列车信号故障', '列车报点', '车站扣车']; const optionsAlertType = [ '蓝显', '道岔失表', @@ -171,6 +171,7 @@ const optionsAlertType = [ '道岔挤岔', '列车完整性', '列车报点', + '车站扣车', ]; const mapAlertType = new Map([ ['蓝显', ['station']], @@ -182,6 +183,7 @@ const mapAlertType = new Map([ ['道岔挤岔', ['Turnout']], ['列车完整性', ['LogicSection']], ['列车报点', ['Section']], + ['车站扣车', ['Section', 'LogicSection']], ]); enum DeviceType { station = 'DEVICE_TYPE_RTU', @@ -240,6 +242,11 @@ watch( allplatformRefSection.includes(g.id) ) { select = true; + } else if ( + g.type == Section.Type && + setAlartTextData.value.alertType == '车站扣车' + ) { + select = true; } else if ( g.type !== Station.Type && g.type !== Section.Type && diff --git a/src/pages/AlarmInfoList.vue b/src/pages/AlarmInfoList.vue index 1b12774..5e81556 100644 --- a/src/pages/AlarmInfoList.vue +++ b/src/pages/AlarmInfoList.vue @@ -500,6 +500,7 @@ const optionsAlertType = [ '联锁区橙光带', '应急触发', '道岔挤岔', + '车站扣车', ]; //时间校验 diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 7aef4b8..2356a7f 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 7aef4b876fae6622d93a21c99fe293df7bf7d572 +Subproject commit 2356a7fdcd388f28e13ba10d4cfc071aaa038646