From 83ee70a1a835601b620ef29211aea2d3dbf41900 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Tue, 16 Apr 2024 10:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=92=8C=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industrial/domain/IpcAlarmRecord.java     | 30 ++++++-------
 .../impl/IpcAlarmRulesServiceImpl.java        |  3 --
 zfipc-ui/src/App.vue                          |  9 ++--
 zfipc-ui/src/views/warn/alarm/index.vue       |  2 +-
 zfipc-ui/src/views/warn/record/index.vue      |  6 ++-
 zfipc-ui/src/views/zf/cydg/yxjk.vue           | 43 ++++++++++---------
 zfipc-ui/src/views/zf/zgdgBottom/index.vue    | 15 ++++++-
 zfipc-ui/src/views/zf/zgdgTop/index.vue       | 15 ++++++-
 8 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcAlarmRecord.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcAlarmRecord.java
index 2722c3c..ff8d9b0 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcAlarmRecord.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcAlarmRecord.java
@@ -183,21 +183,21 @@ public class IpcAlarmRecord extends BaseEntity
         this.alarmLevel = alarmLevel;
     }
 
-//    public IpcEquipInfo getEquipInfo() {
-//        return equipInfo;
-//    }
-//
-//    public void setEquipInfo(IpcEquipInfo equipInfo) {
-//        this.equipInfo = equipInfo;
-//    }
-//
-//    public IpcAlarmRules getAlarmRules() {
-//        return alarmRules;
-//    }
-//
-//    public void setAlarmRules(IpcAlarmRules alarmRules) {
-//        this.alarmRules = alarmRules;
-//    }
+    public IpcEquipInfo getEquipInfo() {
+        return equipInfo;
+    }
+
+    public void setEquipInfo(IpcEquipInfo equipInfo) {
+        this.equipInfo = equipInfo;
+    }
+
+    public IpcAlarmRules getAlarmRules() {
+        return alarmRules;
+    }
+
+    public void setAlarmRules(IpcAlarmRules alarmRules) {
+        this.alarmRules = alarmRules;
+    }
 
     public String[] getIds() {
         return ids;
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java
index 39d4f9c..af6a5c2 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcAlarmRulesServiceImpl.java
@@ -47,9 +47,6 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
         List<IpcEquipInfo> equips = ipcEquipInfoService.selectIpcEquipInfoList(null);
         for (IpcEquipInfo equip : equips) {
             List<IpcAlarmRules> rulesByEquipId = selectIpcAlarmRulesByEquipId(equip.getId());
-            if(redisCache.getCacheObject(CacheConstants.IPC_RULES_KEY+equip.getId()) != null){
-                redisCache.deleteObject(CacheConstants.IPC_RULES_KEY+equip.getId());
-            }
             redisCache.setCacheList((CacheConstants.IPC_RULES_KEY+equip.getId()),rulesByEquipId);
         }
     }
diff --git a/zfipc-ui/src/App.vue b/zfipc-ui/src/App.vue
index b83366c..217338e 100644
--- a/zfipc-ui/src/App.vue
+++ b/zfipc-ui/src/App.vue
@@ -30,18 +30,19 @@ div.el-table tr {
   background-color: #0b2d57;
 }
 .el-tabs--border-card {
-  background-color: #124b86;
+  background-color: #002250;
 }
 .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
-  background-color: #002250;
+  background-color: #124b86;
   border-color: white;
 }
 .el-tabs--border-card > .el-tabs__header .el-tabs__item {
-  background-color: #124b86;
+  background-color: #002250;
+
   border-color: white;
 }
 .el-tabs--border-card > .el-tabs__header {
-  background-color: #124b86;
+  background-color: #002250;
 }
 .pagination-container {
   height: 30px;
diff --git a/zfipc-ui/src/views/warn/alarm/index.vue b/zfipc-ui/src/views/warn/alarm/index.vue
index 1a9d21c..a1335f3 100644
--- a/zfipc-ui/src/views/warn/alarm/index.vue
+++ b/zfipc-ui/src/views/warn/alarm/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-tabs
       v-model="activeName"
-      type="card"
+      type="border-card"
       @tab-click="handleTabClick"
     >
       <el-tab-pane
diff --git a/zfipc-ui/src/views/warn/record/index.vue b/zfipc-ui/src/views/warn/record/index.vue
index c6a7948..f445b8b 100644
--- a/zfipc-ui/src/views/warn/record/index.vue
+++ b/zfipc-ui/src/views/warn/record/index.vue
@@ -6,12 +6,12 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
       style="text-align:right"
     >
       <el-form-item
         label="监测设备"
         prop="equipId"
+        label-width="60px"
       >
         <el-select
           v-model="queryParams.equipId"
@@ -30,6 +30,7 @@
       <el-form-item
         label="参数名称"
         prop="alarmRulesId"
+        label-width="60px"
       >
         <el-select
           v-model="queryParams.alarmRulesId"
@@ -48,6 +49,7 @@
       <el-form-item
         label="报警等级"
         prop="alarmLevel"
+        label-width="60px"
       >
         <el-select
           v-model="queryParams.alarmLevel"
@@ -65,6 +67,7 @@
       <el-form-item
         label="报警时间"
         prop="alarmTime"
+        label-width="60px"
       >
         <el-date-picker
           class="picker"
@@ -80,6 +83,7 @@
       <el-form-item
         label="状态"
         prop="alarmStatus"
+        label-width="40px"
       >
         <el-select
           v-model="queryParams.status"
diff --git a/zfipc-ui/src/views/zf/cydg/yxjk.vue b/zfipc-ui/src/views/zf/cydg/yxjk.vue
index b9b5c31..0d44ffd 100644
--- a/zfipc-ui/src/views/zf/cydg/yxjk.vue
+++ b/zfipc-ui/src/views/zf/cydg/yxjk.vue
@@ -396,52 +396,55 @@
             <el-row style="height: 40%">
               <el-col
                 :span="12"
-                id="dlnd"
-                style="height: 100%"
-                @click="trendClick('visc'
-                      ,'油品粘度','')"
+                style="height: 100%;"
               >
