From 15957682cf427cc978670999aaae39f4261825a0 Mon Sep 17 00:00:00 2001 From: zhanghan11 Date: Fri, 12 Apr 2024 16:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E6=BB=9A=E5=8A=A8=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspur/ipc/service/impl/IpcDataShowServiceImpl.java | 4 ++-- .../src/main/java/com/inspur/ipc/utils/IpcConstant.java | 9 +++++++++ tzipc-ui/src/views/ipc/bigscreen/index.vue | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/service/impl/IpcDataShowServiceImpl.java b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/service/impl/IpcDataShowServiceImpl.java index c3720a3..9be792e 100644 --- a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/service/impl/IpcDataShowServiceImpl.java +++ b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/service/impl/IpcDataShowServiceImpl.java @@ -122,9 +122,9 @@ public class IpcDataShowServiceImpl implements IIpcDataShowService { ipcAlarmRecord.setAlarmStatus("0"); List list = ipcAlarmRecordService.selectIpcAlarmRecordList(ipcAlarmRecord); // 颗粒度报警 - map.put("pzAlarmStr", String.join(IpcConstant.DATA_SEPARATOR, list.stream().filter(ipcAlarmRecord1 -> ipcAlarmRecord1.getNameKey().startsWith("pz")).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList()))); + map.put("pzAlarmStr", String.join(IpcConstant.DATA_SEPARATOR, list.stream().filter(ipcAlarmRecord1 -> ipcAlarmRecord1.getNameKey().startsWith("pz")).limit(IpcConstant.BIGSCREEN_ALARM_RECORD_NUM_5).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList()))); // 其他报警 - map.put("otherAlarmStr", String.join(IpcConstant.DATA_SEPARATOR, list.stream().filter(ipcAlarmRecord1 -> !ipcAlarmRecord1.getNameKey().startsWith("pz")).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList()))); + map.put("otherAlarmStr", String.join(IpcConstant.DATA_SEPARATOR, list.stream().filter(ipcAlarmRecord1 -> !ipcAlarmRecord1.getNameKey().startsWith("pz")).limit(IpcConstant.BIGSCREEN_ALARM_RECORD_NUM_10).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList()))); // 根据位置处理 if (part.endsWith(IpcConstant.OPERATION_PROFILE)) { // 操作侧 diff --git a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java index 19c7cd8..77e2101 100644 --- a/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java +++ b/tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/utils/IpcConstant.java @@ -109,4 +109,13 @@ public class IpcConstant { */ public static final String RULE_TYPE_IN_RUNNING = "in_running"; + /** + * 大屏滚动展示报警条数 + */ + public static final Long BIGSCREEN_ALARM_RECORD_NUM_5 = 5L; + + /** + * 大屏滚动展示报警条数 + */ + public static final Long BIGSCREEN_ALARM_RECORD_NUM_10 = 10L; } diff --git a/tzipc-ui/src/views/ipc/bigscreen/index.vue b/tzipc-ui/src/views/ipc/bigscreen/index.vue index b5dec07..1ac9420 100644 --- a/tzipc-ui/src/views/ipc/bigscreen/index.vue +++ b/tzipc-ui/src/views/ipc/bigscreen/index.vue @@ -1431,7 +1431,7 @@ export default { .scroll-inner { position: absolute; white-space: nowrap; - animation: scrollAnimation 300s linear infinite; + animation: scrollAnimation 30s linear infinite; } }