From 3acf727538b5fe4cc56e41cce6abf2199c5a45a0 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Thu, 27 Jun 2024 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/IpcRunningStatusRecord.java        |  2 +-
 zfipc-ui/src/api/equip/equip.js               | 10 +++
 .../src/views/eqmanagement/eqinfo/index.vue   | 66 +++++++++++++++++++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcRunningStatusRecord.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcRunningStatusRecord.java
index 5fafe88..4ea8df1 100644
--- a/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcRunningStatusRecord.java
+++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/industrial/domain/IpcRunningStatusRecord.java
@@ -26,7 +26,7 @@ public class IpcRunningStatusRecord extends BaseEntity
     private String runningStatus;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
 
diff --git a/zfipc-ui/src/api/equip/equip.js b/zfipc-ui/src/api/equip/equip.js
index afcd0c1..ea45c50 100644
--- a/zfipc-ui/src/api/equip/equip.js
+++ b/zfipc-ui/src/api/equip/equip.js
@@ -41,6 +41,7 @@ export function getEquipTreeByDept(query) {
     params: query,
   });
 }
+
 // 查询设备信息详细
 export function getInfo(id) {
   return request({
@@ -49,6 +50,15 @@ export function getInfo(id) {
   });
 }
 
+// 查询设备信息列表
+export function listInfoStatus(query) {
+  return request({
+    url: "/equip/info/listEquipStatus",
+    method: "get",
+    params: query,
+  });
+}
+
 // 新增设备信息
 export function addInfo(data) {
   return request({
diff --git a/zfipc-ui/src/views/eqmanagement/eqinfo/index.vue b/zfipc-ui/src/views/eqmanagement/eqinfo/index.vue
index ae7fb72..e65a4c1 100644
--- a/zfipc-ui/src/views/eqmanagement/eqinfo/index.vue
+++ b/zfipc-ui/src/views/eqmanagement/eqinfo/index.vue
@@ -314,6 +314,46 @@
                 icon="el-icon-document"
                 @click="handleDetails(scope.row)"
               >详情</el-button>
+              <el-popover
+                :title="statusDataTitle(scope.row)"
+                placement="right"
+                width="400"
+                trigger="click"
+              >
+                <div class="block">
+                  <el-timeline>
+                    <el-timeline-item
+                      v-for="(data, index) in timelineData"
+                      :key="index"
+                      :icon="changeIcon(index)"
+                      :type="data.type"
+                      :color="changeColor(index)"
+                      size="large"
+                      :timestamp="data.startTime"
+                    >
+                      <!-- {{data.equipStatus}} -->
+
+                      <dict-tag
+                        :options="dict.type.equip_status"
+                        :value="data.runningStatus"
+                      />
+                    </el-timeline-item>
+                  </el-timeline>
+                  <div
+                    v-if="timeLoading"
+                    class="loading-indicator"
+                  >加载中...</div>
+                </div>
+                <el-button
+                  size="mini"
+                  type="text"
+                  slot="reference"
+                  icon="el-icon-s-management"
+                  @click="handleStatusChange(scope.row)"
+                  v-hasPermi="['system:info:edit']"
+                >状态数据
+                </el-button>
+              </el-popover>
               <el-button
                 size="mini"
                 type="text"
@@ -1525,6 +1565,7 @@ import {
   uploadImg,
   uploadFile,
   queryInfo,
+  listInfoStatus,
 } from "@/api/equip/equip";
 
 import {
@@ -1863,6 +1904,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      timelineData: [],
+      timeLoading: false,
     };
   },
   watch: {
@@ -1878,6 +1921,29 @@ export default {
     this.getDeptTree();
   },
   methods: {
+    handleStatusChange(row) {
+      var query = {
+        equipId: row.id,
+      };
+      this.timeLoading = true;
+      listInfoStatus(query).then((response) => {
+        this.timelineData = response.data;
+        this.timeLoading = false;
+      });
+    },
+    changeIcon(index) {
+      if (index === 0) {
+        return "el-icon-check";
+      }
+    },
+    changeColor(index) {
+      if (index === 0) {
+        return "green";
+      }
+    },
+    statusDataTitle(row) {
+      return row.equipName + "的状态数据";
+    },
     //图纸下载
     cancelDownload() {
       this.downloadOpen = false;