joylink/xian-ncc-da-client
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:
All checks were successful
local-test分支构建发布 / Docker-Build (push) Successful in 2m2s
Details

Browse Source 
commit 26f8581f55
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Oct 31 16:20:21 2024 +0800

    增加应急触发

commit f0495153e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Oct 30 13:45:15 2024 +0800

    计轴配置
This commit is contained in:
joylink_zhaoerwei 2024-10-31 16:21:49 +08:00
parent 425da8f1af
commit 5181c897e7
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/alarm/alarmInfoEnum.ts
View File

@ -53,6 +53,7 @@ export enum showAlertTypeData {
AXLE_LED_ORANGE_INTERLOCK_AREA = '联锁区橙光带', AXLE_LED_ORANGE_INTERLOCK_AREA = '联锁区橙光带',
SWITCH_LOST_INTERLOCK_AREA = '联锁区失表', SWITCH_LOST_INTERLOCK_AREA = '联锁区失表',
INTERLOCK_LEVEL_ONE = '一级联锁', INTERLOCK_LEVEL_ONE = '一级联锁',
PLATFORM_EMERG_STOP = '应急触发',
} }
export enum saveAlertTypeData { export enum saveAlertTypeData {
@ -82,6 +83,7 @@ export enum saveAlertTypeData {
联锁区橙光带 = 'AXLE_LED_ORANGE_INTERLOCK_AREA', 联锁区橙光带 = 'AXLE_LED_ORANGE_INTERLOCK_AREA',
联锁区失表 = 'SWITCH_LOST_INTERLOCK_AREA', 联锁区失表 = 'SWITCH_LOST_INTERLOCK_AREA',
一级联锁 = 'INTERLOCK_LEVEL_ONE', 一级联锁 = 'INTERLOCK_LEVEL_ONE',
应急触发 = 'PLATFORM_EMERG_STOP',
} }
export const GuardConfigTypeData = { export const GuardConfigTypeData = {

1
src/components/rangeConfigApp/RangeConfig.vue
View File

@ -130,6 +130,7 @@ const optionsAlertType = [
'道岔大面积失表', '道岔大面积失表',
'列车信号故障', '列车信号故障',
'一级联锁', '一级联锁',
'应急触发',
]; ];
enum DeviceType { enum DeviceType {

1
src/pages/AlarmInfoList.vue
View File

@ -495,6 +495,7 @@ const optionsAlertType = [
'列车信号故障', '列车信号故障',
'联锁区红光带', '联锁区红光带',
'联锁区橙光带', '联锁区橙光带',
'应急触发',
]; ];
//时间校验 //时间校验

3
src/protos/alertConst.ts
View File

@ -35,7 +35,8 @@ export namespace alert {
AXLE_LED_RED_INTERLOCK_AREA = 20, AXLE_LED_RED_INTERLOCK_AREA = 20,
AXLE_LED_ORANGE_INTERLOCK_AREA = 21, AXLE_LED_ORANGE_INTERLOCK_AREA = 21,
SWITCH_LOST_INTERLOCK_AREA = 22, SWITCH_LOST_INTERLOCK_AREA = 22,
INTERLOCK_LEVEL_ONE = 23 INTERLOCK_LEVEL_ONE = 23,
PLATFORM_EMERG_STOP = 24
} }
export enum TipTimeConfig { export enum TipTimeConfig {
HOLIDAYS_MORN_PEAK = 0, HOLIDAYS_MORN_PEAK = 0,

2
xian-ncc-da-message

@ -1 +1 @@
Subproject commit 91cfbc3ee5574419615ae177661239cdc0d7d53e Subproject commit c8ca17875615e4fd3483a7b15c11a1bc2f2f9cd5