From 1af77effbc68cb24b9e9028a3bd7efcd8fc41991 Mon Sep 17 00:00:00 2001 From: zhanghan11 Date: Mon, 22 Apr 2024 09:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8A=A5=E8=AD=A6icon?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B7=9F=E9=9A=8F=E6=8A=A5=E8=AD=A6=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IpcDataShowServiceImpl.java | 3 ++ .../com/inspur/ipc/utils/IpcConstant.java | 13 ++++++ .../VueOkrTree/vue-okr-tree/OkrTree.vue | 2 +- tzipc-ui/src/layout/components/Navbar.vue | 1 + tzipc-ui/src/views/ipc/bigscreen/index.vue | 43 +++++++++++++++++-- 5 files changed, 57 insertions(+), 5 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 d8fa0a4..d3d3f04 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 @@ -249,10 +249,13 @@ public class IpcDataShowServiceImpl implements IIpcDataShowService { // 根据部位区分报警数量 List fieldList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.MONITOR_PART_KEY); Map map = new HashMap<>(); + Map dangerMap = new HashMap<>(); for (IpcMonitorField field : fieldList) { map.put(field.getFieldValue(), list.stream().anyMatch(ipcAlarmRecord1 -> ipcAlarmRecord1.getPartKey().equals(field.getFieldValue()))); + dangerMap.put(field.getFieldValue(), list.stream().anyMatch(ipcAlarmRecord1 -> ipcAlarmRecord1.getPartKey().equals(field.getFieldValue()) && IpcConstant.ALARM_LEVEL1.equals(ipcAlarmRecord1.getAlarmLevel()))); } dataMap.put("alarmCount", map); + dataMap.put("dangerAlarmCount", dangerMap); return dataMap; } } 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 77e2101..9c666e1 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 @@ -118,4 +118,17 @@ public class IpcConstant { * 大屏滚动展示报警条数 */ public static final Long BIGSCREEN_ALARM_RECORD_NUM_10 = 10L; + + /** + * 报警等级-一级 + */ + public static final String ALARM_LEVEL1 = "1"; + /** + * 报警等级-二级 + */ + public static final String ALARM_LEVEL2 = "2"; + /** + * 报警等级-三级 + */ + public static final String ALARM_LEVEL3 = "3"; } diff --git a/tzipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue b/tzipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue index ed71c83..f097075 100644 --- a/tzipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue +++ b/tzipc-ui/src/components/VueOkrTree/vue-okr-tree/OkrTree.vue @@ -327,7 +327,7 @@ export default { position: relative; display: inline-block; } -.vertical .org-chart-node-label .org-chart-node-label-inner { +.org-chart-node-label .org-chart-node-label-inner { // box-shadow: 0 1px 10px rgba(31, 35, 41, 0.08); display: inline-block; padding: 10px; diff --git a/tzipc-ui/src/layout/components/Navbar.vue b/tzipc-ui/src/layout/components/Navbar.vue index 9069157..a2dd85e 100644 --- a/tzipc-ui/src/layout/components/Navbar.vue +++ b/tzipc-ui/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ :class="{ active: currentNav === index }" @click="handleJumpPath(item.path)" > + {{ item.meta.title }} diff --git a/tzipc-ui/src/views/ipc/bigscreen/index.vue b/tzipc-ui/src/views/ipc/bigscreen/index.vue index 5d42712..3960fee 100644 --- a/tzipc-ui/src/views/ipc/bigscreen/index.vue +++ b/tzipc-ui/src/views/ipc/bigscreen/index.vue @@ -31,7 +31,7 @@ R上 @@ -46,7 +46,7 @@ F上 @@ -61,7 +61,7 @@ R下 @@ -76,7 +76,7 @@ F下 @@ -455,6 +455,13 @@ export default { ft: false, fb: false, }, + // 是否一级报警 + isDangerAlarm: { + rt: false, + rb: false, + ft: false, + fb: false, + }, xSensorData: [], // 是否显示弹出层 // 遮罩层 @@ -704,6 +711,7 @@ export default { otherOperationAlarmStr, otherDriveAlarmStr, alarmCount, + dangerAlarmCount, } = data; // 处理报警数据 if (alarmCount) { @@ -730,6 +738,30 @@ export default { this.isAlarm.fb = false; } } + // 处理一级报警数据 + if (dangerAlarmCount) { + const { rtd, rto, rbd, rbo, ftd, fto, fbd, fbo } = dangerAlarmCount; + if (rtd || rto) { + this.isDangerAlarm.rt = true; + } else { + this.isDangerAlarm.rt = false; + } + if (rbd || rbo) { + this.isDangerAlarm.rb = true; + } else { + this.isDangerAlarm.rb = false; + } + if (ftd || fto) { + this.isDangerAlarm.ft = true; + } else { + this.isDangerAlarm.ft = false; + } + if (fbd || fbo) { + this.isDangerAlarm.fb = true; + } else { + this.isDangerAlarm.fb = false; + } + } this.rtAlarmStr = pzDriveAlarmStr; this.rbAlarmStr = otherDriveAlarmStr; this.ltAlarmStr = pzOperationAlarmStr; @@ -1543,6 +1575,9 @@ export default { color: #ffba00; font-size: 2rem; } +.danger-color { + color: red; +} .width-10 { width: 15%; }