From 1ff3072ad2a057253e409e2874e4a31a77ceb5f5 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Mon, 15 Apr 2024 14:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=A0=91=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industrial/IpcAlarmRecordController.java  |  14 +
 .../IpcFaultTreeConfigController.java         | 118 +++
 .../common/constant/CacheConstants.java       |   5 +
 .../datasyn/modbus/IPCData2SyncThread.java    |  53 +-
 .../datasyn/modbus/IPCData3SyncThread.java    |  46 +-
 .../datasyn/modbus/IPCDataSyncThread.java     |   8 +-
 .../industrial/domain/IpcAlarmRecord.java     |  48 +-
 .../industrial/domain/IpcFaultTreeConfig.java | 212 ++++
 .../industrial/domain/IpcFaultTreeShow.java   | 131 +++
 .../mapper/IpcFaultTreeConfigMapper.java      |  75 ++
 .../service/IIpcAlarmRulesService.java        |   8 +
 .../service/IIpcFaultTreeConfigService.java   |  76 ++
 .../service/impl/DataQueryService.java        |   2 +
 .../impl/IpcAlarmRulesServiceImpl.java        |  48 +-
 .../impl/IpcFaultTreeConfigServiceImpl.java   | 123 +++
 .../com/inspur/industrial/utils/IpcUtil.java  |   1 +
 .../industrial/IpcAlarmRecordMapper.xml       |  14 +-
 .../mapper/industrial/IpcAlarmRulesMapper.xml |   2 +-
 .../industrial/IpcFaultTreeConfigMapper.xml   | 221 +++++
 zfipc-ui/src/api/industrial/record.js         |   9 +
 zfipc-ui/src/views/zf/cydg/yxjk.vue           | 141 ++-
 zfipc-ui/src/views/zf/zgdgBottom/index.vue    | 915 ++++++++++++++----
 zfipc-ui/src/views/zf/zgdgTop/index.vue       | 910 +++++++++++++----
 23 files changed, 2685 insertions(+), 495 deletions(-)
 create mode 100644 zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcFaultTreeConfigController.java
 create mode 100644 zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeConfig.java
 create mode 100644 zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeShow.java
 create mode 100644 zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/mapper/IpcFaultTreeConfigMapper.java
 create mode 100644 zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcFaultTreeConfigService.java
 create mode 100644 zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcFaultTreeConfigServiceImpl.java
 create mode 100644 zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcFaultTreeConfigMapper.xml

diff --git a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRecordController.java b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRecordController.java
index 8e5117c..4cd7a2b 100644
--- a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRecordController.java
+++ b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcAlarmRecordController.java
@@ -2,6 +2,8 @@ package com.inspur.web.controller.industrial;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,6 +48,18 @@ public class IpcAlarmRecordController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询所有报警记录
+     * @param ipcAlarmRecord
+     * @return
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(IpcAlarmRecord ipcAlarmRecord)
+    {
+        List<IpcAlarmRecord> list = ipcAlarmRecordService.selectIpcAlarmRecordList(ipcAlarmRecord);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出报警记录列表
      */
diff --git a/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcFaultTreeConfigController.java b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcFaultTreeConfigController.java
new file mode 100644
index 0000000..6e0b55c
--- /dev/null
+++ b/zfipc-server/zfipc-admin/src/main/java/com/inspur/web/controller/industrial/IpcFaultTreeConfigController.java
@@ -0,0 +1,118 @@
+package com.inspur.web.controller.industrial;
+
+import com.inspur.common.annotation.Log;
+import com.inspur.common.core.controller.BaseController;
+import com.inspur.common.core.domain.AjaxResult;
+import com.inspur.common.enums.BusinessType;
+import com.inspur.common.utils.poi.ExcelUtil;
+import com.inspur.industrial.domain.IpcFaultTreeConfig;
+import com.inspur.industrial.domain.IpcFaultTreeConfig;
+import com.inspur.industrial.service.IIpcFaultTreeConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 故障树配置Controller
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+@RestController
+@RequestMapping("/ipc/faultTreeConfig")
+public class IpcFaultTreeConfigController extends BaseController
+{
+    @Autowired
+    private IIpcFaultTreeConfigService ipcFaultTreeConfigService;
+
+    /**
+     * 查询故障树配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:list')")
+    @GetMapping("/list")
+    public AjaxResult list(IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        List<IpcFaultTreeConfig> list = ipcFaultTreeConfigService.selectIpcFaultTreeConfigList(ipcFaultTreeConfig);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出故障树配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:export')")
+    @Log(title = "故障树配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        List<IpcFaultTreeConfig> list = ipcFaultTreeConfigService.selectIpcFaultTreeConfigList(ipcFaultTreeConfig);
+        ExcelUtil<IpcFaultTreeConfig> util = new ExcelUtil<IpcFaultTreeConfig>(IpcFaultTreeConfig.class);
+        util.exportExcel(response, list, "故障树配置数据");
+    }
+
+    /**
+     * 获取故障树配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:query')")
+    @GetMapping(value = "/{nodeId}")
+    public AjaxResult getInfo(@PathVariable("nodeId") Long nodeId)
+    {
+        return AjaxResult.success(ipcFaultTreeConfigService.selectIpcFaultTreeConfigByNodeId(nodeId));
+    }
+
+    /**
+     * 校验是否存在子节点
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:query')")
+    @GetMapping(value = "/hasChild/{nodeId}")
+    public AjaxResult hasChild(@PathVariable("nodeId") Long nodeId)
+    {
+        return AjaxResult.success(ipcFaultTreeConfigService.hasChild(nodeId));
+    }
+
+    /**
+     * 新增故障树配置
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:add')")
+    @Log(title = "故障树配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        return toAjax(ipcFaultTreeConfigService.insertIpcFaultTreeConfig(ipcFaultTreeConfig));
+    }
+
+    /**
+     * 修改故障树配置
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:edit')")
+    @Log(title = "故障树配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        return toAjax(ipcFaultTreeConfigService.updateIpcFaultTreeConfig(ipcFaultTreeConfig));
+    }
+
+    /**
+     * 删除故障树配置
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:remove')")
+    @Log(title = "故障树配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{nodeIds}")
+    public AjaxResult remove(@PathVariable Long[] nodeIds)
+    {
+        return toAjax(ipcFaultTreeConfigService.deleteIpcFaultTreeConfigByNodeIds(nodeIds));
+    }
+
+    /**
+     * 查询故障树查询
+     */
+    @PreAuthorize("@ss.hasPermi('ipc:faultTreeConfig:list')")
+    @GetMapping("/getFaultTreeShow/{equipId}")
+    public AjaxResult getFaultTreeShow(@PathVariable("equipId") String equipId)
+    {
+        return AjaxResult.success(ipcFaultTreeConfigService.getFaultTreeShow(equipId));
+    }
+
+}
diff --git a/zfipc-server/zfipc-common/src/main/java/com/inspur/common/constant/CacheConstants.java b/zfipc-server/zfipc-common/src/main/java/com/inspur/common/constant/CacheConstants.java
index 40c054d..998ece2 100644
--- a/zfipc-server/zfipc-common/src/main/java/com/inspur/common/constant/CacheConstants.java
+++ b/zfipc-server/zfipc-common/src/main/java/com/inspur/common/constant/CacheConstants.java
@@ -41,4 +41,9 @@ public class CacheConstants
      * 登录账户密码错误次数 redis key
      */
     public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+    /**
+     * ipc规则
+     */
+    public static final String IPC_RULES_KEY = "ipc_rules:";
 }
diff --git a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java
index d6c6716..a16f1a3 100644
--- a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java
+++ b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData2SyncThread.java
@@ -1,6 +1,12 @@
 package com.inspur.datasyn.modbus;
 
 import com.inspur.common.utils.spring.SpringUtils;
+import com.inspur.industrial.domain.IpcAlarmRecord;
+import com.inspur.industrial.domain.IpcAlarmRules;
+import com.inspur.industrial.service.IIpcAlarmRecordService;
+import com.inspur.industrial.service.IIpcAlarmRulesService;
+import com.inspur.industrial.utils.Constant;
+import com.inspur.industrial.utils.IpcUtil;
 import com.inspur.industrial.utils.JudgeUtil;
 import com.inspur.system.service.influx.InfluxDBService;
 import com.serotonin.modbus4j.BatchRead;