+                <div
+                  id="dlnd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('visc'
+                      ,'油品粘度','')"
+                ></div>
               </el-col>
               <el-col
                 :span="12"
-                id="xdsd"
                 style="height: 100%"
-                @click="trendClick('oil_water'
-                      ,'油品湿度','%')"
-              ></el-col>
+              >
+                <div
+                  id="xdsd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('oil_water'
+                        ,'油品湿度','%')"
+                ></div>
+              </el-col>
             </el-row>
             <el-row style="height: 10%;padding-top: 3%;">
               <el-col
                 :span="3"
                 style="text-align: right;;height: 100%"
-                @click="trendClick('gran4'
-                      ,'油液颗粒度（4um）','PM')"
-              >4um</el-col>
+              ><span @click="trendClick('gran4'
+                      ,'油液颗粒度（4um）','PM')">4um</span></el-col>
               <el-col :span="3">
                 <span class="numCol">{{ yykld4 }}</span>
               </el-col>
               <el-col
                 :span="3"
                 style="text-align: right;height: 100%"
-                @click="trendClick('gran6'
-                      ,'油液颗粒度（6um）','PM')"
-              >6um</el-col><el-col :span="3">
+              ><span @click="trendClick('gran6'
+                      ,'油液颗粒度（6um）','PM')">6um</span></el-col><el-col :span="3">
                 <span class="numCol">{{ yykld6 }}</span>
               </el-col>
               <el-col
                 :span="3"
                 style="text-align: right;height: 100%"
-                @click="trendClick('gran14'
-                      ,'油液颗粒度（14um）','PM')"
-              >14um</el-col><el-col :span="3">
+              ><span @click="trendClick('gran14'
+                      ,'油液颗粒度（14um）','PM')">14um</span></el-col><el-col :span="3">
                 <span class="numCol">{{ yykld14 }}</span>
               </el-col>
               <el-col
                 :span="3"
                 style="text-align: right;height: 100%"
-                @click="trendClick('gran21'
-                      ,'油液颗粒度（21um）','PM')"
-              >21um</el-col><el-col :span="3">
+              ><span @click="trendClick('gran21'
+                      ,'油液颗粒度（21um）','PM')">21um</span></el-col><el-col :span="3">
                 <span class="numCol">{{ yykld21 }}</span>
               </el-col>
             </el-row>
diff --git a/zfipc-ui/src/views/zf/zgdgBottom/index.vue b/zfipc-ui/src/views/zf/zgdgBottom/index.vue
index 45528e6..2bb7dcb 100644
--- a/zfipc-ui/src/views/zf/zgdgBottom/index.vue
+++ b/zfipc-ui/src/views/zf/zgdgBottom/index.vue
@@ -458,12 +458,25 @@
                 id="dlnd"
                 style="height: 100%"
               >
+                <div
+                  id="dlnd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('visc'
+                      ,'油品粘度','')"
+                ></div>
               </el-col>
               <el-col
                 :span="12"
                 id="xdsd"
                 style="height: 100%"
-              ></el-col>
+              >
+                <div
+                  id="xdsd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('oil_water'
+                        ,'油品湿度','%')"
+                ></div>
+              </el-col>
             </el-row>
             <el-row style="height: 10%;padding-top: 3%;">
               <el-col
diff --git a/zfipc-ui/src/views/zf/zgdgTop/index.vue b/zfipc-ui/src/views/zf/zgdgTop/index.vue
index bad6c5b..4ae227e 100644
--- a/zfipc-ui/src/views/zf/zgdgTop/index.vue
+++ b/zfipc-ui/src/views/zf/zgdgTop/index.vue
@@ -458,12 +458,25 @@
                 id="dlnd"
                 style="height: 100%"
               >
+                <div
+                  id="dlnd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('visc'
+                      ,'油品粘度','')"
+                ></div>
               </el-col>
               <el-col
                 :span="12"
                 id="xdsd"
                 style="height: 100%"
-              ></el-col>
+              >
+                <div
+                  id="xdsd"
+                  style="width: 100%;height: 100%;"
+                  @click="trendClick('oil_water'
+                        ,'油品湿度','%')"
+                ></div>
+              </el-col>
             </el-row>
             <el-row style="height: 10%;padding-top: 3%;">
               <el-col