From 657c3da35fcc20b6db7a2348929d0913cc1ca53d Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Tue, 16 Apr 2024 18:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/inspur/datasyn/modbus/IpcDataProcess.java | 2 ++
 .../resources/mapper/industrial/IpcAlarmRecordMapper.xml    | 1 +
 zfipc-ui/src/views/dataLog/index.vue                        | 4 ++++
 zfipc-ui/src/views/warn/alarm/index.vue                     | 4 ++--
 zfipc-ui/src/views/zf/cydg/yxjk.vue                         | 2 +-
 zfipc-ui/src/views/zf/zgdgTop/index.vue                     | 6 +++---
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
index 4dc778e..f4d10bf 100644
--- a/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
+++ b/zfipc-server/zfipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IpcDataProcess.java
@@ -204,7 +204,9 @@ public class IpcDataProcess implements Runnable {
         Map<String, Object> fields = new TreeMap();
 
         List<IpcAlarmRecord> alarmRecordList = new ArrayList<>();
+        //TODO 停机运维状态数据不储存
 
+        tags.put("status", "1");//正常运行 0：停机 1：正常运行 2：待机 3：试运行
         // 系统电流
         fields.put("sys_cur", (float) 0 + Math.random());
         // 系统流量
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 1f4cfd9..ffcba84 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
@@ -74,6 +74,7 @@
                 and #{params.endTime}
             </if>
         </where>
+        order by a.alarm_time desc
     </select>
 
     <select id="selectIpcAlarmRecordById" parameterType="Long" resultMap="IpcAlarmRecordResult">
diff --git a/zfipc-ui/src/views/dataLog/index.vue b/zfipc-ui/src/views/dataLog/index.vue
index 97a0094..c3ad2bb 100644
--- a/zfipc-ui/src/views/dataLog/index.vue
+++ b/zfipc-ui/src/views/dataLog/index.vue
@@ -994,6 +994,10 @@ export default {
       }
     },
     handleQuery() {
+      console.log("datetime:", this.datetime);
+      if (this.datetime == null) {
+        this.datetime = this.getDefaultTimeRange();
+      }
       this.stopRefresh();
       let startTime = new Date(this.datetime[0]);
       this.queryParams.startTime = this.formatDateTime(startTime);
diff --git a/zfipc-ui/src/views/warn/alarm/index.vue b/zfipc-ui/src/views/warn/alarm/index.vue
index a1335f3..c8095da 100644
--- a/zfipc-ui/src/views/warn/alarm/index.vue
+++ b/zfipc-ui/src/views/warn/alarm/index.vue
@@ -205,13 +205,13 @@
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:rules:edit']"
               >修改</el-button>
-              <el-button
+              <!-- <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:rules:remove']"
-              >删除</el-button>
+              >删除</el-button> -->
             </template>
           </el-table-column>
         </el-table>
diff --git a/zfipc-ui/src/views/zf/cydg/yxjk.vue b/zfipc-ui/src/views/zf/cydg/yxjk.vue
index 82161cd..f41b4ac 100644
--- a/zfipc-ui/src/views/zf/cydg/yxjk.vue
+++ b/zfipc-ui/src/views/zf/cydg/yxjk.vue
@@ -2200,7 +2200,7 @@ export default {
             data: ["4um", "6um", "14um", "21um"],
           },
           yAxis: {
-            name: "颗粒度",
+            name: "PM",
             min: 0,
             max: 1,
             interval: 0.2, // 指定刻度间隔
diff --git a/zfipc-ui/src/views/zf/zgdgTop/index.vue b/zfipc-ui/src/views/zf/zgdgTop/index.vue
index c1975ed..4d0863b 100644
--- a/zfipc-ui/src/views/zf/zgdgTop/index.vue
+++ b/zfipc-ui/src/views/zf/zgdgTop/index.vue
@@ -10,7 +10,7 @@
           class="container"
           style="height:100%"
         >
-          <el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header>
+          <el-header class="header">ZFSC4中高顶辊液压压区P/Q特性</el-header>
           <el-main class="main">
             <el-row style="height: 20%;margin:0 3%;">
               <el-row style="height: 50%">
@@ -178,7 +178,7 @@
           class="container"
           style="height:100%"
         >
-          <el-header class="header">ZFSC4中高底辊液压系统主参数</el-header>
+          <el-header class="header">ZFSC4中高顶辊液压系统主参数</el-header>
           <el-main class="main">
             <el-row style="height: 50%">
               <el-col
@@ -330,7 +330,7 @@
           class="container"
           style="height:100%"
         >
-          <el-header class="header">ZFSC4中高底辊液压压区P/Q特性</el-header>
+          <el-header class="header">ZFSC4中高顶辊液压压区P/Q特性</el-header>
           <el-main class="main">
             <el-row style="height: 20%;margin:0 3%;">
               <el-row style="height: 50%">