@@ -14,9 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 public class IPCData2SyncThread implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(IPCDataSyncThread.class);
@@ -24,6 +28,8 @@ public class IPCData2SyncThread implements Runnable {
     private ModbusMaster master;
     private String time;
 
+    private static final String EQUIP_ID = "5d6c1a1374ea490a91e1361c1f5400aa";
+
     public IPCData2SyncThread(ModbusMaster master, String time){
         this.master = master;
         this.time = time;
@@ -58,7 +64,11 @@ public class IPCData2SyncThread implements Runnable {
             Map<String,String> tags = new TreeMap();
             tags.put("equ_id","5d6c1a1374ea490a91e1361c1f5400aa");
             Map<String,Object> fields = new TreeMap();
+            IpcUtil ipcUtil = SpringUtils.getBean(IpcUtil.class);
+            IIpcAlarmRulesService alarmRulesService = SpringUtils.getBean(IIpcAlarmRulesService.class);
+            IIpcAlarmRecordService alarmRecordService = SpringUtils.getBean(IIpcAlarmRecordService.class);
 
+            List<IpcAlarmRecord> alarmRecordList = new ArrayList<>();
 
             // 系统电流
             fields.put("sys_cur",(float) 0 + Math.random());
@@ -71,6 +81,12 @@ public class IPCData2SyncThread implements Runnable {
 //            fields.put("ywcsz",0.5);
 //            fields.put("ywmin",0.3);
 //            fields.put("ywmax",1);
+            //液位最小和最大值通过报警参数设置获取
+            IpcAlarmRules levelRule = getLevelAlarmRule();
+            //正式需要放开
+            fields.put("level_min",levelRule == null ? 0.0 : levelRule.getAlertLowerBound().floatValue());
+            fields.put("level_max",levelRule == null ? 0.0 : levelRule.getAlertUpperBound().floatValue());
+
             // 系统温度
             fields.put("sys_temp",(float) 0 + Math.random());
             // 油液颗粒度
@@ -133,7 +149,7 @@ public class IPCData2SyncThread implements Runnable {
             // 十一压区比例减压阀
             fields.put("press11",(float) 0 + Math.random());
             // 一压区流量
-            fields.put("flw1",(float) 0 + Math.random());
+            fields.put("pre",(float) 0 + Math.random());
             // 二压区流量
             fields.put("flw2",(float) 0 + Math.random());
             // 三压区流量
@@ -154,15 +170,34 @@ public class IPCData2SyncThread implements Runnable {
             fields.put("flw10",(float) 0 + Math.random());
             // 十一压区流量
             fields.put("flw11",(float) 0 + Math.random());
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-            String format = simpleDateFormat.format(new Date());
-            fields.put("insertTime",format);
+//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+//            String format = simpleDateFormat.format(new Date());
+//            fields.put("insertTime",format);
+
+            //报警处理
+            List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
+            alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
+            if (!alarmRecordList.isEmpty()){//运行需放开
+                // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
+            }
+
             InfluxDBService i = SpringUtils.getBean(InfluxDBService.class);
-            // 判断并处理报警数据
-//            JudgeUtil.judgeAndSaveAlarmData(fields,"2");
             i.insert(measurement,tags,fields);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 获取液位的报警规则
+     * @return
+     */
+    private IpcAlarmRules getLevelAlarmRule(){
+        IIpcAlarmRulesService ipcAlarmRulesService = SpringUtils.getBean(IIpcAlarmRulesService.class);
+        IpcAlarmRules query = new IpcAlarmRules();
+        query.setEquipId(EQUIP_ID);
+        query.setAlarmNameKey("sys_level");
+        query.setType(Constant.RUNNING);//运行中
+        return ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0) == null ? null : ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0);
+    }
 }
diff --git a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java
index cbf1ca0..7c6d81f 100644
--- a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java
+++ b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCData3SyncThread.java
@@ -1,6 +1,12 @@
 package com.inspur.datasyn.modbus;
 
 import com.inspur.common.utils.spring.SpringUtils;
+import com.inspur.industrial.domain.IpcAlarmRecord;
+import com.inspur.industrial.domain.IpcAlarmRules;
+import com.inspur.industrial.service.IIpcAlarmRecordService;
+import com.inspur.industrial.service.IIpcAlarmRulesService;
+import com.inspur.industrial.utils.Constant;
+import com.inspur.industrial.utils.IpcUtil;
 import com.inspur.industrial.utils.JudgeUtil;
 import com.inspur.system.service.influx.InfluxDBService;
 import com.serotonin.modbus4j.BatchRead;
@@ -14,9 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 public class IPCData3SyncThread implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(IPCDataSyncThread.class);
@@ -24,6 +28,8 @@ public class IPCData3SyncThread implements Runnable {
     private ModbusMaster master;
     private String time;
 
+    private static final String EQUIP_ID = "8b2d5cb04e254c15ade1e53a4f594f3f";
+
     public IPCData3SyncThread(ModbusMaster master, String time){
         this.master = master;
         this.time = time;
@@ -59,6 +65,12 @@ public class IPCData3SyncThread implements Runnable {
             tags.put("equ_id","8b2d5cb04e254c15ade1e53a4f594f3f");
             Map<String,Object> fields = new TreeMap();
 
+            IpcUtil ipcUtil = SpringUtils.getBean(IpcUtil.class);
+            IIpcAlarmRulesService alarmRulesService = SpringUtils.getBean(IIpcAlarmRulesService.class);
+            IIpcAlarmRecordService alarmRecordService = SpringUtils.getBean(IIpcAlarmRecordService.class);
+
+            List<IpcAlarmRecord> alarmRecordList = new ArrayList<>();
+
             // 系统电流
             fields.put("sys_cur",(float) 0 + Math.random());
             // 系统流量
@@ -70,6 +82,13 @@ public class IPCData3SyncThread implements Runnable {
 //            fields.put("ywcsz",0.5);
 //            fields.put("ywmin",0.3);
 //            fields.put("ywmax",1);
+
+            //液位最小和最大值通过报警参数设置获取
+            IpcAlarmRules levelRule = getLevelAlarmRule();
+            //正式需要放开
+            fields.put("level_min",levelRule == null ? 0.0 : levelRule.getAlertLowerBound().floatValue());
+            fields.put("level_max",levelRule == null ? 0.0 : levelRule.getAlertUpperBound().floatValue());
+
             // 系统温度
             fields.put("sys_temp",(float) 0 + Math.random());
             // 油液颗粒度
@@ -128,9 +147,16 @@ public class IPCData3SyncThread implements Runnable {
             // 十一压区流量
             fields.put("flw11",(float) 0 + Math.random());
 
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-            String format = simpleDateFormat.format(new Date());
-            fields.put("insertTime",format);
+//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+//            String format = simpleDateFormat.format(new Date());
+//            fields.put("insertTime",format);
+            //报警处理
+            List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
+            alarmRecordList.addAll(ipcUtil.dealRealTimeData(fields,tags, Constant.RUNNING,rulesList));
+            if (!alarmRecordList.isEmpty()){//运行需放开
+                // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
+            }
+
             InfluxDBService i = SpringUtils.getBean(InfluxDBService.class);
             // 判断并处理报警数据
 //            JudgeUtil.judgeAndSaveAlarmData(fields,"3");
@@ -139,4 +165,12 @@ public class IPCData3SyncThread implements Runnable {
             e.printStackTrace();
         }
     }
+    private IpcAlarmRules getLevelAlarmRule(){
+        IIpcAlarmRulesService ipcAlarmRulesService = SpringUtils.getBean(IIpcAlarmRulesService.class);
+        IpcAlarmRules query = new IpcAlarmRules();
+        query.setEquipId(EQUIP_ID);
+        query.setAlarmNameKey("sys_level");
+        query.setType(Constant.RUNNING);//运行中
+        return ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0) == null ? null : ipcAlarmRulesService.selectIpcAlarmRulesList(query).get(0);
+    }
 }
diff --git a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncThread.java b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncThread.java
index fa362cc..abbbabc 100644
--- a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncThread.java
+++ b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncThread.java
@@ -180,9 +180,9 @@ public class IPCDataSyncThread implements Runnable {
 //            // DS软辊加压压力
 //            fields.put("dsrgjyyl",0.4);
 
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-            String format = simpleDateFormat.format(new Date());
-            tags.put("insertTime",format);
+//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+//            String format = simpleDateFormat.format(new Date());
+//            tags.put("insertTime",format);
 
             //报警处理
             List<IpcAlarmRules> rulesList = alarmRulesService.selectIpcAlarmRulesByEquipId(EQUIP_ID);
@@ -190,7 +190,7 @@ public class IPCDataSyncThread implements Runnable {
             i.insert(measurement,tags,fields);
 
             if (!alarmRecordList.isEmpty()){//运行需放开
-                //alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
+               // alarmRecordService.batchInsertIpcAlarmRecord(alarmRecordList);
             }
         } catch (Exception e) {
             e.printStackTrace();
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 5f9915c..2722c3c 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
@@ -34,6 +34,11 @@ public class IpcAlarmRecord extends BaseEntity
     @Excel(name = "传感器id")
     private String sensorId;
 
+    /**
+     * 参数key值
+     */
+    private String nameKey;
+
     /** 报警内容 */
     @Excel(name = "报警内容")
     private String content;
@@ -43,8 +48,8 @@ public class IpcAlarmRecord extends BaseEntity
     private BigDecimal alarmValue;
 
     /** 报警时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:SS")
     private Date alarmTime;
 
     /** 处理结果 */
@@ -112,6 +117,14 @@ public class IpcAlarmRecord extends BaseEntity
         this.content = content;
     }
 
+    public String getNameKey() {
+        return nameKey;
+    }
+
+    public void setNameKey(String nameKey) {
+        this.nameKey = nameKey;
+    }
+
     public String getContent()
     {
         return content;
@@ -170,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;
@@ -201,6 +214,7 @@ public class IpcAlarmRecord extends BaseEntity
                 .append("alarmRulesId", getAlarmRulesId())
                 .append("equipId", getEquipId())
                 .append("sensorId", getSensorId())
+                .append("nameKey", getNameKey())
                 .append("content", getContent())
                 .append("alarmValue", getAlarmValue())
                 .append("alarmTime", getAlarmTime())
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeConfig.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeConfig.java
new file mode 100644
index 0000000..dbe137d
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeConfig.java
@@ -0,0 +1,212 @@
+package com.inspur.industrial.domain;
+
+import com.inspur.common.annotation.Excel;
+import com.inspur.common.core.domain.TreeEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 故障树配置对象 ipc_fault_tree_config
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+public class IpcFaultTreeConfig extends TreeEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点id */
+    private Long nodeId;
+
+    /** 部门名称 */
+    @Excel(name = "节点名称")
+    private String nodeName;
+
+    /** 所属部位 */
+    @Excel(name = "所属设备id")
+    private String equipId;
+
+    /** 规则id */
+    @Excel(name = "规则id")
+    private String alarmRuleConfigId;
+
+    /** 规则描述 */
+    @Excel(name = "规则描述")
+    private String alarmRuleConfigDescription;
+
+    /** 节点图标 */
+    @Excel(name = "节点图标")
+    private String iconCls;
+
+    /** 节点形状 */
+    @Excel(name = "节点形状")
+    private String nodeShapeType;
+
+    /** 节点默认颜色 */
+    @Excel(name = "节点默认颜色")
+    private String nodeDefaultColor;
+
+    /** 节点报警颜色 */
+    @Excel(name = "节点报警颜色")
+    private String nodeAlarmColor;
+
+    /** 是否叶子节点 */
+    @Excel(name = "是否叶子节点")
+    private String isLeaf;
+
+    /** 是否报警 */
+    @Excel(name = "是否报警")
+    private String isAlarm;
+
+    /** 节点状态（0正常 1停用） */
+    @Excel(name = "节点状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setNodeId(Long nodeId)
+    {
+        this.nodeId = nodeId;
+    }
+
+    public Long getNodeId()
+    {
+        return nodeId;
+    }
+    public void setNodeName(String nodeName)
+    {
+        this.nodeName = nodeName;
+    }
+
+    public String getNodeName()
+    {
+        return nodeName;
+    }
+    public void setEquipId(String equipId)
+    {
+        this.equipId = equipId;
+    }
+
+    public String getEquipId()
+    {
+        return equipId;
+    }
+    public void setIconCls(String iconCls)
+    {
+        this.iconCls = iconCls;
+    }
+
+    public String getIconCls()
+    {
+        return iconCls;
+    }
+    public void setNodeShapeType(String nodeShapeType)
+    {
+        this.nodeShapeType = nodeShapeType;
+    }
+
+    public String getNodeShapeType()
+    {
+        return nodeShapeType;
+    }
+    public void setNodeDefaultColor(String nodeDefaultColor)
+    {
+        this.nodeDefaultColor = nodeDefaultColor;
+    }
+
+    public String getNodeDefaultColor()
+    {
+        return nodeDefaultColor;
+    }
+    public void setNodeAlarmColor(String nodeAlarmColor)
+    {
+        this.nodeAlarmColor = nodeAlarmColor;
+    }
+
+    public String getNodeAlarmColor()
+    {
+        return nodeAlarmColor;
+    }
+    public void setIsAlarm(String isAlarm)
+    {
+        this.isAlarm = isAlarm;
+    }
+
+    public String getIsAlarm()
+    {
+        return isAlarm;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public String getAlarmRuleConfigId() {
+        return alarmRuleConfigId;
+    }
+
+    public void setAlarmRuleConfigId(String alarmRuleConfigId) {
+        this.alarmRuleConfigId = alarmRuleConfigId;
+    }
+
+    public String getAlarmRuleConfigDescription() {
+        return alarmRuleConfigDescription;
+    }
+
+    public void setAlarmRuleConfigDescription(String alarmRuleConfigDescription) {
+        this.alarmRuleConfigDescription = alarmRuleConfigDescription;
+    }
+
+    public String getIsLeaf() {
+        return isLeaf;
+    }
+
+    public void setIsLeaf(String isLeaf) {
+        this.isLeaf = isLeaf;
+    }
+
+    public IpcFaultTreeConfig() {
+    }
+
+    public IpcFaultTreeConfig(String equipId) {
+        this.equipId = equipId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("nodeId", getNodeId())
+            .append("parentId", getParentId())
+            .append("ancestors", getAncestors())
+            .append("nodeName", getNodeName())
+            .append("orderNum", getOrderNum())
+            .append("equipId", getEquipId())
+            .append("iconCls", getIconCls())
+            .append("nodeShapeType", getNodeShapeType())
+            .append("nodeDefaultColor", getNodeDefaultColor())
+            .append("nodeAlarmColor", getNodeAlarmColor())
+            .append("isAlarm", getIsAlarm())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeShow.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeShow.java
new file mode 100644
index 0000000..bce56c8
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcFaultTreeShow.java
@@ -0,0 +1,131 @@
+package com.inspur.industrial.domain;
+
+import com.inspur.common.core.domain.TreeEntity;
+
+/**
+ * 故障树配置对象 ipc_fault_tree_config
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+public class IpcFaultTreeShow extends TreeEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 节点id
+     */
+    private Long nodeId;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+
+    /**
+     * 节点内容
+     */
+    private String content;
+
+    /**
+     * 节点描述
+     */
+    private String nodeDsc;
+
+    /**
+     * 节点图标
+     */
+    private String iconCls;
+
+    /**
+     * 节点边框颜色
+     */
+    private String nodeBorderColor;
+
+    /**
+     * 节点形状
+     */
+    private String nodeShapeType;
+
+    /**
+     * 节点文字颜色
+     */
+    private String nodeFontColor;
+
+    public Long getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(Long nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getNodeDsc() {
+        return nodeDsc;
+    }
+
+    public void setNodeDsc(String nodeDsc) {
+        this.nodeDsc = nodeDsc;
+    }
+
+    public String getIconCls() {
+        return iconCls;
+    }
+
+    public void setIconCls(String iconCls) {
+        this.iconCls = iconCls;
+    }
+
+    public String getNodeBorderColor() {
+        return nodeBorderColor;
+    }
+
+    public void setNodeBorderColor(String nodeBorderColor) {
+        this.nodeBorderColor = nodeBorderColor;
+    }
+
+    public String getNodeShapeType() {
+        return nodeShapeType;
+    }
+
+    public void setNodeShapeType(String nodeShapeType) {
+        this.nodeShapeType = nodeShapeType;
+    }
+
+    public String getNodeFontColor() {
+        return nodeFontColor;
+    }
+
+    public void setNodeFontColor(String nodeFontColor) {
+        this.nodeFontColor = nodeFontColor;
+    }
+
+    @Override
+    public String toString() {
+        return "IpcFaultTreeShow{" +
+                "nodeId=" + nodeId +
+                ", label='" + label + '\'' +
+                ", content='" + content + '\'' +
+                ", nodeDsc='" + nodeDsc + '\'' +
+                ", iconCls='" + iconCls + '\'' +
+                ", nodeBorderColor='" + nodeBorderColor + '\'' +
+                ", nodeShapeType='" + nodeShapeType + '\'' +
+                ", nodeFontColor='" + nodeFontColor + '\'' +
+                '}';
+    }
+}
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/mapper/IpcFaultTreeConfigMapper.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/mapper/IpcFaultTreeConfigMapper.java
new file mode 100644
index 0000000..9f0ad3d
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/mapper/IpcFaultTreeConfigMapper.java
@@ -0,0 +1,75 @@
+package com.inspur.industrial.mapper;
+
+import com.inspur.industrial.domain.IpcFaultTreeConfig;
+
+import java.util.List;
+
+/**
+ * 故障树配置Mapper接口
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+public interface IpcFaultTreeConfigMapper
+{
+    /**
+     * 查询故障树配置
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    public IpcFaultTreeConfig selectIpcFaultTreeConfigByNodeId(Long nodeId);
+
+    /**
+     * 校验是否存在子节点
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    public int hasChild(Long nodeId);
+
+    /**
+     * 查询故障树配置列表
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 故障树配置集合
+     */
+    public List<IpcFaultTreeConfig> selectIpcFaultTreeConfigList(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 新增故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    public int insertIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 修改故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    public int updateIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 删除故障树配置
+     *
+     * @param nodeId 故障树配置主键
+     * @return 结果
+     */
+    public int deleteIpcFaultTreeConfigByNodeId(Long nodeId);
+
+    /**
+     * 批量删除故障树配置
+     *
+     * @param nodeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteIpcFaultTreeConfigByNodeIds(Long[] nodeIds);
+
+    /**
+     * 查询故障树查询
+     */
+    public List<IpcFaultTreeConfig> getFaultTreeShow(String equipId);
+}
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcAlarmRulesService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcAlarmRulesService.java
index b279a34..4755ba6 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcAlarmRulesService.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcAlarmRulesService.java
@@ -64,5 +64,13 @@ public interface IIpcAlarmRulesService
      * @return 结果
      */
     public int deleteIpcAlarmRulesById(String id);
+
+    /**
+     * 获取告警规则缓存
+     *
+     * @param part 监测部位
+     * @return 告警规则配置集合
+     */
+    public List<IpcAlarmRules> selectIpcAlarmRulesConfigListByCache(String equipId);
 }
 
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcFaultTreeConfigService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcFaultTreeConfigService.java
new file mode 100644
index 0000000..f7518b5
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/IIpcFaultTreeConfigService.java
@@ -0,0 +1,76 @@
+package com.inspur.industrial.service;
+
+import com.inspur.industrial.domain.IpcFaultTreeConfig;
+
+import java.util.List;
+
+/**
+ * 故障树配置Service接口
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+public interface IIpcFaultTreeConfigService
+{
+    /**
+     * 查询故障树配置
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    public IpcFaultTreeConfig selectIpcFaultTreeConfigByNodeId(Long nodeId);
+
+
+    /**
+     * 校验是否存在子节点
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    public boolean hasChild(Long nodeId);
+
+    /**
+     * 查询故障树配置列表
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 故障树配置集合
+     */
+    public List<IpcFaultTreeConfig> selectIpcFaultTreeConfigList(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 新增故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    public int insertIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 修改故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    public int updateIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig);
+
+    /**
+     * 批量删除故障树配置
+     *
+     * @param nodeIds 需要删除的故障树配置主键集合
+     * @return 结果
+     */
+    public int deleteIpcFaultTreeConfigByNodeIds(Long[] nodeIds);
+
+    /**
+     * 删除故障树配置信息
+     *
+     * @param nodeId 故障树配置主键
+     * @return 结果
+     */
+    public int deleteIpcFaultTreeConfigByNodeId(Long nodeId);
+
+    /**
+     * 查询故障树查询
+     */
+    public List<IpcFaultTreeConfig> getFaultTreeShow(String equipId);
+}
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
index 4c4059a..5aa1966 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/DataQueryService.java
@@ -412,6 +412,8 @@ public class DataQueryService implements IDataQueryService {
         resMap.put("syslevel", list.get(0).get("sys_level"));//系统液位
         resMap.put("syslevelinit", Integer.parseInt(sysConfigService.selectConfigByKey("sys.liquidlevel.init")));//液位初始值
         //TODO 获取系统液位高值和低值
+        resMap.put("levelmax", list.get(0).get("level_max"));
+        resMap.put("levelmin", list.get(0).get("level_min"));
 
         resMap.put("systemp",list.get(0).get("sys_temp"));//系统温度
         resMap.put("syshumid",list.get(0).get("oil_water"));//系统湿度
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 005e2c1..f4223c2 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
@@ -4,7 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.inspur.common.constant.CacheConstants;
+import com.inspur.common.core.redis.RedisCache;
 import com.inspur.common.utils.uuid.IdUtils;
+import com.inspur.equip.domain.IpcEquipInfo;
+import com.inspur.equip.service.IIpcEquipInfoService;
 import com.inspur.industrial.domain.IpcMonitorDataInfo;
 import com.inspur.industrial.service.IIpcMonitorDataInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +17,7 @@ import com.inspur.industrial.mapper.IpcAlarmRulesMapper;
 import com.inspur.industrial.domain.IpcAlarmRules;
 import com.inspur.industrial.service.IIpcAlarmRulesService;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 /**
@@ -30,6 +35,23 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
     @Resource
     private IIpcMonitorDataInfoService ipcMonitorDataInfoService;
 
+    @Resource
+    private RedisCache redisCache;
+
+    @Resource
+    private IIpcEquipInfoService ipcEquipInfoService;
+
+    //加载规则到缓存
+    @PostConstruct
+    public void init(){
+        List<IpcAlarmRules> rules = selectIpcAlarmRulesList(null);
+        List<IpcEquipInfo> equips = ipcEquipInfoService.selectIpcEquipInfoList(null);
+        for (IpcEquipInfo equip : equips) {
+            List<IpcAlarmRules> rulesByEquipId = selectIpcAlarmRulesByEquipId(equip.getId());
+            redisCache.setCacheObject(CacheConstants.IPC_RULES_KEY+equip.getId(),rulesByEquipId);
+        }
+    }
+
     /**
      * 查询设备报警规则
      *
@@ -86,7 +108,7 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
 //
 //        });
 //    }
-
+//TODO 新增、删除更新redis
     /**
      * 新增设备报警规则
      *
@@ -108,7 +130,12 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
     @Override
     public int updateIpcAlarmRules(IpcAlarmRules ipcAlarmRules)
     {
-        return ipcAlarmRulesMapper.updateIpcAlarmRules(ipcAlarmRules);
+        int num = ipcAlarmRulesMapper.updateIpcAlarmRules(ipcAlarmRules);
+        if (num > 0){
+            List<IpcAlarmRules> rules = selectIpcAlarmRulesByEquipId(ipcAlarmRules.getEquipId());
+            redisCache.setCacheObject(CacheConstants.IPC_RULES_KEY + ipcAlarmRules.getEquipId(),rules);
+        }
+        return num;
     }
 
     /**
@@ -134,5 +161,22 @@ public class IpcAlarmRulesServiceImpl implements IIpcAlarmRulesService
     {
         return ipcAlarmRulesMapper.deleteIpcAlarmRulesById(id);
     }
+
+    /**
+     * 获取告警规则缓存
+     *
+     * @param part 监测部位
+     * @return 告警规则配置集合
+     */
+    @Override
+    public List<IpcAlarmRules> selectIpcAlarmRulesConfigListByCache(String equipId){
+        List<IpcAlarmRules> rules = redisCache.getCacheList(CacheConstants.IPC_RULES_KEY + equipId);
+        if (rules == null || rules.size() == 0){
+            List<IpcAlarmRules> rulesList = selectIpcAlarmRulesByEquipId(equipId);
+            redisCache.setCacheList(CacheConstants.IPC_RULES_KEY + equipId,rulesList);
+            return rulesList;
+        }
+        return rules;
+    }
 }
 
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcFaultTreeConfigServiceImpl.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcFaultTreeConfigServiceImpl.java
new file mode 100644
index 0000000..b3e885e
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/service/impl/IpcFaultTreeConfigServiceImpl.java
@@ -0,0 +1,123 @@
+package com.inspur.industrial.service.impl;
+
+import com.inspur.common.constant.UserConstants;
+import com.inspur.common.exception.ServiceException;
+import com.inspur.common.utils.DateUtils;
+import com.inspur.industrial.domain.IpcFaultTreeConfig;
+import com.inspur.industrial.mapper.IpcFaultTreeConfigMapper;
+import com.inspur.industrial.service.IIpcFaultTreeConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 故障树配置Service业务层处理
+ *
+ * @author inspur
+ * @date 2024-04-02
+ */
+@Service
+public class IpcFaultTreeConfigServiceImpl implements IIpcFaultTreeConfigService
+{
+    @Autowired
+    private IpcFaultTreeConfigMapper ipcFaultTreeConfigMapper;
+
+    /**
+     * 查询故障树配置
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    @Override
+    public IpcFaultTreeConfig selectIpcFaultTreeConfigByNodeId(Long nodeId)
+    {
+        return ipcFaultTreeConfigMapper.selectIpcFaultTreeConfigByNodeId(nodeId);
+    }
+    /**
+     * 校验是否存在子节点
+     *
+     * @param nodeId 故障树配置主键
+     * @return 故障树配置
+     */
+    @Override
+    public boolean hasChild(Long nodeId){
+        return ipcFaultTreeConfigMapper.hasChild(nodeId) > 0;
+    }
+    /**
+     * 查询故障树配置列表
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 故障树配置
+     */
+    @Override
+    public List<IpcFaultTreeConfig> selectIpcFaultTreeConfigList(IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        return ipcFaultTreeConfigMapper.selectIpcFaultTreeConfigList(ipcFaultTreeConfig);
+    }
+
+    /**
+     * 新增故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    @Override
+    public int insertIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        IpcFaultTreeConfig parentInfo = ipcFaultTreeConfigMapper.selectIpcFaultTreeConfigByNodeId(ipcFaultTreeConfig.getParentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (!UserConstants.DEPT_NORMAL.equals(parentInfo.getStatus()))
+        {
+            throw new ServiceException("父节点停用，不允许新增");
+        }
+        ipcFaultTreeConfig.setAncestors(parentInfo.getAncestors()+","+ipcFaultTreeConfig.getParentId());
+        ipcFaultTreeConfig.setCreateTime(DateUtils.getNowDate());
+        return ipcFaultTreeConfigMapper.insertIpcFaultTreeConfig(ipcFaultTreeConfig);
+    }
+
+    /**
+     * 修改故障树配置
+     *
+     * @param ipcFaultTreeConfig 故障树配置
+     * @return 结果
+     */
+    @Override
+    public int updateIpcFaultTreeConfig(IpcFaultTreeConfig ipcFaultTreeConfig)
+    {
+        ipcFaultTreeConfig.setUpdateTime(DateUtils.getNowDate());
+        return ipcFaultTreeConfigMapper.updateIpcFaultTreeConfig(ipcFaultTreeConfig);
+    }
+
+    /**
+     * 批量删除故障树配置
+     *
+     * @param nodeIds 需要删除的故障树配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIpcFaultTreeConfigByNodeIds(Long[] nodeIds)
+    {
+        return ipcFaultTreeConfigMapper.deleteIpcFaultTreeConfigByNodeIds(nodeIds);
+    }
+
+    /**
+     * 删除故障树配置信息
+     *
+     * @param nodeId 故障树配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteIpcFaultTreeConfigByNodeId(Long nodeId)
+    {
+        return ipcFaultTreeConfigMapper.deleteIpcFaultTreeConfigByNodeId(nodeId);
+    }
+
+    /**
+     * 查询故障树
+     */
+    @Override
+    public List<IpcFaultTreeConfig> getFaultTreeShow(String equipId){
+        return ipcFaultTreeConfigMapper.getFaultTreeShow(equipId);
+    }
+}
diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java
index f1bd5e0..5a407a7 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/utils/IpcUtil.java
@@ -81,6 +81,7 @@ public class IpcUtil {
                     String name = rule.getAlarmNameKey();
                     double value = (double) map.get(name);
                     ipcAlarmRecord.setAlarmValue(BigDecimal.valueOf(value));
+                    ipcAlarmRecord.setNameKey(name);
                     ipcAlarmRecord.setContent(rule.getReferenceName());
                     ipcAlarmRecord.setStatus(0);
                     ipcAlarmRecord.setOperator(1L);
diff --git a/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRecordMapper.xml b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRecordMapper.xml
index 1e6072e..1f4cfd9 100644
--- a/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRecordMapper.xml
+++ b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRecordMapper.xml
@@ -8,6 +8,7 @@
         <result property="alarmRulesId"    column="alarm_rules_id"    />
         <result property="equipId"    column="equip_id"    />
         <result property="sensorId"    column="sensor_id"    />
+        <result property="nameKey"    column="name_key"    />
         <result property="content"    column="content"    />
         <result property="alarmValue"    column="alarm_value"    />
         <result property="alarmTime"    column="alarm_time"    />
@@ -48,7 +49,7 @@
     </resultMap>
 
     <sql id="selectIpcAlarmRecordVo">
-        select a.id, a.alarm_rules_id, a.equip_id, a.sensor_id, a.content, a.alarm_value, a.alarm_time, a.result, a.status, a.operator, a.alarm_level,
+        select a.id, a.alarm_rules_id, a.equip_id, a.sensor_id,a.name_key, a.content, a.alarm_value, a.alarm_time, a.result, a.status, a.operator, a.alarm_level,
                b.equip_name,b.equip_num,
                c.alarm_name,c.alarm_info_unit
         from ipc_alarm_record a
@@ -62,6 +63,7 @@
             <if test="alarmRulesId != null  and alarmRulesId != ''"> and a.alarm_rules_id = #{alarmRulesId}</if>
             <if test="equipId != null  and equipId != ''"> and a.equip_id = #{equipId}</if>
             <if test="sensorId != null  and sensorId != ''"> and a.sensor_id = #{sensorId}</if>
+            <if test="nameKey != null  and nameKey != ''"> and a.name_key = #{nameKey}</if>
             <if test="content != null  and content != ''"> and a.content = #{content}</if>
             <if test="alarmValue != null "> and a.alarm_value = #{alarmValue}</if>
             <if test="result != null  and result != ''"> and a.result = #{result}</if>
@@ -85,6 +87,7 @@
             <if test="alarmRulesId != null">alarm_rules_id,</if>
             <if test="equipId != null">equip_id,</if>
             <if test="sensorId != null">sensor_id,</if>
+            <if test="nameKey != null">name_key,</if>
             <if test="content != null">content,</if>
             <if test="alarmValue != null">alarm_value,</if>
             <if test="alarmTime != null">alarm_time,</if>
@@ -97,6 +100,7 @@
             <if test="alarmRulesId != null">#{alarmRulesId},</if>
             <if test="equipId != null">#{equipId},</if>
             <if test="sensorId != null">#{sensorId},</if>
+            <if test="nameKey != null">#{nameKey},</if>
             <if test="content != null">#{content},</if>
             <if test="alarmValue != null">#{alarmValue},</if>
             <if test="alarmTime != null">#{alarmTime},</if>
@@ -109,21 +113,20 @@
 
     <!-- 批量新增报警记录 batchInsertIpcAlarmRecord-->
     <insert id="batchInsertIpcAlarmRecord" parameterType="java.util.List">
-        insert into ipc_alarm_record
-        (alarm_rules_id,equip_id,sensor_id,content,alarm_value,alarm_time,status,operator,alarm_level)
+        insert into ipc_alarm_record(alarm_rules_id,equip_id,sensor_id,name_key,content,alarm_value,alarm_time,status,operator,alarm_level)
         values
         <foreach collection="list" item="item" separator=",">
                 (#{item.alarmRulesId},
                  #{item.equipId},
                  #{item.sensorId},
+                 #{item.nameKey},
                  #{item.content},
                  #{item.alarmValue},
                  #{item.alarmTime},
                  #{item.status},
-                 #{item.operator}
+                 #{item.operator},
                  #{item.alarmLevel})
         </foreach>
-        ;
     </insert>
 
     <update id="updateIpcAlarmRecord" parameterType="IpcAlarmRecord">
@@ -132,6 +135,7 @@
             <if test="alarmRulesId != null">alarm_rules_id = #{alarmRulesId},</if>
             <if test="equipId != null">equip_id = #{equipId},</if>
             <if test="sensorId != null">sensor_id = #{sensorId},</if>
+            <if test="nameKey != null">name_key = #{nameKey},</if>
             <if test="content != null">content = #{content},</if>
             <if test="alarmValue != null">alarm_value = #{alarmValue},</if>
             <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
diff --git a/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRulesMapper.xml b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRulesMapper.xml
index e991aa4..cc5ef01 100644
--- a/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRulesMapper.xml
+++ b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcAlarmRulesMapper.xml
@@ -42,8 +42,8 @@
             <if test="referenceCon != null  and referenceCon != ''"> and reference_con = #{referenceCon}</if>
             <if test="alarmLevel != null "> and alarm_level = #{alarmLevel}</if>
             <if test="sort != null "> and sort = #{sort}</if>
-             order by type
         </where>
+        order by type
     </select>
 
     <select id="selectIpcAlarmRulesById" parameterType="String" resultMap="IpcAlarmRulesResult">
diff --git a/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcFaultTreeConfigMapper.xml b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcFaultTreeConfigMapper.xml
new file mode 100644
index 0000000..a63d6f1
--- /dev/null
+++ b/zfipc-server/zfipc-system/src/main/resources/mapper/industrial/IpcFaultTreeConfigMapper.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.industrial.mapper.IpcFaultTreeConfigMapper">
+
+    <resultMap type="com.inspur.industrial.domain.IpcFaultTreeConfig" id="IpcFaultTreeConfigResult">
+        <result property="nodeId" column="node_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="equipId" column="equip_id"/>
+        <result property="iconCls" column="icon_cls"/>
+        <result property="nodeShapeType" column="node_shape_type"/>
+        <result property="nodeDefaultColor" column="node_default_color"/>
+        <result property="nodeAlarmColor" column="node_alarm_color"/>
+        <result property="isLeaf" column="is_leaf"/>
+        <result property="isAlarm" column="is_alarm"/>
+        <result property="alarmRuleConfigId" column="alarm_rule_config_id"/>
+        <result property="alarmRuleConfigDescription" column="alarm_rule_config_description"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectIpcFaultTreeConfigVo">
+        select node_id,
+               parent_id,
+               ancestors,
+               node_name,
+               order_num,
+               equip_id,
+               icon_cls,
+               node_shape_type,
+               node_default_color,
+               node_alarm_color,
+               is_leaf,
+               is_alarm,
+               status,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               alarm_rule_config_id,
+               alarm_rule_config_description
+        from ipc_fault_tree_config
+    </sql>
+
+    <select id="selectIpcFaultTreeConfigList" parameterType="com.inspur.industrial.domain.IpcFaultTreeConfig"
+            resultMap="IpcFaultTreeConfigResult">
+        <include refid="selectIpcFaultTreeConfigVo"/>
+        <where>
+            <if test="parentId != null ">and parent_id = #{parentId}</if>
+            <if test="ancestors != null  and ancestors != ''">and ancestors = #{ancestors}</if>
+            <if test="nodeName != null  and nodeName != ''">and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="orderNum != null ">and order_num = #{orderNum}</if>
+            <if test="equipId != null  and equipId != ''">and equip_id = #{equipId}</if>
+            <if test="iconCls != null  and iconCls != ''">and icon_cls = #{iconCls}</if>
+            <if test="nodeShapeType != null  and nodeShapeType != ''">and node_shape_type = #{nodeShapeType}</if>
+            <if test="nodeDefaultColor != null  and nodeDefaultColor != ''">and node_default_color =
+                #{nodeDefaultColor}
+            </if>
+            <if test="nodeAlarmColor != null  and nodeAlarmColor != ''">and node_alarm_color = #{nodeAlarmColor}</if>
+            <if test="isAlarm != null  and isAlarm != ''">and is_alarm = #{isAlarm}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+        </where>
+        order by parent_id,order_num
+    </select>
+
+    <select id="selectIpcFaultTreeConfigByNodeId" parameterType="Long" resultMap="IpcFaultTreeConfigResult">
+        <include refid="selectIpcFaultTreeConfigVo"/>
+        where node_id = #{nodeId}
+    </select>
+
+    <select id="hasChild" parameterType="Long" resultType="int">
+        select count(0)
+        from ipc_fault_tree_config
+        where parent_id = #{nodeId}
+    </select>
+    <insert id="insertIpcFaultTreeConfig" parameterType="com.inspur.industrial.domain.IpcFaultTreeConfig"
+            useGeneratedKeys="true" keyProperty="nodeId">
+        insert into ipc_fault_tree_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">parent_id,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="nodeName != null">node_name,</if>
+            <if test="orderNum != null">order_num,</if>
+            <if test="equipId != null">equip_id,</if>
+            <if test="iconCls != null">icon_cls,</if>
+            <if test="nodeShapeType != null">node_shape_type,</if>
+            <if test="nodeDefaultColor != null">node_default_color,</if>
+            <if test="nodeAlarmColor != null">node_alarm_color,</if>
+            <if test="isLeaf != null">is_leaf,</if>
+            <if test="isAlarm != null">is_alarm,</if>
+            <if test="status != null">status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="alarmRuleConfigId != null">alarm_rule_config_id,</if>
+            <if test="alarmRuleConfigDescription != null">alarm_rule_config_description,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">#{parentId},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="nodeName != null">#{nodeName},</if>
+            <if test="orderNum != null">#{orderNum},</if>
+            <if test="equipId != null">#{equipId},</if>
+            <if test="iconCls != null">#{iconCls},</if>
+            <if test="nodeShapeType != null">#{nodeShapeType},</if>
+            <if test="nodeDefaultColor != null">#{nodeDefaultColor},</if>
+            <if test="nodeAlarmColor != null">#{nodeAlarmColor},</if>
+            <if test="isLeaf != null">#{isLeaf},</if>
+            <if test="isAlarm != null">#{isAlarm},</if>
+            <if test="status != null">#{status},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="alarmRuleConfigId != null">#{alarmRuleConfigId},</if>
+            <if test="alarmRuleConfigDescription != null">#{alarmRuleConfigDescription},</if>
+        </trim>
+    </insert>
+
+    <update id="updateIpcFaultTreeConfig" parameterType="com.inspur.industrial.domain.IpcFaultTreeConfig">
+        update ipc_fault_tree_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</if>
+            <if test="nodeName != null">node_name = #{nodeName},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="equipId != null">equip_id = #{equipId},</if>
+            <if test="iconCls != null">icon_cls = #{iconCls},</if>
+            <if test="nodeShapeType != null">node_shape_type = #{nodeShapeType},</if>
+            <if test="nodeDefaultColor != null">node_default_color = #{nodeDefaultColor},</if>
+            <if test="nodeAlarmColor != null">node_alarm_color = #{nodeAlarmColor},</if>
+            <if test="isLeaf != null">is_leaf = #{isLeaf},</if>
+            <if test="isAlarm != null">is_alarm = #{isAlarm},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="alarmRuleConfigId != null">alarm_rule_config_id = #{alarmRuleConfigId},</if>
+            <if test="alarmRuleConfigDescription != null">alarm_rule_config_description =
+                #{alarmRuleConfigDescription},
+            </if>
+        </trim>
+        where node_id = #{nodeId}
+    </update>
+
+    <delete id="deleteIpcFaultTreeConfigByNodeId" parameterType="Long">
+        delete
+        from ipc_fault_tree_config
+        where node_id = #{nodeId}
+    </delete>
+
+    <delete id="deleteIpcFaultTreeConfigByNodeIds" parameterType="String">
+        delete from ipc_fault_tree_config where node_id in
+        <foreach item="nodeId" collection="array" open="(" separator="," close=")">
+            #{nodeId}
+        </foreach>
+    </delete>
+
+    <!--    故障树显示数据-->
+    <resultMap type="com.inspur.industrial.domain.IpcFaultTreeShow" id="IpcFaultTreeShowResult">
+        <result property="nodeId" column="node_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="label" column="label"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="iconCls" column="icon_cls"/>
+        <result property="nodeShapeType" column="node_shape_type"/>
+        <result property="content" column="content"/>
+        <result property="nodeDsc" column="nodeDsc"/>
+        <result property="nodeBorderColor" column="nodeBorderColor"/>
+        <result property="nodeShapeType" column="node_shape_type"/>
+        <result property="nodeFontColor" column="nodeFontColor"/>
+    </resultMap>
+    <select id="getFaultTreeShow" parameterType="string" resultMap="IpcFaultTreeConfigResult">
+        SELECT a.node_id,
+               a.parent_id,
+               a.ancestors,
+               a.node_name,
+               a.order_num,
+               a.equip_id,
+               a.icon_cls,
+               a.node_shape_type,
+               a.node_default_color,
+               a.node_alarm_color,
+               a.is_leaf,
+               a.status,
+               a.del_flag,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.alarm_rule_config_id,
+               a.alarm_rule_config_description,
+               CASE
+                   WHEN b.num > 0 AND c.type= 0 THEN
+                       '1'
+                   ELSE '0'
+                   END                         is_alarm
+        FROM (SELECT * FROM ipc_fault_tree_config WHERE STATUS = '0' AND equip_id = #{equipId}) a
+                 LEFT JOIN (SELECT alarm_rules_id, count(0) num
+                            FROM `ipc_alarm_record`
+                            WHERE status = 0
+                              AND equip_id = #{equipId}
+                            GROUP BY alarm_rules_id) b ON a.alarm_rule_config_id = b.alarm_rules_id
+                 LEFT JOIN ipc_alarm_rules c ON b.alarm_rules_id = c.id
+    </select>
+</mapper>
diff --git a/zfipc-ui/src/api/industrial/record.js b/zfipc-ui/src/api/industrial/record.js
index d20a60b..d7b1827 100644
--- a/zfipc-ui/src/api/industrial/record.js
+++ b/zfipc-ui/src/api/industrial/record.js
@@ -9,6 +9,15 @@ export function listRecord(query) {
   });
 }
 
+// 不分页查询所有报警记录列表
+export function listAllRecord(query) {
+  return request({
+    url: "/alarm/record/listAll",
+    method: "get",
+    params: query,
+  });
+}
+
 // 查询报警记录详细
 export function getRecord(id) {
   return request({
diff --git a/zfipc-ui/src/views/zf/cydg/yxjk.vue b/zfipc-ui/src/views/zf/cydg/yxjk.vue
index b060af5..1365c3f 100644
--- a/zfipc-ui/src/views/zf/cydg/yxjk.vue
+++ b/zfipc-ui/src/views/zf/cydg/yxjk.vue
@@ -143,8 +143,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sjyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{ sjyltxWarning }}  </div>-->
+            <!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
+            <div class="warn">{{ sjyltxWarning }} </div>
           </el-footer>
         </el-container>
       </el-col>
@@ -164,11 +164,8 @@
                   id="xtyl"
                   style="height: 90%"
                 ></div>
-                <div
-                  @click="trendClick('sys_press'
-                      ,'系统压力','bar')"
-                  style="height:10%;text-align: center;font-size: 16px;color:#26DE86"
-                >系统压力</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
+                      ,'系统压力','bar')">系统压力</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -178,11 +175,8 @@
                   id="xtyw"
                   style="height: 90%"
                 ></div>
-                <div
-                  @click="trendClick('sys_temp'
-                      ,'系统液温','℃')"
-                  style="height:10%;text-align: center;font-size: 16px;color:#109CFB"
-                >系统液温</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
+                      ,'系统液温','℃')">系统液温</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -203,11 +197,8 @@
                     <div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
                   </div>
                 </div>
-                <div
-                  @click="trendClick('sys_level'
-                      ,'系统液位','cP')"
-                  style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"
-                >系统液位(CP)</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
+                      ,'系统液位','cP')">系统液位(CP)</span></div>
               </el-col>
 
             </el-row>
@@ -220,11 +211,8 @@
                   id="bscll"
                   style="height: 90%"
                 ></div>
-                <div
-                  @click="trendClick('sys_flw'
-                      ,'泵输出流量','L/min')"
-                  style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"
-                >泵输出流量</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
+                      ,'泵输出流量','L/min')">泵输出流量</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -250,8 +238,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="mainWarning"></lbCompents>
-            <!-- <div class="warn">{{mainWarning}}</div> -->
+            <!-- <lbCompents :showData="mainWarning"></lbCompents> -->
+            <div class="warn">{{mainWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -281,8 +269,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sysecWarning"></lbCompents>
-            <!-- <div class="warn">{{sysecWarning}}</div> -->
+            <!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
+            <div class="warn">{{sysecWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -389,8 +377,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="llyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{llyltxWarning}}</div> -->
+            <!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
+            <div class="warn">{{llyltxWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -465,8 +453,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="ylkldWarning"></lbCompents>
-            <!-- <div class="warn">{{ylkldWarning}}</div> -->
+            <!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
+            <div class="warn">{{ylkldWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -795,6 +783,8 @@ import {
   getStatusByEquipName,
   getMonitorInfoByEquipName,
 } from "@/api/industrial/sysStatus.js";
+import { listAllRecord } from "@/api/industrial/record";
+
 export default {
   name: "yxjk",
   components: { lbCompents },
@@ -943,7 +933,6 @@ export default {
       // 查询数据
       this.queryData();
     }, 1000);
-    this.queryHistoryData();
     //报警数据
     // this.historyIntervalTask = setInterval(() => {
     //   // 查询历史数据
@@ -954,6 +943,7 @@ export default {
     getSysStatusData(query) {
       getStatusByEquipName(query).then((response) => {
         this.sysStatus = response.data;
+        this.queryAlarmRecordData(this.sysStatus.equipId);
       });
     },
     getMonitorData(query) {
@@ -1173,29 +1163,88 @@ export default {
       this.initchart([], [], "", "");
       this.handleQuery();
     },
-    queryHistoryData() {
-      cydgdataHistory().then((response) => {
+    queryAlarmRecordData(equipId) {
+      let query = {
+        equipId: equipId,
+      };
+      listAllRecord(query).then((response) => {
         // 主参数报警
-        this.mainWarning = response.data.filter((item) => item.type == "1");
-        // .map((obj) => obj.alarmDetail + obj.alarmTime)
+        this.mainWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "sys_press" ||
+              item.nameKey == "sys_flw" ||
+              item.nameKey == "sys_level" ||
+              item.nameKey == "sys_temp"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // ZFSC4超压平衡缸P/Q特性报警
-        this.sjyltxWarning = response.data.filter((item) => item.type == "3");
-        // .map((obj) => obj.alarmDetail)
+        this.sjyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "opr_soft_real_press" ||
+              item.nameKey == "opr_soft_bond_press" ||
+              item.nameKey == "opr_soft_act_press" ||
+              item.nameKey == "opr_hot_real_press" ||
+              item.nameKey == "opr_hot_bond_press" ||
+              item.nameKey == "opr_hot_act_press" ||
+              item.nameKey == "driven_soft_real_press" ||
+              item.nameKey == "driven_soft_bond_press" ||
+              item.nameKey == "driven_soft_act_press" ||
+              item.nameKey == "driven_hot_real_press" ||
+              item.nameKey == "driven_hot_bond_press" ||
+              item.nameKey == "driven_hot_act_press" ||
+              item.nameKey == "opr_soft_flw" ||
+              item.nameKey == "opr_hot_flw" ||
+              item.nameKey == "driven_soft_flw" ||
+              item.nameKey == "driven_hot_flw"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // 系统能耗及预警
-        this.sysecWarning = response.data.filter(
-          (item) => item.alarmNameKey == "zdjdl"
-        );
-        // .map((obj) => obj.alarmDetail)
+        this.sysecWarning = response.data
+          .filter((item) => item.nameKey == "sys_cur")
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // ZFSC4超压底缸加压压区P/Q特性报警
-        this.llyltxWarning = response.data.filter((item) => item.type == "5");
-        // .map((obj) => obj.alarmDetail)
+        this.llyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "opr_bottom_press" ||
+              item.nameKey == "driven_bottom_press" ||
+              item.nameKey == "opr_bottom_set_press" ||
+              item.nameKey == "driven_bottom_set_press"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // ZFSC4超压底缸加压系统油品特性报警
-        this.ylkldWarning = response.data.filter((item) => item.type == "2");
-        // .map((obj) => obj.alarmDetail)
+        this.ylkldWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "oil_water" ||
+              item.nameKey == "visc" ||
+              item.nameKey == "gran4" ||
+              item.nameKey == "gran6" ||
+              item.nameKey == "gran14" ||
+              item.nameKey == "gran21"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
       });
     },
@@ -3016,7 +3065,7 @@ export default {
   font-size: 18px;
   /*text-overflow: unset;*/
   /* 调整动画时长和效果 */
-  animation: marquee 5s linear infinite;
+  animation: marquee 300s linear infinite;
 }
 @keyframes marquee {
   0% {
diff --git a/zfipc-ui/src/views/zf/zgdgBottom/index.vue b/zfipc-ui/src/views/zf/zgdgBottom/index.vue
index 975463e..45528e6 100644
--- a/zfipc-ui/src/views/zf/zgdgBottom/index.vue
+++ b/zfipc-ui/src/views/zf/zgdgBottom/index.vue
@@ -14,7 +14,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">一压区</span>
+                  <span
+                    class="font-size-14"
+                    @click="trendClick('press1'
+                      ,'一压区压力','bar')"
+                  >一压区</span>
                   <span class="numDiv font-size-18">{{sjylData[0]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -22,7 +26,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">二压区</span>
+                  <span
+                    @click="trendClick('press2'
+                      ,'二压区压力','bar')"
+                    class="font-size-14"
+                  >二压区</span>
                   <span class="numDiv font-size-18">{{sjylData[1]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -30,7 +38,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">三压区</span>
+                  <span
+                    @click="trendClick('press3'
+                      ,'三压区压力','bar')"
+                    class="font-size-14"
+                  >三压区</span>
                   <span class="numDiv font-size-18">{{sjylData[2]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -38,7 +50,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">四压区</span>
+                  <span
+                    @click="trendClick('press4'
+                      ,'四压区压力','bar')"
+                    class="font-size-14"
+                  >四压区</span>
                   <span class="numDiv font-size-18">{{sjylData[2]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -46,7 +62,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">五压区</span>
+                  <span
+                    @click="trendClick('press5'
+                      ,'五压区压力','bar')"
+                    class="font-size-14"
+                  >五压区</span>
                   <span class="numDiv font-size-18">{{sjylData[4]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -54,7 +74,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">六压区</span>
+                  <span
+                    @click="trendClick('press6'
+                      ,'六压区压力','bar')"
+                    class="font-size-14"
+                  >六压区</span>
                   <span class="numDiv font-size-18">{{sjylData[5]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -64,7 +88,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">七压区</span>
+                  <span
+                    @click="trendClick('press7'
+                      ,'七压区压力','bar')"
+                    class="font-size-14"
+                  >七压区</span>
                   <span class="numDiv font-size-18">{{sjylData[6]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -72,7 +100,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">八压区</span>
+                  <span
+                    @click="trendClick('press8'
+                      ,'八压区压力','bar')"
+                    class="font-size-14"
+                  >八压区</span>
                   <span class="numDiv font-size-18">{{sjylData[7]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -80,15 +112,23 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">九压区</span>
+                  <span
+                    @click="trendClick('press9'
+                      ,'九压区压力','bar')"
+                    class="font-size-14"
+                  >九压区</span>
                   <span class="numDiv font-size-18">{{sjylData[8]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
                 <el-col
                   :span="4"
-                  style="height: 100%"
+                  style="text-align: center;height: 100%"
                 >
-                  <span class="font-size-14">十压区</span>
+                  <span
+                    @click="trendClick('press10'
+                      ,'十压区压力','bar')"
+                    class="font-size-14"
+                  >十压区</span>
                   <span class="numDiv font-size-18">{{sjylData[9]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -96,7 +136,11 @@
                   :span="8"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十一压区</span>
+                  <span
+                    @click="trendClick('press11'
+                      ,'十一压区压力','bar')"
+                    class="font-size-14"
+                  >十一压区</span>
                   <span class="numDiv font-size-18">{{sjylData[10]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -112,8 +156,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sjyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{sjyltxWarning}}</div> -->
+            <!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
+            <div class="warn">{{sjyltxWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -133,7 +177,8 @@
                   id="xtyl"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#26DE86">系统压力</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
+                      ,'系统压力','bar')">系统压力</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -143,7 +188,8 @@
                   id="xtyw"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB">系统液温</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
+                      ,'系统液温','℃')">系统液温</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -164,7 +210,8 @@
                     <div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
                   </div>
                 </div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;">系统液位(CP)</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
+                      ,'系统液位','cP')">系统液位(CP)</span></div>
               </el-col>
 
             </el-row>
@@ -177,7 +224,8 @@
                   id="zbscll"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE">主泵流量</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
+                      ,'泵输出流量','L/min')">泵输出流量</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -203,8 +251,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="mainWarning"></lbCompents>
-            <!-- <div class="warn">{{mainWarning}}</div> -->
+            <!-- <lbCompents :showData="mainWarning"></lbCompents> -->
+            <div class="warn">{{mainWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -216,14 +264,12 @@
           <el-header class="header">系统状态信息</el-header>
           <el-main class="main">
             <div style="text-align: center;height: 10%;padding-top: 2%;">
-              <el-col
+              <div
                 :span="12"
                 style="height: 100%"
-              >电机总耗电量<span class="numSpan">{{powerConsumption}}</span>度</el-col>
-              <el-col
-                :span="12"
-                style="height: 100%"
-              >电机实时电流<span class="numSpan">{{zdjdl}}</span>A</el-col>
+                @click="trendClick('sys_cur'
+                      ,'电机电流','A')"
+              >电机实时电流<span class="numSpan">{{zdjdl}}</span>A</div>
             </div>
             <div
               id="zdjdl"
@@ -232,8 +278,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sysecWarning"></lbCompents>
-            <!-- <div class="warn">{{sysecWarning}}</div> -->
+            <!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
+            <div class="warn">{{sysecWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -252,7 +298,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">一压区</span>
+                  <span
+                    @click="trendClick('flw1'
+                      ,'一压区流量','L/min')"
+                    class="font-size-14"
+                  >一压区</span>
                   <span class="numDiv font-size-18">{{llylData[0]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -260,7 +310,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">二压区</span>
+                  <span
+                    @click="trendClick('flw2'
+                      ,'二压区流量','L/min')"
+                    class="font-size-14"
+                  >二压区</span>
                   <span class="numDiv font-size-18">{{llylData[1]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -268,7 +322,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">三压区</span>
+                  <span
+                    @click="trendClick('flw3'
+                      ,'三压区流量','L/min')"
+                    class="font-size-14"
+                  >三压区</span>
                   <span class="numDiv font-size-18">{{llylData[2]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -276,7 +334,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">四压区</span>
+                  <span
+                    @click="trendClick('flw4'
+                      ,'四压区流量','L/min')"
+                    class="font-size-14"
+                  >四压区</span>
                   <span class="numDiv font-size-18">{{llylData[2]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -284,7 +346,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">五压区</span>
+                  <span
+                    @click="trendClick('flw5'
+                      ,'五压区流量','L/min')"
+                    class="font-size-14"
+                  >五压区</span>
                   <span class="numDiv font-size-18">{{llylData[4]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -292,7 +358,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">六压区</span>
+                  <span
+                    @click="trendClick('flw6'
+                      ,'六压区流量','L/min')"
+                    class="font-size-14"
+                  >六压区</span>
                   <span class="numDiv font-size-18">{{llylData[5]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -302,7 +372,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">七压区</span>
+                  <span
+                    @click="trendClick('flw7'
+                      ,'七压区流量','L/min')"
+                    class="font-size-14"
+                  >七压区</span>
                   <span class="numDiv font-size-18">{{llylData[6]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -310,7 +384,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">八压区</span>
+                  <span
+                    @click="trendClick('flw8'
+                      ,'八压区流量','L/min')"
+                    class="font-size-14"
+                  >八压区</span>
                   <span class="numDiv font-size-18">{{llylData[7]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -318,7 +396,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">九压区</span>
+                  <span
+                    @click="trendClick('flw9'
+                      ,'九压区流量','L/min')"
+                    class="font-size-14"
+                  >九压区</span>
                   <span class="numDiv font-size-18">{{llylData[8]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -326,7 +408,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十压区</span>
+                  <span
+                    @click="trendClick('flw10'
+                      ,'十压区流量','L/min')"
+                    class="font-size-14"
+                  >十压区</span>
                   <span class="numDiv font-size-18">{{llylData[9]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -334,7 +420,11 @@
                   :span="8"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十一压区</span>
+                  <span
+                    @click="trendClick('flw11'
+                      ,'十一压区流量','L/min')"
+                    class="font-size-14"
+                  >十一压区</span>
                   <span class="numDiv font-size-18">{{llylData[10]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -350,8 +440,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="llyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{ llyltxWarning }}</div> -->
+            <!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
+            <div class="warn">{{ llyltxWarning }}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -376,6 +466,10 @@
               ></el-col>
             </el-row>
             <el-row style="height: 10%;padding-top: 3%;">
+              <el-col
+                :span="3"
+                style="text-align: right;height: 100%"
+              >4um</el-col>
               <el-col :span="3">
                 <span class="numCol">{{ yykld4 }}</span>
               </el-col>
@@ -410,8 +504,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="ylkldWarning"></lbCompents>
-            <!-- <div class="warn">{{ylkldWarning}}</div> -->
+            <!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
+            <div class="warn">{{ylkldWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -441,7 +535,7 @@
                   :span="15"
                   class="device-card-content-value"
                 >
-                  <span style="color: #80D1FF;margin:auto">2023-10-12 11:20:23</span></el-col>
+                  <span style="color: #80D1FF;margin:auto">{{this.sysStatus.shutdownTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
                 <el-col
@@ -460,7 +554,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-12 11:21:09</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.standbyTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
                 <el-col
@@ -479,7 +573,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-13 10:52:08</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.trialTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
 
@@ -499,7 +593,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-21 12:03:54</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.normalTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item ">
                 <div style="background-color: #0b2d57;height: 70%;">
@@ -561,7 +655,7 @@
                     :span="15"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">中高顶辊</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.equipName }}</span>
                   </el-col>
                 </el-col>
                 <el-col
@@ -583,7 +677,7 @@
                     :span="15"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">S02-27-001</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.equipNum }}</span>
                   </el-col>
                 </el-col>
               </el-row>
@@ -605,7 +699,7 @@
                     style="height:100%"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">2023.10.12 11:20:23</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.nowTime }}</span>
                   </el-col>
                 </el-col>
                 <el-col
@@ -629,7 +723,7 @@
                     style="height:100%"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">5小时60分30秒</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.onlineTime }}</span>
                   </el-col>
                 </el-col>
               </el-row>
@@ -649,7 +743,7 @@
                   <span
                     class="device-bottom-value"
                     style="padding-left:2%"
-                  >2023.10.12 11:20:23 至 2023-10-21 12:03:54</span>
+                  >{{ this.monitorInfo.startTime }}</span>
                 </el-col>
               </el-row>
             </div>
@@ -657,24 +751,98 @@
         </el-container>
       </el-col>
     </el-row>
+
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="isOpen"
+      :close-on-click-modal="false"
+      width="1000px"
+      center
+    >
+      <div class="block">
+        <span class="demonstration">时间</span>
+        <el-date-picker
+          v-model="datetime"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right"
+        >
+        </el-date-picker>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >查 询</el-button>
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+        >重置</el-button>
+      </div>
+      <!-- <template v-if="chartLoading">
+        <div
+          v-if="!isNoData"
+          class="el-loading-mask"
+        >
+          <div class="el-loading-spinner">
+            <svg
+              viewBox="25 25 50 50"
+              class="circular"
+            >
+              <circle
+                cx="50"
+                cy="50"
+                r="20"
+                fill="none"
+                class="path"
+              ></circle>
+            </svg>
+          </div>
+        </div>
+      </template> -->
+      <div
+        v-loading="loading"
+        element-loading-text="加载中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        ref="chart"
+        :style="{ height: height }"
+      ></div>
+      <!-- <div v-if="isNoData">
+        <span style="text-align:center">暂无数据</span>
+      </div> -->
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 import { isArray, merge } from "lodash";
-import {
-  zgdgBottomdata,
-  zgdgBottomdataHistory,
-} from "@/api/testScreen/testScreen.js";
 import lbCompents from "../lb";
+import {
+  listBottomCylData,
+  listTopScollerData,
+  listBottomScollerData,
+  getBottomCylDataByDate,
+  getTopScollerDataByDate,
+  getBottomScollerDataByDate,
+} from "@/api/data/query.js";
+import {
+  getStatusByEquipName,
+  getMonitorInfoByEquipName,
+} from "@/api/industrial/sysStatus.js";
+import { listAllRecord } from "@/api/industrial/record";
 export default {
   name: "zgdgTop",
   components: { lbCompents },
   data() {
     return {
       // 主参数报警
-      mainWarning: [], // "故障报警(开机检测内容放在此界面下)",
+      mainWarning: [], //"故障报警(开机检测内容放在此界面下)",
       // ZFSC4中高底辊液压压区实际压力特性
       sjyltxWarning: [], //"压区P/Q运行情况预警及分析(此处做出P/Q与车速及纸的关系曲线)",
       // 系统能耗及预警
@@ -743,6 +911,54 @@ export default {
       historyIntervalTask: null,
       // 有效开机率
       percentage: 80,
+
+      isOpen: false,
+      chartLoading: false,
+      loading: true,
+      isNoData: false,
+      height: "500px",
+      queryParams: {
+        columnName: null,
+        startTime: null,
+        endTime: null,
+      },
+      datetime: this.getDefaultTimeRange(),
+      name: null,
+      unit: null,
+      sysStatus: {},
+      monitorInfo: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      dialogTitle: "",
     };
   },
   beforeDestroy() {
@@ -750,133 +966,421 @@ export default {
     clearInterval(this.historyIntervalTask);
   },
   mounted() {
+    let query = {
+      equipName: "可控中高辊底辊",
+    };
+    this.getSysStatusData(query);
+    this.getMonitorData(query);
     this.queryDataInit();
     this.intervalTask = setInterval(() => {
       // 查询数据
       this.queryData();
     }, 1000);
-    this.queryHistoryData();
-    this.historyIntervalTask = setInterval(() => {
-      // 查询历史数据
-      this.queryHistoryData();
-    }, 60 * 1000);
+    // this.queryHistoryData();
+    // this.historyIntervalTask = setInterval(() => {
+    //   // 查询历史数据
+    //   this.queryHistoryData();
+    // }, 60 * 1000);
   },
   methods: {
-    queryHistoryData() {
-      zgdgBottomdataHistory().then((response) => {
+    getSysStatusData(query) {
+      getStatusByEquipName(query).then((response) => {
+        this.sysStatus = response.data;
+        this.queryAlarmRecordData(this.sysStatus.equipId);
+      });
+    },
+    getMonitorData(query) {
+      getMonitorInfoByEquipName(query).then((response) => {
+        this.monitorInfo = response.data;
+      });
+    },
+    getDefaultTimeRange() {
+      const now = new Date();
+      const oneHoursAgo = new Date(now.getTime() - 1 * 60 * 60 * 1000);
+      return [this.formatDateTime(oneHoursAgo), this.formatDateTime(now)];
+    },
+    formatDateTime(date) {
+      return (
+        date.getFullYear() +
+        "-" +
+        this.padZero(date.getMonth() + 1) +
+        "-" +
+        this.padZero(date.getDate()) +
+        "T" +
+        this.padZero(date.getHours()) +
+        ":" +
+        this.padZero(date.getMinutes()) +
+        ":" +
+        this.padZero(date.getSeconds())
+      );
+    },
+    padZero(num) {
+      return num < 10 ? "0" + num : num;
+    },
+    handleQuery() {
+      this.loading = true;
+      let startTime = new Date(this.datetime[0]);
+      this.queryParams.startTime = this.formatDateTime(startTime);
+      let endTime = new Date(this.datetime[1]);
+      this.queryParams.endTime = this.formatDateTime(endTime);
+      this.getData(this.queryParams);
+    },
+    resetQuery() {
+      this.datetime = this.getDefaultTimeRange();
+      this.handleQuery();
+    },
+    getData(queryObj) {
+      this.chartLoading = true;
+      getBottomScollerDataByDate(queryObj).then((response) => {
+        if (response.data == null) {
+          this.chartLoading = false;
+          this.isNoData = true;
+        } else {
+          this.isNoData = false;
+          this.loading = false;
+          this.initchart(
+            response.data.x,
+            response.data.y,
+            this.name,
+            this.unit
+          );
+        }
+      });
+    },
+    initchart(xData, yData, name, unit) {
+      let p = new Promise((resolve) => {
+        resolve();
+      });
+      p.then(() => {
+        this.chart = echarts.init(this.$refs.chart);
+        let option = {
+          color: ["#637DCB"],
+          title: {
+            text: "",
+            right: "100",
+            textStyle: { fontWeight: "normal", color: "#637DCB" },
+          },
+          toolbox: {
+            top: 0,
+            itemSize: 13, //工具栏 icon 的大小
+            iconStyle: {
+              color: "transparent",
+              borderColor: "#fff",
+            },
+            feature: {
+              dataZoom: {
+                yAxisIndex: "none",
+              },
+              restore: { show: false },
+              saveAsImage: { show: false },
+            },
+          },
+          tooltip: {
+            //提示框
+            trigger: "axis",
+            axisPointer: {
+              type: "line", //显示提示框的时候的背景 line是一条线 shadow是个背景框
+            },
+            backgroundColor: "#fff",
+            extraCssText: "box-shadow: 4px 4px 4px 2px rgba(0, 0, 0, 0.2)", //提示框加阴影效果
+            textStyle: {
+              color: "#4E5969", //设置文字颜色
+            },
+            formatter: (prams) => {
+              let name = parseFloat(_.get(prams, [0, "name"])).toFixed(4);
+              let value = parseFloat(_.get(prams, [0, "value"])).toFixed(4);
+              return (
+                "<span style='color:#6D85CE'>" +
+                `（${name}` +
+                "," +
+                `${value}）` +
+                "</span>"
+              );
+            },
+          },
+          xAxis: [
+            {
+              type: "category",
+              name: "ms",
+              data: xData,
+              nameTextStyle: { fontSize: "9" },
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "#fff",
+                  width: 0, //这里是为了突出显示加上的
+                },
+              },
+              axisLabel: {
+                textStyle: {
+                  color: "#fff",
+                  fontSize: "9",
+                },
+                showMaxLabel: true,
+                showMinLabel: true,
+              },
+            },
+          ],
+          yAxis: [
+            {
+              name: { name: "单位: " + unit },
+              type: "value",
+              nameLocation: "end",
+              nameTextStyle: {
+                color: "#fff",
+                fontSize: "9",
+              },
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                textStyle: {
+                  fontSize: "9",
+                  color: "#fff",
+                },
+              },
+              splitLine: {
+                //修改背景线条样式
+                show: true, //是否展示
+                lineStyle: {
+                  color: "#3C506B", //线条颜色
+                  type: "dashed", //线条样式，默认是实现，dashed是虚线
+                },
+              },
+            },
+          ],
+          grid: {
+            left: "3%",
+            right: "8%",
+            bottom: "18%",
+            top: "14%",
+            containLabel: true,
+          },
+          dataZoom: [
+            {
+              show: true,
+              type: "slider",
+              xAxisIndex: 0,
+              filterMode: "none",
+              start: 0,
+              end: xData.length,
+              bottom: "1%",
+              fillerColor: "rgba(167,183,204,0.4)", //选中范围的填充颜色。
+              borderColor: "#3C506B",
+            },
+            {
+              show: true,
+              type: "inside",
+              xAxisIndex: 0,
+              filterMode: "none",
+              start: 0,
+              end: 10,
+              bottom: "1%",
+              fillerColor: "rgba(167,183,204,0.4)", //选中范围的填充颜色。
+              borderColor: "#E0E6F3",
+            },
+          ],
+          series: [
+            {
+              name: name,
+              type: "line",
+              data: yData,
+              symbol: "none",
+            },
+          ],
+        };
+        this.chart.setOption(option);
+        this.chartLoading = false;
+      });
+    },
+    trendClick(key, name, unit) {
+      this.dialogTitle = name + "历史趋势记录查询";
+      this.isOpen = true;
+      this.name = name;
+      this.unit = unit;
+      this.queryParams.columnName = key;
+      this.initchart([], [], "", "");
+      this.handleQuery();
+    },
+    queryAlarmRecordData(equipId) {
+      let query = {
+        equipId: equipId,
+      };
+      listAllRecord(query).then((response) => {
         // 主参数报警
-        this.mainWarning = response.data.filter((item) => item.type == "1");
-        // .map((obj) => obj.alarmDetail)
+        this.mainWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "sys_press" ||
+              item.nameKey == "sys_flw" ||
+              item.nameKey == "sys_level" ||
+              item.nameKey == "sys_temp"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // ZFSC4超压平衡缸P/Q特性报警
-        this.sjyltxWarning = response.data.filter((item) => item.type == "3");
+        this.sjyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "press1" ||
+              item.nameKey == "press2" ||
+              item.nameKey == "press3" ||
+              item.nameKey == "press4" ||
+              item.nameKey == "press5" ||
+              item.nameKey == "press6" ||
+              item.nameKey == "press7" ||
+              item.nameKey == "press8" ||
+              item.nameKey == "press9" ||
+              item.nameKey == "press10" ||
+              item.nameKey == "press11"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .map((obj) => obj.alarmDetail)
         // .join("，");
         // 系统能耗及预警
-        this.sysecWarning = response.data.filter(
-          (item) => item.alarmNameKey == "zdjdl"
-        );
+        this.sysecWarning = response.data
+          .filter((item) => item.nameKey == "sys_cur")
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .map((obj) => obj.alarmDetail)
         // .join("，");
         // ZFSC4超压底缸加压压区P/Q特性报警
-        this.llyltxWarning = response.data.filter((item) => item.type == "4");
-        // .map((obj) => obj.alarmDetail)
+        this.llyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "flw1" ||
+              item.nameKey == "flw2" ||
+              item.nameKey == "flw3" ||
+              item.nameKey == "flw4" ||
+              item.nameKey == "flw5" ||
+              item.nameKey == "flw6" ||
+              item.nameKey == "flw7" ||
+              item.nameKey == "flw8" ||
+              item.nameKey == "flw9" ||
+              item.nameKey == "flw10" ||
+              item.nameKey == "flw11"
+          )
+          .map((obj) => obj.alarmDetail);
         // .join("，");
         // ZFSC4超压底缸加压系统油品特性报警
-        this.ylkldWarning = response.data.filter((item) => item.type == "2");
-        // .map((obj) => obj.alarmDetail)
+        this.ylkldWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "oil_water" ||
+              item.nameKey == "visc" ||
+              item.nameKey == "gran4" ||
+              item.nameKey == "gran6" ||
+              item.nameKey == "gran14" ||
+              item.nameKey == "gran21"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
       });
     },
     async queryDataInit() {
-      const { data } = await zgdgBottomdata();
-      this.XDATA = data.xData;
-      this.xtyl = parseFloat(data.xtyl.slice(-1)[0]).toFixed(2);
-      this.xtyw = parseFloat(data.ywen.slice(-1)[0]).toFixed(2);
-      this.xtywei = parseFloat(data.yw.slice(-1)[0]).toFixed(2);
-      this.xtyweicsz = parseFloat(data.ywcsz.slice(-1)[0]).toFixed(2);
-      this.xtyweimin = parseFloat(data.ywmin.slice(-1)[0]).toFixed(2);
-      this.xtyweimax = parseFloat(data.ywmax.slice(-1)[0]).toFixed(2);
-      this.zbscll = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.scxl = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.zdjsjgl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
+      const { data } = await listBottomScollerData();
+      this.XDATA = data.timelist;
       this.showdata = data;
-      this.zdjdl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
-      this.yykld4 = parseFloat(data.yykld4.slice(-1)[0]).toFixed(2);
-      this.yykld6 = parseFloat(data.yykld6.slice(-1)[0]).toFixed(2);
-      this.yykld14 = parseFloat(data.yykld14.slice(-1)[0]).toFixed(2);
-      this.yykld21 = parseFloat(data.yykld21.slice(-1)[0]).toFixed(2);
+      this.xtyl = parseFloat(data.sysprs).toFixed(2);
+      this.xtyw = parseFloat(data.systemp).toFixed(2);
+      this.xtywei = parseFloat(data.syslevel).toFixed(2);
+      this.xtyweicsz = parseFloat(data.syslevelinit).toFixed(2);
+      this.xtyweimin = parseFloat(data.levelmin).toFixed(2);
+      this.xtyweimax = parseFloat(data.levelmax).toFixed(2);
+      this.zbscll = parseFloat(data.sysflw).toFixed(2);
+      this.scxl = parseFloat(data.syseff).toFixed(2);
+      this.zdjsjgl = parseFloat(data.syspower).toFixed(2);
+      this.zdjdl = parseFloat(data.syscur.slice(-1)[0]).toFixed(2);
+      this.yykld4 = parseFloat(data.sysgran4).toFixed(2);
+      this.yykld6 = parseFloat(data.sysgran6).toFixed(2);
+      this.yykld14 = parseFloat(data.sysgran14).toFixed(2);
+      this.yykld21 = parseFloat(data.sysgran21).toFixed(2);
       this.sjylData = [
-        parseFloat(data.yqbljyf1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs11.slice(-1)[0]).toFixed(2),
       ];
       this.llylData = [
-        parseFloat(data.yqll1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw11.slice(-1)[0]).toFixed(2),
       ];
       this.initCharts();
     },
     async queryData() {
-      const { data } = await zgdgBottomdata();
-      this.XDATA = data.xData;
-      this.xtyl = parseFloat(data.xtyl.slice(-1)[0]).toFixed(2);
-      this.xtyw = parseFloat(data.ywen.slice(-1)[0]).toFixed(2);
-      this.xtywei = parseFloat(data.yw.slice(-1)[0]).toFixed(2);
-      this.xtyweicsz = parseFloat(data.ywcsz.slice(-1)[0]).toFixed(2);
-      this.xtyweimin = parseFloat(data.ywmin.slice(-1)[0]).toFixed(2);
-      this.xtyweimax = parseFloat(data.ywmax.slice(-1)[0]).toFixed(2);
-      this.zbscll = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.scxl = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.zdjsjgl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
+      const { data } = await listBottomScollerData();
+      this.XDATA = data.timelist;
+      this.xtyl = parseFloat(data.sysprs).toFixed(2);
+      this.xtyw = parseFloat(data.systemp).toFixed(2);
+      this.xtywei = parseFloat(data.syslevel).toFixed(2);
+      this.xtyweicsz = parseFloat(data.syslevelinit).toFixed(2);
+      this.xtyweimin = parseFloat(data.levelmin).toFixed(2);
+      this.xtyweimax = parseFloat(data.levelmax).toFixed(2);
+      this.zbscll = parseFloat(data.sysflw).toFixed(2);
+      this.scxl = parseFloat(data.syseff).toFixed(2);
+      this.zdjsjgl = parseFloat(data.syspower).toFixed(2);
       this.showdata = data;
-      this.zdjdl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
-      this.yykld4 = parseFloat(data.yykld4.slice(-1)[0]).toFixed(2);
-      this.yykld6 = parseFloat(data.yykld6.slice(-1)[0]).toFixed(2);
-      this.yykld14 = parseFloat(data.yykld14.slice(-1)[0]).toFixed(2);
-      this.yykld21 = parseFloat(data.yykld21.slice(-1)[0]).toFixed(2);
+      this.zdjdl = parseFloat(data.syscur.slice(-1)[0]).toFixed(2);
+      this.yykld4 = parseFloat(data.sysgran4).toFixed(2);
+      this.yykld6 = parseFloat(data.sysgran6).toFixed(2);
+      this.yykld14 = parseFloat(data.sysgran14).toFixed(2);
+      this.yykld21 = parseFloat(data.sysgran21).toFixed(2);
       this.sjylData = [
-        parseFloat(data.yqbljyf1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs11.slice(-1)[0]).toFixed(2),
       ];
       this.llylData = [
-        parseFloat(data.yqll1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw11.slice(-1)[0]).toFixed(2),
       ];
       this.refreshCharts();
     },
@@ -884,37 +1388,37 @@ export default {
       // 压区实际压力特性echarts
       let sjylOption = this.sjylChart.getOption();
       sjylOption.xAxis[0].data = this.XDATA;
-      sjylOption.series[0].data = this.showdata.yqbljyf1;
-      sjylOption.series[1].data = this.showdata.yqbljyf2;
-      sjylOption.series[2].data = this.showdata.yqbljyf3;
-      sjylOption.series[3].data = this.showdata.yqbljyf4;
-      sjylOption.series[4].data = this.showdata.yqbljyf5;
-      sjylOption.series[5].data = this.showdata.yqbljyf6;
-      sjylOption.series[6].data = this.showdata.yqbljyf7;
-      sjylOption.series[7].data = this.showdata.yqbljyf8;
-      sjylOption.series[8].data = this.showdata.yqbljyf9;
-      sjylOption.series[9].data = this.showdata.yqbljyf10;
-      sjylOption.series[10].data = this.showdata.yqbljyf11;
+      sjylOption.series[0].data = this.showdata.prs1;
+      sjylOption.series[1].data = this.showdata.prs2;
+      sjylOption.series[2].data = this.showdata.prs3;
+      sjylOption.series[3].data = this.showdata.prs4;
+      sjylOption.series[4].data = this.showdata.prs5;
+      sjylOption.series[5].data = this.showdata.prs6;
+      sjylOption.series[6].data = this.showdata.prs7;
+      sjylOption.series[7].data = this.showdata.prs8;
+      sjylOption.series[8].data = this.showdata.prs9;
+      sjylOption.series[9].data = this.showdata.prs10;
+      sjylOption.series[10].data = this.showdata.prs11;
       this.sjylChart.setOption(sjylOption);
       // 实时电流echarts
       let zdjdlOption = this.zdjdlCharts.getOption();
       zdjdlOption.xAxis[0].data = this.XDATA;
-      zdjdlOption.series[0].data = this.showdata.zdjdl;
+      zdjdlOption.series[0].data = this.showdata.syscur;
       this.zdjdlCharts.setOption(zdjdlOption);
       // 压区流量压力特性echarts
       let llylOption = this.llylChart.getOption();
       llylOption.xAxis[0].data = this.XDATA;
-      llylOption.series[0].data = this.showdata.yqll1;
-      llylOption.series[1].data = this.showdata.yqll2;
-      llylOption.series[2].data = this.showdata.yqll3;
-      llylOption.series[3].data = this.showdata.yqll4;
-      llylOption.series[4].data = this.showdata.yqll5;
-      llylOption.series[5].data = this.showdata.yqll6;
-      llylOption.series[6].data = this.showdata.yqll7;
-      llylOption.series[7].data = this.showdata.yqll8;
-      llylOption.series[8].data = this.showdata.yqll9;
-      llylOption.series[9].data = this.showdata.yqll10;
-      llylOption.series[10].data = this.showdata.yqll11;
+      llylOption.series[0].data = this.showdata.flw1;
+      llylOption.series[1].data = this.showdata.flw2;
+      llylOption.series[2].data = this.showdata.flw3;
+      llylOption.series[3].data = this.showdata.flw4;
+      llylOption.series[4].data = this.showdata.flw5;
+      llylOption.series[5].data = this.showdata.flw6;
+      llylOption.series[6].data = this.showdata.flw7;
+      llylOption.series[7].data = this.showdata.flw8;
+      llylOption.series[8].data = this.showdata.flw9;
+      llylOption.series[9].data = this.showdata.flw10;
+      llylOption.series[10].data = this.showdata.flw11;
       this.llylChart.setOption(llylOption);
       // 油液颗粒度特性echarts
       let yykldOption = this.yykldtxCharts.getOption();
@@ -927,12 +1431,12 @@ export default {
       this.yykldtxCharts.setOption(yykldOption);
       let dlndOption = this.dlndCharts.getOption();
       dlndOption.series[0].data[0].value = parseFloat(
-        this.showdata.ypnd[0]
+        this.showdata.sysvisc
       ).toFixed(2);
       this.dlndCharts.setOption(dlndOption);
       let xdsdOption = this.xdsdCharts.getOption();
       xdsdOption.series[0].data[0].value = parseFloat(
-        this.showdata.ysjc[0]
+        this.showdata.syshumid
       ).toFixed(2);
       this.xdsdCharts.setOption(xdsdOption);
       // 主要参数及echarts
@@ -1063,7 +1567,7 @@ export default {
           color: ["2ACDDE", "92D8DD"],
           bgColor: "023953",
           name: "泵输出流量",
-          value: this.bscll,
+          value: this.zbscll,
           limit: 0.8,
           unit: "L/min",
         }),
@@ -1153,70 +1657,70 @@ export default {
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf1,
+            data: this.showdata.prs1,
           },
           {
             name: "二区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf2,
+            data: this.showdata.prs2,
           },
           {
             name: "三区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf3,
+            data: this.showdata.prs3,
           },
           {
             name: "四区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf4,
+            data: this.showdata.prs4,
           },
           {
             name: "五区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf5,
+            data: this.showdata.prs5,
           },
           {
             name: "六区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf6,
+            data: this.showdata.prs6,
           },
           {
             name: "七区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf7,
+            data: this.showdata.prs7,
           },
           {
             name: "八区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf8,
+            data: this.showdata.prs8,
           },
           {
             name: "九区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf9,
+            data: this.showdata.prs9,
           },
           {
             name: "十区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf10,
+            data: this.showdata.prs10,
           },
           {
             name: "十一区",
@@ -1225,7 +1729,7 @@ export default {
             symbol: "none",
             symbol: "none",
 
-            data: this.showdata.yqbljyf11,
+            data: this.showdata.prs11,
           },
         ],
       };
@@ -1251,7 +1755,7 @@ export default {
             {
               name: "电流",
               type: "line",
-              data: this.showdata.zdjdl,
+              data: this.showdata.syscur,
               symbol: "none",
             },
           ],
@@ -1306,77 +1810,77 @@ export default {
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll1,
+            data: this.showdata.flw1,
           },
           {
             name: "二区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll2,
+            data: this.showdata.flw2,
           },
           {
             name: "三区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll3,
+            data: this.showdata.flw3,
           },
           {
             name: "四区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll4,
+            data: this.showdata.flw4,
           },
           {
             name: "五区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll5,
+            data: this.showdata.flw5,
           },
           {
             name: "六区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll6,
+            data: this.showdata.flw6,
           },
           {
             name: "七区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll7,
+            data: this.showdata.flw7,
           },
           {
             name: "八区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll8,
+            data: this.showdata.flw8,
           },
           {
             name: "九区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll9,
+            data: this.showdata.flw9,
           },
           {
             name: "十区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll10,
+            data: this.showdata.flw10,
           },
           {
             name: "十一区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll11,
+            data: this.showdata.flw11,
           },
         ],
       };
@@ -1404,14 +1908,14 @@ export default {
             data: ["4um", "6um", "14um", "21um"],
           },
           yAxis: {
-            name: "Y(mA)",
+            name: "PM",
             min: 0,
             max: 1,
             interval: 0.2, // 指定刻度间隔
           },
           series: [
             {
-              name: "位移",
+              name: "颗粒度",
               type: "bar",
               barWidth: "30",
               itemStyle: {
@@ -1440,7 +1944,7 @@ export default {
           color: ["00F28D", "00FFDD", "00BFFF"],
           bgColor: "87a6a8",
           name: "粘度",
-          value: parseFloat(this.showdata.ypnd.slice(-1)[0]).toFixed(2),
+          value: parseFloat(this.showdata.sysvisc).toFixed(2),
           limit: 0.8,
           unit: "mm2/s",
         }),
@@ -1458,7 +1962,7 @@ export default {
           color: ["00F28D", "00FFDD", "00BFFF"],
           bgColor: "87a6a8",
           name: "湿度",
-          value: parseFloat(this.showdata.ysjc.slice(-1)[0]).toFixed(2),
+          value: parseFloat(this.showdata.syshumid).toFixed(2),
           limit: 0.8,
           unit: "%",
         }),
@@ -2234,7 +2738,6 @@ export default {
   display: inline-block;
   /*padding-left: 90%;*/
   overflow: hidden;
-  margin: auto 2%;
   white-space: nowrap;
   /*text-overflow: unset;*/
   animation: marquee 5s linear infinite; /* 调整动画时长和效果 */
@@ -2304,4 +2807,8 @@ export default {
     height: 100%;
   }
 }
+
+::-webkit-scrollbar {
+  width: 0px;
+}
 </style>
diff --git a/zfipc-ui/src/views/zf/zgdgTop/index.vue b/zfipc-ui/src/views/zf/zgdgTop/index.vue
index 28f8d64..bad6c5b 100644
--- a/zfipc-ui/src/views/zf/zgdgTop/index.vue
+++ b/zfipc-ui/src/views/zf/zgdgTop/index.vue
@@ -14,7 +14,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">一压区</span>
+                  <span
+                    class="font-size-14"
+                    @click="trendClick('press1'
+                      ,'一压区压力','bar')"
+                  >一压区</span>
                   <span class="numDiv font-size-18">{{sjylData[0]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -22,7 +26,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">二压区</span>
+                  <span
+                    @click="trendClick('press2'
+                      ,'二压区压力','bar')"
+                    class="font-size-14"
+                  >二压区</span>
                   <span class="numDiv font-size-18">{{sjylData[1]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -30,7 +38,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">三压区</span>
+                  <span
+                    @click="trendClick('press3'
+                      ,'三压区压力','bar')"
+                    class="font-size-14"
+                  >三压区</span>
                   <span class="numDiv font-size-18">{{sjylData[2]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -38,7 +50,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">四压区</span>
+                  <span
+                    @click="trendClick('press4'
+                      ,'四压区压力','bar')"
+                    class="font-size-14"
+                  >四压区</span>
                   <span class="numDiv font-size-18">{{sjylData[2]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -46,7 +62,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">五压区</span>
+                  <span
+                    @click="trendClick('press5'
+                      ,'五压区压力','bar')"
+                    class="font-size-14"
+                  >五压区</span>
                   <span class="numDiv font-size-18">{{sjylData[4]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -54,7 +74,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">六压区</span>
+                  <span
+                    @click="trendClick('press6'
+                      ,'六压区压力','bar')"
+                    class="font-size-14"
+                  >六压区</span>
                   <span class="numDiv font-size-18">{{sjylData[5]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -64,7 +88,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">七压区</span>
+                  <span
+                    @click="trendClick('press7'
+                      ,'七压区压力','bar')"
+                    class="font-size-14"
+                  >七压区</span>
                   <span class="numDiv font-size-18">{{sjylData[6]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -72,7 +100,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">八压区</span>
+                  <span
+                    @click="trendClick('press8'
+                      ,'八压区压力','bar')"
+                    class="font-size-14"
+                  >八压区</span>
                   <span class="numDiv font-size-18">{{sjylData[7]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -80,7 +112,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">九压区</span>
+                  <span
+                    @click="trendClick('press9'
+                      ,'九压区压力','bar')"
+                    class="font-size-14"
+                  >九压区</span>
                   <span class="numDiv font-size-18">{{sjylData[8]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -88,7 +124,11 @@
                   :span="4"
                   style="text-align: center;height: 100%"
                 >
-                  <span class="font-size-14">十压区</span>
+                  <span
+                    @click="trendClick('press10'
+                      ,'十压区压力','bar')"
+                    class="font-size-14"
+                  >十压区</span>
                   <span class="numDiv font-size-18">{{sjylData[9]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -96,7 +136,11 @@
                   :span="8"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十一压区</span>
+                  <span
+                    @click="trendClick('press11'
+                      ,'十一压区压力','bar')"
+                    class="font-size-14"
+                  >十一压区</span>
                   <span class="numDiv font-size-18">{{sjylData[10]}}</span>
                   <span class="font-size-12">bar</span>
                 </el-col>
@@ -112,8 +156,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sjyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{sjyltxWarning}}</div> -->
+            <!-- <lbCompents :showData="sjyltxWarning"></lbCompents> -->
+            <div class="warn">{{sjyltxWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -133,7 +177,8 @@
                   id="xtyl"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#26DE86">系统压力</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#26DE86"><span @click="trendClick('sys_press'
+                      ,'系统压力','bar')">系统压力</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -143,7 +188,8 @@
                   id="xtyw"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB">系统液温</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB"><span @click="trendClick('sys_temp'
+                      ,'系统液温','℃')">系统液温</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -164,7 +210,8 @@
                     <div>最大值<span class="yeweiSpan">{{ xtyweimax }}</span></div>
                   </div>
                 </div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;">系统液位(CP)</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#109CFB;position:relative;z-index: 999;top:-110%;"><span @click="trendClick('sys_level'
+                      ,'系统液位','cP')">系统液位(CP)</span></div>
               </el-col>
 
             </el-row>
@@ -177,7 +224,8 @@
                   id="zbscll"
                   style="height: 90%"
                 ></div>
-                <div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE">主泵流量</div>
+                <div style="height:10%;text-align: center;font-size: 16px;color:#2ACDDE"><span @click="trendClick('sys_flw'
+                      ,'泵输出流量','L/min')">泵输出流量</span></div>
               </el-col>
               <el-col
                 :span="8"
@@ -203,8 +251,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="mainWarning"></lbCompents>
-            <!-- <div class="warn">{{mainWarning}}</div> -->
+            <!-- <lbCompents :showData="mainWarning"></lbCompents> -->
+            <div class="warn">{{mainWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -216,14 +264,12 @@
           <el-header class="header">系统状态信息</el-header>
           <el-main class="main">
             <div style="text-align: center;height: 10%;padding-top: 2%;">
-              <el-col
+              <div
                 :span="12"
                 style="height: 100%"
-              >电机总耗电量<span class="numSpan">{{powerConsumption}}</span>度</el-col>
-              <el-col
-                :span="12"
-                style="height: 100%"
-              >电机实时电流<span class="numSpan">{{zdjdl}}</span>A</el-col>
+                @click="trendClick('sys_cur'
+                      ,'电机电流','A')"
+              >电机实时电流<span class="numSpan">{{zdjdl}}</span>A</div>
             </div>
             <div
               id="zdjdl"
@@ -232,8 +278,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="sysecWarning"></lbCompents>
-            <!-- <div class="warn">{{sysecWarning}}</div> -->
+            <!-- <lbCompents :showData="sysecWarning"></lbCompents> -->
+            <div class="warn">{{sysecWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -252,7 +298,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">一压区</span>
+                  <span
+                    @click="trendClick('flw1'
+                      ,'一压区流量','L/min')"
+                    class="font-size-14"
+                  >一压区</span>
                   <span class="numDiv font-size-18">{{llylData[0]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -260,7 +310,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">二压区</span>
+                  <span
+                    @click="trendClick('flw2'
+                      ,'二压区流量','L/min')"
+                    class="font-size-14"
+                  >二压区</span>
                   <span class="numDiv font-size-18">{{llylData[1]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -268,7 +322,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">三压区</span>
+                  <span
+                    @click="trendClick('flw3'
+                      ,'三压区流量','L/min')"
+                    class="font-size-14"
+                  >三压区</span>
                   <span class="numDiv font-size-18">{{llylData[2]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -276,7 +334,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">四压区</span>
+                  <span
+                    @click="trendClick('flw4'
+                      ,'四压区流量','L/min')"
+                    class="font-size-14"
+                  >四压区</span>
                   <span class="numDiv font-size-18">{{llylData[2]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -284,7 +346,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">五压区</span>
+                  <span
+                    @click="trendClick('flw5'
+                      ,'五压区流量','L/min')"
+                    class="font-size-14"
+                  >五压区</span>
                   <span class="numDiv font-size-18">{{llylData[4]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -292,7 +358,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">六压区</span>
+                  <span
+                    @click="trendClick('flw6'
+                      ,'六压区流量','L/min')"
+                    class="font-size-14"
+                  >六压区</span>
                   <span class="numDiv font-size-18">{{llylData[5]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -302,7 +372,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">七压区</span>
+                  <span
+                    @click="trendClick('flw7'
+                      ,'七压区流量','L/min')"
+                    class="font-size-14"
+                  >七压区</span>
                   <span class="numDiv font-size-18">{{llylData[6]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -310,7 +384,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">八压区</span>
+                  <span
+                    @click="trendClick('flw8'
+                      ,'八压区流量','L/min')"
+                    class="font-size-14"
+                  >八压区</span>
                   <span class="numDiv font-size-18">{{llylData[7]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -318,7 +396,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">九压区</span>
+                  <span
+                    @click="trendClick('flw9'
+                      ,'九压区流量','L/min')"
+                    class="font-size-14"
+                  >九压区</span>
                   <span class="numDiv font-size-18">{{llylData[8]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -326,7 +408,11 @@
                   :span="4"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十压区</span>
+                  <span
+                    @click="trendClick('flw10'
+                      ,'十压区流量','L/min')"
+                    class="font-size-14"
+                  >十压区</span>
                   <span class="numDiv font-size-18">{{llylData[9]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -334,7 +420,11 @@
                   :span="8"
                   style="height: 100%"
                 >
-                  <span class="font-size-14">十一压区</span>
+                  <span
+                    @click="trendClick('flw11'
+                      ,'十一压区流量','L/min')"
+                    class="font-size-14"
+                  >十一压区</span>
                   <span class="numDiv font-size-18">{{llylData[10]}}</span>
                   <span class="font-size-12">L/min</span>
                 </el-col>
@@ -350,8 +440,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="llyltxWarning"></lbCompents>
-            <!-- <div class="warn">{{ llyltxWarning }}</div> -->
+            <!-- <lbCompents :showData="llyltxWarning"></lbCompents> -->
+            <div class="warn">{{ llyltxWarning }}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -376,6 +466,10 @@
               ></el-col>
             </el-row>
             <el-row style="height: 10%;padding-top: 3%;">
+              <el-col
+                :span="3"
+                style="text-align: right;height: 100%"
+              >4um</el-col>
               <el-col :span="3">
                 <span class="numCol">{{ yykld4 }}</span>
               </el-col>
@@ -410,8 +504,8 @@
           </el-main>
           <el-footer class="footer">
             <div class="bottom-line"></div>
-            <lbCompents :showData="ylkldWarning"></lbCompents>
-            <!-- <div class="warn">{{ylkldWarning}}</div> -->
+            <!-- <lbCompents :showData="ylkldWarning"></lbCompents> -->
+            <div class="warn">{{ylkldWarning}}</div>
           </el-footer>
         </el-container>
       </el-col>
@@ -441,7 +535,7 @@
                   :span="15"
                   class="device-card-content-value"
                 >
-                  <span style="color: #80D1FF;margin:auto">2023-10-12 11:20:23</span></el-col>
+                  <span style="color: #80D1FF;margin:auto">{{this.sysStatus.shutdownTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
                 <el-col
@@ -460,7 +554,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-12 11:21:09</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.standbyTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
                 <el-col
@@ -479,7 +573,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-13 10:52:08</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.trialTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item">
 
@@ -499,7 +593,7 @@
                 <el-col
                   :span="15"
                   class="device-card-content-value"
-                > <span style="color: #80D1FF;margin:auto">2023-10-21 12:03:54</span></el-col>
+                > <span style="color: #80D1FF;margin:auto">{{this.sysStatus.normalTime}}</span></el-col>
               </el-row>
               <el-row class="device-card-content-item ">
                 <div style="background-color: #0b2d57;height: 70%;">
@@ -561,7 +655,7 @@
                     :span="15"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">中高顶辊</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.equipName }}</span>
                   </el-col>
                 </el-col>
                 <el-col
@@ -583,7 +677,7 @@
                     :span="15"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">S02-27-001</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.equipNum }}</span>
                   </el-col>
                 </el-col>
               </el-row>
@@ -605,7 +699,7 @@
                     style="height:100%"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">2023.10.12 11:20:23</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.nowTime }}</span>
                   </el-col>
                 </el-col>
                 <el-col
@@ -629,7 +723,7 @@
                     style="height:100%"
                     class="col-flex"
                   >
-                    <span class="device-bottom-value">5小时60分30秒</span>
+                    <span class="device-bottom-value">{{ this.monitorInfo.onlineTime }}</span>
                   </el-col>
                 </el-col>
               </el-row>
@@ -649,7 +743,7 @@
                   <span
                     class="device-bottom-value"
                     style="padding-left:2%"
-                  >2023.10.12 11:20:23 至 2023-10-21 12:03:54</span>
+                  >{{ this.monitorInfo.startTime }}</span>
                 </el-col>
               </el-row>
             </div>
@@ -657,17 +751,91 @@
         </el-container>
       </el-col>
     </el-row>
+
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="isOpen"
+      :close-on-click-modal="false"
+      width="1000px"
+      center
+    >
+      <div class="block">
+        <span class="demonstration">时间</span>
+        <el-date-picker
+          v-model="datetime"
+          type="datetimerange"
+          :picker-options="pickerOptions"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          align="right"
+        >
+        </el-date-picker>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >查 询</el-button>
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+        >重置</el-button>
+      </div>
+      <!-- <template v-if="chartLoading">
+        <div
+          v-if="!isNoData"
+          class="el-loading-mask"
+        >
+          <div class="el-loading-spinner">
+            <svg
+              viewBox="25 25 50 50"
+              class="circular"
+            >
+              <circle
+                cx="50"
+                cy="50"
+                r="20"
+                fill="none"
+                class="path"
+              ></circle>
+            </svg>
+          </div>
+        </div>
+      </template> -->
+      <div
+        v-loading="loading"
+        element-loading-text="加载中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+        ref="chart"
+        :style="{ height: height }"
+      ></div>
+      <!-- <div v-if="isNoData">
+        <span style="text-align:center">暂无数据</span>
+      </div> -->
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 import { isArray, merge } from "lodash";
-import {
-  zgdgTopdata,
-  zgdgTopdataHistory,
-} from "@/api/testScreen/testScreen.js";
 import lbCompents from "../lb";
+import {
+  listBottomCylData,
+  listTopScollerData,
+  listBottomScollerData,
+  getBottomCylDataByDate,
+  getTopScollerDataByDate,
+  getBottomScollerDataByDate,
+} from "@/api/data/query.js";
+import {
+  getStatusByEquipName,
+  getMonitorInfoByEquipName,
+} from "@/api/industrial/sysStatus.js";
+import { listAllRecord } from "@/api/industrial/record";
 export default {
   name: "zgdgTop",
   components: { lbCompents },
@@ -743,6 +911,54 @@ export default {
       historyIntervalTask: null,
       // 有效开机率
       percentage: 80,
+
+      isOpen: false,
+      chartLoading: false,
+      loading: true,
+      isNoData: false,
+      height: "500px",
+      queryParams: {
+        columnName: null,
+        startTime: null,
+        endTime: null,
+      },
+      datetime: this.getDefaultTimeRange(),
+      name: null,
+      unit: null,
+      sysStatus: {},
+      monitorInfo: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      dialogTitle: "",
     };
   },
   beforeDestroy() {
@@ -750,133 +966,421 @@ export default {
     clearInterval(this.historyIntervalTask);
   },
   mounted() {
+    let query = {
+      equipName: "可控中高辊顶辊",
+    };
+    this.getSysStatusData(query);
+    this.getMonitorData(query);
     this.queryDataInit();
     this.intervalTask = setInterval(() => {
       // 查询数据
       this.queryData();
     }, 1000);
-    this.queryHistoryData();
-    this.historyIntervalTask = setInterval(() => {
-      // 查询历史数据
-      this.queryHistoryData();
-    }, 60 * 1000);
+    // this.queryHistoryData();
+    // this.historyIntervalTask = setInterval(() => {
+    //   // 查询历史数据
+    //   this.queryHistoryData();
+    // }, 60 * 1000);
   },
   methods: {
-    queryHistoryData() {
-      zgdgTopdataHistory().then((response) => {
+    getSysStatusData(query) {
+      getStatusByEquipName(query).then((response) => {
+        this.sysStatus = response.data;
+        this.queryAlarmRecordData(this.sysStatus.equipId);
+      });
+    },
+    getMonitorData(query) {
+      getMonitorInfoByEquipName(query).then((response) => {
+        this.monitorInfo = response.data;
+      });
+    },
+    getDefaultTimeRange() {
+      const now = new Date();
+      const oneHoursAgo = new Date(now.getTime() - 1 * 60 * 60 * 1000);
+      return [this.formatDateTime(oneHoursAgo), this.formatDateTime(now)];
+    },
+    formatDateTime(date) {
+      return (
+        date.getFullYear() +
+        "-" +
+        this.padZero(date.getMonth() + 1) +
+        "-" +
+        this.padZero(date.getDate()) +
+        "T" +
+        this.padZero(date.getHours()) +
+        ":" +
+        this.padZero(date.getMinutes()) +
+        ":" +
+        this.padZero(date.getSeconds())
+      );
+    },
+    padZero(num) {
+      return num < 10 ? "0" + num : num;
+    },
+    handleQuery() {
+      this.loading = true;
+      let startTime = new Date(this.datetime[0]);
+      this.queryParams.startTime = this.formatDateTime(startTime);
+      let endTime = new Date(this.datetime[1]);
+      this.queryParams.endTime = this.formatDateTime(endTime);
+      this.getData(this.queryParams);
+    },
+    resetQuery() {
+      this.datetime = this.getDefaultTimeRange();
+      this.handleQuery();
+    },
+    getData(queryObj) {
+      this.chartLoading = true;
+      getTopScollerDataByDate(queryObj).then((response) => {
+        if (response.data == null) {
+          this.chartLoading = false;
+          this.isNoData = true;
+        } else {
+          this.isNoData = false;
+          this.loading = false;
+          this.initchart(
+            response.data.x,
+            response.data.y,
+            this.name,
+            this.unit
+          );
+        }
+      });
+    },
+    initchart(xData, yData, name, unit) {
+      let p = new Promise((resolve) => {
+        resolve();
+      });
+      p.then(() => {
+        this.chart = echarts.init(this.$refs.chart);
+        let option = {
+          color: ["#637DCB"],
+          title: {
+            text: "",
+            right: "100",
+            textStyle: { fontWeight: "normal", color: "#637DCB" },
+          },
+          toolbox: {
+            top: 0,
+            itemSize: 13, //工具栏 icon 的大小
+            iconStyle: {
+              color: "transparent",
+              borderColor: "#fff",
+            },
+            feature: {
+              dataZoom: {
+                yAxisIndex: "none",
+              },
+              restore: { show: false },
+              saveAsImage: { show: false },
+            },
+          },
+          tooltip: {
+            //提示框
+            trigger: "axis",
+            axisPointer: {
+              type: "line", //显示提示框的时候的背景 line是一条线 shadow是个背景框
+            },
+            backgroundColor: "#fff",
+            extraCssText: "box-shadow: 4px 4px 4px 2px rgba(0, 0, 0, 0.2)", //提示框加阴影效果
+            textStyle: {
+              color: "#4E5969", //设置文字颜色
+            },
+            formatter: (prams) => {
+              let name = parseFloat(_.get(prams, [0, "name"])).toFixed(4);
+              let value = parseFloat(_.get(prams, [0, "value"])).toFixed(4);
+              return (
+                "<span style='color:#6D85CE'>" +
+                `（${name}` +
+                "," +
+                `${value}）` +
+                "</span>"
+              );
+            },
+          },
+          xAxis: [
+            {
+              type: "category",
+              name: "ms",
+              data: xData,
+              nameTextStyle: { fontSize: "9" },
+              axisLine: {
+                show: true,
+                lineStyle: {
+                  color: "#fff",
+                  width: 0, //这里是为了突出显示加上的
+                },
+              },
+              axisLabel: {
+                textStyle: {
+                  color: "#fff",
+                  fontSize: "9",
+                },
+                showMaxLabel: true,
+                showMinLabel: true,
+              },
+            },
+          ],
+          yAxis: [
+            {
+              name: { name: "单位: " + unit },
+              type: "value",
+              nameLocation: "end",
+              nameTextStyle: {
+                color: "#fff",
+                fontSize: "9",
+              },
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                interval: 0,
+                textStyle: {
+                  fontSize: "9",
+                  color: "#fff",
+                },
+              },
+              splitLine: {
+                //修改背景线条样式
+                show: true, //是否展示
+                lineStyle: {
+                  color: "#3C506B", //线条颜色
+                  type: "dashed", //线条样式，默认是实现，dashed是虚线
+                },
+              },
+            },
+          ],
+          grid: {
+            left: "3%",
+            right: "8%",
+            bottom: "18%",
+            top: "14%",
+            containLabel: true,
+          },
+          dataZoom: [
+            {
+              show: true,
+              type: "slider",
+              xAxisIndex: 0,
+              filterMode: "none",
+              start: 0,
+              end: xData.length,
+              bottom: "1%",
+              fillerColor: "rgba(167,183,204,0.4)", //选中范围的填充颜色。
+              borderColor: "#3C506B",
+            },
+            {
+              show: true,
+              type: "inside",
+              xAxisIndex: 0,
+              filterMode: "none",
+              start: 0,
+              end: 10,
+              bottom: "1%",
+              fillerColor: "rgba(167,183,204,0.4)", //选中范围的填充颜色。
+              borderColor: "#E0E6F3",
+            },
+          ],
+          series: [
+            {
+              name: name,
+              type: "line",
+              data: yData,
+              symbol: "none",
+            },
+          ],
+        };
+        this.chart.setOption(option);
+        this.chartLoading = false;
+      });
+    },
+    trendClick(key, name, unit) {
+      this.dialogTitle = name + "历史趋势记录查询";
+      this.isOpen = true;
+      this.name = name;
+      this.unit = unit;
+      this.queryParams.columnName = key;
+      this.initchart([], [], "", "");
+      this.handleQuery();
+    },
+    queryAlarmRecordData(equipId) {
+      let query = {
+        equipId: equipId,
+      };
+      listAllRecord(query).then((response) => {
         // 主参数报警
-        this.mainWarning = response.data.filter((item) => item.type == "1");
-        // .map((obj) => obj.alarmDetail)
+        this.mainWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "sys_press" ||
+              item.nameKey == "sys_flw" ||
+              item.nameKey == "sys_level" ||
+              item.nameKey == "sys_temp"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
         // ZFSC4超压平衡缸P/Q特性报警
-        this.sjyltxWarning = response.data.filter((item) => item.type == "3");
+        this.sjyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "press1" ||
+              item.nameKey == "press2" ||
+              item.nameKey == "press3" ||
+              item.nameKey == "press4" ||
+              item.nameKey == "press5" ||
+              item.nameKey == "press6" ||
+              item.nameKey == "press7" ||
+              item.nameKey == "press8" ||
+              item.nameKey == "press9" ||
+              item.nameKey == "press10" ||
+              item.nameKey == "press11"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .map((obj) => obj.alarmDetail)
         // .join("，");
         // 系统能耗及预警
-        this.sysecWarning = response.data.filter(
-          (item) => item.alarmNameKey == "zdjdl"
-        );
+        this.sysecWarning = response.data
+          .filter((item) => item.nameKey == "sys_cur")
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .map((obj) => obj.alarmDetail)
         // .join("，");
         // ZFSC4超压底缸加压压区P/Q特性报警
-        this.llyltxWarning = response.data.filter((item) => item.type == "4");
-        // .map((obj) => obj.alarmDetail)
+        this.llyltxWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "flw1" ||
+              item.nameKey == "flw2" ||
+              item.nameKey == "flw3" ||
+              item.nameKey == "flw4" ||
+              item.nameKey == "flw5" ||
+              item.nameKey == "flw6" ||
+              item.nameKey == "flw7" ||
+              item.nameKey == "flw8" ||
+              item.nameKey == "flw9" ||
+              item.nameKey == "flw10" ||
+              item.nameKey == "flw11"
+          )
+          .map((obj) => obj.alarmDetail);
         // .join("，");
         // ZFSC4超压底缸加压系统油品特性报警
-        this.ylkldWarning = response.data.filter((item) => item.type == "2");
-        // .map((obj) => obj.alarmDetail)
+        this.ylkldWarning = response.data
+          .filter(
+            (item) =>
+              item.nameKey == "oil_water" ||
+              item.nameKey == "visc" ||
+              item.nameKey == "gran4" ||
+              item.nameKey == "gran6" ||
+              item.nameKey == "gran14" ||
+              item.nameKey == "gran21"
+          )
+          .map(
+            (obj) =>
+              "报警内容：" + obj.content + "     报警时间：" + obj.alarmTime
+          );
         // .join("，");
       });
     },
     async queryDataInit() {
-      const { data } = await zgdgTopdata();
-      this.XDATA = data.xData;
-      this.xtyl = parseFloat(data.xtyl.slice(-1)[0]).toFixed(2);
-      this.xtyw = parseFloat(data.ywen.slice(-1)[0]).toFixed(2);
-      this.xtywei = parseFloat(data.yw.slice(-1)[0]).toFixed(2);
-      this.xtyweicsz = parseFloat(data.ywcsz.slice(-1)[0]).toFixed(2);
-      this.xtyweimin = parseFloat(data.ywmin.slice(-1)[0]).toFixed(2);
-      this.xtyweimax = parseFloat(data.ywmax.slice(-1)[0]).toFixed(2);
-      this.zbscll = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.scxl = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.zdjsjgl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
+      const { data } = await listTopScollerData();
+      this.XDATA = data.timelist;
       this.showdata = data;
-      this.zdjdl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
-      this.yykld4 = parseFloat(data.yykld4.slice(-1)[0]).toFixed(2);
-      this.yykld6 = parseFloat(data.yykld6.slice(-1)[0]).toFixed(2);
-      this.yykld14 = parseFloat(data.yykld14.slice(-1)[0]).toFixed(2);
-      this.yykld21 = parseFloat(data.yykld21.slice(-1)[0]).toFixed(2);
+      this.xtyl = parseFloat(data.sysprs).toFixed(2);
+      this.xtyw = parseFloat(data.systemp).toFixed(2);
+      this.xtywei = parseFloat(data.syslevel).toFixed(2);
+      this.xtyweicsz = parseFloat(data.syslevelinit).toFixed(2);
+      this.xtyweimin = parseFloat(data.levelmin).toFixed(2);
+      this.xtyweimax = parseFloat(data.levelmax).toFixed(2);
+      this.zbscll = parseFloat(data.sysflw).toFixed(2);
+      this.scxl = parseFloat(data.syseff).toFixed(2);
+      this.zdjsjgl = parseFloat(data.syspower).toFixed(2);
+      this.zdjdl = parseFloat(data.syscur.slice(-1)[0]).toFixed(2);
+      this.yykld4 = parseFloat(data.sysgran4).toFixed(2);
+      this.yykld6 = parseFloat(data.sysgran6).toFixed(2);
+      this.yykld14 = parseFloat(data.sysgran14).toFixed(2);
+      this.yykld21 = parseFloat(data.sysgran21).toFixed(2);
       this.sjylData = [
-        parseFloat(data.yqbljyf1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs11.slice(-1)[0]).toFixed(2),
       ];
       this.llylData = [
-        parseFloat(data.yqll1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw11.slice(-1)[0]).toFixed(2),
       ];
       this.initCharts();
     },
     async queryData() {
-      const { data } = await zgdgTopdata();
-      this.XDATA = data.xData;
-      this.xtyl = parseFloat(data.xtyl.slice(-1)[0]).toFixed(2);
-      this.xtyw = parseFloat(data.ywen.slice(-1)[0]).toFixed(2);
-      this.xtywei = parseFloat(data.yw.slice(-1)[0]).toFixed(2);
-      this.xtyweicsz = parseFloat(data.ywcsz.slice(-1)[0]).toFixed(2);
-      this.xtyweimin = parseFloat(data.ywmin.slice(-1)[0]).toFixed(2);
-      this.xtyweimax = parseFloat(data.ywmax.slice(-1)[0]).toFixed(2);
-      this.zbscll = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.scxl = parseFloat(data.zbscll.slice(-1)[0]).toFixed(2);
-      this.zdjsjgl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
+      const { data } = await listTopScollerData();
+      this.XDATA = data.timelist;
+      this.xtyl = parseFloat(data.sysprs).toFixed(2);
+      this.xtyw = parseFloat(data.systemp).toFixed(2);
+      this.xtywei = parseFloat(data.syslevel).toFixed(2);
+      this.xtyweicsz = parseFloat(data.syslevelinit).toFixed(2);
+      this.xtyweimin = parseFloat(data.levelmin).toFixed(2);
+      this.xtyweimax = parseFloat(data.levelmax).toFixed(2);
+      this.zbscll = parseFloat(data.sysflw).toFixed(2);
+      this.scxl = parseFloat(data.syseff).toFixed(2);
+      this.zdjsjgl = parseFloat(data.syspower).toFixed(2);
       this.showdata = data;
-      this.zdjdl = parseFloat(data.zdjdl.slice(-1)[0]).toFixed(2);
-      this.yykld4 = parseFloat(data.yykld4.slice(-1)[0]).toFixed(2);
-      this.yykld6 = parseFloat(data.yykld6.slice(-1)[0]).toFixed(2);
-      this.yykld14 = parseFloat(data.yykld14.slice(-1)[0]).toFixed(2);
-      this.yykld21 = parseFloat(data.yykld21.slice(-1)[0]).toFixed(2);
+      this.zdjdl = parseFloat(data.syscur.slice(-1)[0]).toFixed(2);
+      this.yykld4 = parseFloat(data.sysgran4).toFixed(2);
+      this.yykld6 = parseFloat(data.sysgran6).toFixed(2);
+      this.yykld14 = parseFloat(data.sysgran14).toFixed(2);
+      this.yykld21 = parseFloat(data.sysgran21).toFixed(2);
       this.sjylData = [
-        parseFloat(data.yqbljyf1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqbljyf11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.prs11.slice(-1)[0]).toFixed(2),
       ];
       this.llylData = [
-        parseFloat(data.yqll1.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll2.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll3.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll4.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll5.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll6.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll7.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll8.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll9.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll10.slice(-1)[0]).toFixed(2),
-        parseFloat(data.yqll11.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw1.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw2.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw3.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw4.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw5.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw6.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw7.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw8.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw9.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw10.slice(-1)[0]).toFixed(2),
+        parseFloat(data.flw11.slice(-1)[0]).toFixed(2),
       ];
       this.refreshCharts();
     },
@@ -884,37 +1388,37 @@ export default {
       // 压区实际压力特性echarts
       let sjylOption = this.sjylChart.getOption();
       sjylOption.xAxis[0].data = this.XDATA;
-      sjylOption.series[0].data = this.showdata.yqbljyf1;
-      sjylOption.series[1].data = this.showdata.yqbljyf2;
-      sjylOption.series[2].data = this.showdata.yqbljyf3;
-      sjylOption.series[3].data = this.showdata.yqbljyf4;
-      sjylOption.series[4].data = this.showdata.yqbljyf5;
-      sjylOption.series[5].data = this.showdata.yqbljyf6;
-      sjylOption.series[6].data = this.showdata.yqbljyf7;
-      sjylOption.series[7].data = this.showdata.yqbljyf8;
-      sjylOption.series[8].data = this.showdata.yqbljyf9;
-      sjylOption.series[9].data = this.showdata.yqbljyf10;
-      sjylOption.series[10].data = this.showdata.yqbljyf11;
+      sjylOption.series[0].data = this.showdata.prs1;
+      sjylOption.series[1].data = this.showdata.prs2;
+      sjylOption.series[2].data = this.showdata.prs3;
+      sjylOption.series[3].data = this.showdata.prs4;
+      sjylOption.series[4].data = this.showdata.prs5;
+      sjylOption.series[5].data = this.showdata.prs6;
+      sjylOption.series[6].data = this.showdata.prs7;
+      sjylOption.series[7].data = this.showdata.prs8;
+      sjylOption.series[8].data = this.showdata.prs9;
+      sjylOption.series[9].data = this.showdata.prs10;
+      sjylOption.series[10].data = this.showdata.prs11;
       this.sjylChart.setOption(sjylOption);
       // 实时电流echarts
       let zdjdlOption = this.zdjdlCharts.getOption();
       zdjdlOption.xAxis[0].data = this.XDATA;
-      zdjdlOption.series[0].data = this.showdata.zdjdl;
+      zdjdlOption.series[0].data = this.showdata.syscur;
       this.zdjdlCharts.setOption(zdjdlOption);
       // 压区流量压力特性echarts
       let llylOption = this.llylChart.getOption();
       llylOption.xAxis[0].data = this.XDATA;
-      llylOption.series[0].data = this.showdata.yqll1;
-      llylOption.series[1].data = this.showdata.yqll2;
-      llylOption.series[2].data = this.showdata.yqll3;
-      llylOption.series[3].data = this.showdata.yqll4;
-      llylOption.series[4].data = this.showdata.yqll5;
-      llylOption.series[5].data = this.showdata.yqll6;
-      llylOption.series[6].data = this.showdata.yqll7;
-      llylOption.series[7].data = this.showdata.yqll8;
-      llylOption.series[8].data = this.showdata.yqll9;
-      llylOption.series[9].data = this.showdata.yqll10;
-      llylOption.series[10].data = this.showdata.yqll11;
+      llylOption.series[0].data = this.showdata.flw1;
+      llylOption.series[1].data = this.showdata.flw2;
+      llylOption.series[2].data = this.showdata.flw3;
+      llylOption.series[3].data = this.showdata.flw4;
+      llylOption.series[4].data = this.showdata.flw5;
+      llylOption.series[5].data = this.showdata.flw6;
+      llylOption.series[6].data = this.showdata.flw7;
+      llylOption.series[7].data = this.showdata.flw8;
+      llylOption.series[8].data = this.showdata.flw9;
+      llylOption.series[9].data = this.showdata.flw10;
+      llylOption.series[10].data = this.showdata.flw11;
       this.llylChart.setOption(llylOption);
       // 油液颗粒度特性echarts
       let yykldOption = this.yykldtxCharts.getOption();
@@ -927,12 +1431,12 @@ export default {
       this.yykldtxCharts.setOption(yykldOption);
       let dlndOption = this.dlndCharts.getOption();
       dlndOption.series[0].data[0].value = parseFloat(
-        this.showdata.ypnd[0]
+        this.showdata.sysvisc
       ).toFixed(2);
       this.dlndCharts.setOption(dlndOption);
       let xdsdOption = this.xdsdCharts.getOption();
       xdsdOption.series[0].data[0].value = parseFloat(
-        this.showdata.ysjc[0]
+        this.showdata.syshumid
       ).toFixed(2);
       this.xdsdCharts.setOption(xdsdOption);
       // 主要参数及echarts
@@ -1063,7 +1567,7 @@ export default {
           color: ["2ACDDE", "92D8DD"],
           bgColor: "023953",
           name: "泵输出流量",
-          value: this.bscll,
+          value: this.zbscll,
           limit: 0.8,
           unit: "L/min",
         }),
@@ -1153,70 +1657,70 @@ export default {
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf1,
+            data: this.showdata.prs1,
           },
           {
             name: "二区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf2,
+            data: this.showdata.prs2,
           },
           {
             name: "三区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf3,
+            data: this.showdata.prs3,
           },
           {
             name: "四区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf4,
+            data: this.showdata.prs4,
           },
           {
             name: "五区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf5,
+            data: this.showdata.prs5,
           },
           {
             name: "六区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf6,
+            data: this.showdata.prs6,
           },
           {
             name: "七区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf7,
+            data: this.showdata.prs7,
           },
           {
             name: "八区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf8,
+            data: this.showdata.prs8,
           },
           {
             name: "九区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf9,
+            data: this.showdata.prs9,
           },
           {
             name: "十区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqbljyf10,
+            data: this.showdata.prs10,
           },
           {
             name: "十一区",
@@ -1225,7 +1729,7 @@ export default {
             symbol: "none",
             symbol: "none",
 
-            data: this.showdata.yqbljyf11,
+            data: this.showdata.prs11,
           },
         ],
       };
@@ -1251,7 +1755,7 @@ export default {
             {
               name: "电流",
               type: "line",
-              data: this.showdata.zdjdl,
+              data: this.showdata.syscur,
               symbol: "none",
             },
           ],
@@ -1306,77 +1810,77 @@ export default {
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll1,
+            data: this.showdata.flw1,
           },
           {
             name: "二区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll2,
+            data: this.showdata.flw2,
           },
           {
             name: "三区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll3,
+            data: this.showdata.flw3,
           },
           {
             name: "四区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll4,
+            data: this.showdata.flw4,
           },
           {
             name: "五区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll5,
+            data: this.showdata.flw5,
           },
           {
             name: "六区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll6,
+            data: this.showdata.flw6,
           },
           {
             name: "七区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll7,
+            data: this.showdata.flw7,
           },
           {
             name: "八区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll8,
+            data: this.showdata.flw8,
           },
           {
             name: "九区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll9,
+            data: this.showdata.flw9,
           },
           {
             name: "十区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll10,
+            data: this.showdata.flw10,
           },
           {
             name: "十一区",
             type: "line",
             // smooth: true, // 是否平滑
             symbol: "none",
-            data: this.showdata.yqll11,
+            data: this.showdata.flw11,
           },
         ],
       };
@@ -1404,14 +1908,14 @@ export default {
             data: ["4um", "6um", "14um", "21um"],
           },
           yAxis: {
-            name: "Y(mA)",
+            name: "PM",
             min: 0,
             max: 1,
             interval: 0.2, // 指定刻度间隔
           },
           series: [
             {
-              name: "位移",
+              name: "颗粒度",
               type: "bar",
               barWidth: "30",
               itemStyle: {
@@ -1440,7 +1944,7 @@ export default {
           color: ["00F28D", "00FFDD", "00BFFF"],
           bgColor: "87a6a8",
           name: "粘度",
-          value: parseFloat(this.showdata.ypnd.slice(-1)[0]).toFixed(2),
+          value: parseFloat(this.showdata.sysvisc).toFixed(2),
           limit: 0.8,
           unit: "mm2/s",
         }),
@@ -1458,7 +1962,7 @@ export default {
           color: ["00F28D", "00FFDD", "00BFFF"],
           bgColor: "87a6a8",
           name: "湿度",
-          value: parseFloat(this.showdata.ysjc.slice(-1)[0]).toFixed(2),
+          value: parseFloat(this.showdata.syshumid).toFixed(2),
           limit: 0.8,
           unit: "%",
         }),
@@ -2303,4 +2807,8 @@ export default {
     height: 100%;
   }
 }
+
+::-webkit-scrollbar {
+  width: 0px;
+}
 </style>