From a04ca22f4fad963721e316c831d3213dc77db5e3 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 5 Nov 2024 09:07:59 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit ae81b3f4f818c89a051db57415172dd4126e7deb Author: joylink_zhaoerwei Date: Mon Nov 4 10:49:37 2024 +0800 新建决策信息调整 commit 586e9202163d65b109d00e514244bf8524d2eaf9 Author: joylink_zhaoerwei Date: Fri Nov 1 11:23:40 2024 +0800 应急触发 commit 25b89e8d349da77a4ca218f697968dd46704b0eb Author: joylink_zhaoerwei Date: Fri Nov 1 09:46:21 2024 +0800 增加设备类型 commit 3fc1f4deb7fe3fe0bdfe02275273c412221dfa52 Author: joylink_zhaoerwei Date: Fri Nov 1 09:25:39 2024 +0800 故障测试加应急触发 commit d75c48a01134536b5a6e2cb3a998d9d5b6364976 Author: joylink_zhaoerwei Date: Thu Oct 31 17:27:00 2024 +0800 应急触发 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 | 1 + src/components/alarm/setAlarmMock.vue | 2 ++ src/components/alarm/setAlarmText.vue | 3 +++ src/pages/DecisionInfoManage.vue | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/alarm/alarmInfoEnum.ts b/src/components/alarm/alarmInfoEnum.ts index a66a273..76c6380 100644 --- a/src/components/alarm/alarmInfoEnum.ts +++ b/src/components/alarm/alarmInfoEnum.ts @@ -23,6 +23,7 @@ export enum showAlertTypeData { '联锁区橙光带', '联锁区失表', '一级联锁', + '应急触发', I = 'I类信息', II = 'II类信息', III = 'III类信息', diff --git a/src/components/alarm/setAlarmMock.vue b/src/components/alarm/setAlarmMock.vue index 42330e7..0e12fa6 100644 --- a/src/components/alarm/setAlarmMock.vue +++ b/src/components/alarm/setAlarmMock.vue @@ -103,6 +103,7 @@ const optionsAlertType = [ '计轴橙光带', '计轴大面积橙光带', '列车信号故障', + '应急触发', ]; const mapAlertType = new Map([ ['蓝显', ['station']], @@ -115,6 +116,7 @@ const mapAlertType = new Map([ ['计轴橙光带', ['Section']], ['计轴大面积橙光带', ['Section']], ['列车信号故障', ['LogicSection', 'Turnout']], + ['应急触发', ['Platform']], ]); let selectGraphic: JlGraphic[] = []; diff --git a/src/components/alarm/setAlarmText.vue b/src/components/alarm/setAlarmText.vue index a805df6..6d06c0c 100644 --- a/src/components/alarm/setAlarmText.vue +++ b/src/components/alarm/setAlarmText.vue @@ -158,6 +158,7 @@ const optionsAlertType = [ '计轴红光带', '计轴橙光带', '列车信号故障', + '应急触发', ]; const mapAlertType = new Map([ ['蓝显', ['station']], @@ -165,11 +166,13 @@ const mapAlertType = new Map([ ['计轴红光带', ['LogicSection', 'Turnout']], ['计轴橙光带', ['LogicSection', 'Turnout']], ['列车信号故障', ['LogicSection', 'Turnout']], + ['应急触发', ['Platform']], ]); enum DeviceType { station = 'DEVICE_TYPE_RTU', Turnout = 'DEVICE_TYPE_SWITCH', LogicSection = 'DEVICE_TYPE_TRACK', + Platform = 'DEVICE_TYPE_PLATFORM', } const optionsStatus = [ { label: '正常', value: 'NORMAL' }, diff --git a/src/pages/DecisionInfoManage.vue b/src/pages/DecisionInfoManage.vue index 3f72365..15daf37 100644 --- a/src/pages/DecisionInfoManage.vue +++ b/src/pages/DecisionInfoManage.vue @@ -411,6 +411,7 @@ const optionsAlertType = [ '联锁区红光带', '联锁区橙光带', '联锁区失表', + '应急触发', ]; const searchOptionsAlertType = ['全部', ...optionsAlertType]; let optionsLocationType = ref([]); @@ -418,7 +419,7 @@ let optionsLocationList: AreaConfigItem[] = []; async function searchLocationType() { try { const alertType = (saveAlertTypeData as never)[creatForm.alertType]; - optionsLocationList = await getDeviceAreaByAlarmType(3, alertType); + optionsLocationList = await getDeviceAreaByAlarmType(+creatForm.lineId, alertType); optionsLocationType.value = optionsLocationList.map( (item) => item.areaName );