From 200ca65013ddd7f46d473a4ce79e5250005702a3 Mon Sep 17 00:00:00 2001
From: liuyi <l_cheny@foxmail.com>
Date: Wed, 10 May 2023 16:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        | 18 +++++
 .../realTimeMonitor/components/infoDialog.vue | 68 ++++++++++++++-----
 src/views/realTimeMonitor/index.vue           |  1 +
 3 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 7163fa2..d3b3206 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -36,6 +36,24 @@ export function getChannelByTermidJoggle(data) {
   });
 }
 
+//获取装置信息
+export function getDeviceList(data) {
+  return request({
+    url: "/api/getTerminalStatus",
+    method: "post",
+    data,
+    headers:{ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' }
+  });
+}
+//获取最新装置信息
+export function getNewDeviceList(data) {
+  return request({
+    url: "/api/getLastedTerminalStatus",
+    method: "post",
+    data,
+  });
+}
+
 //图片轮巡
 //获取图片轮巡接口
 export function getPictureList(data) {
diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue
index 989766e..ae75de3 100644
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@@ -5,37 +5,36 @@
     :visible.sync="isShow"
     :close-on-click-modal="false"
     width="50%"
+    @close="handleclose"
   >
     <div class="infoTable">
       <el-descriptions class="margin-top" :column="1" border>
         <el-descriptions-item>
-          <template slot="label"> 图像监测装置 ID </template>
-          XYIGQ10C230300104
+          <template slot="label"> 装置编号 </template>{{ infornr.termId }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 装置名称 </template>
-          XYIGQ10C230300104
+          <template slot="label"> 电池电量 </template>{{ infornr.batteryCapacity }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 装置型号 </template>
-          xxx
+          <template slot="label"> 电池电压 </template>{{ infornr.batteryVoltage }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 装置基本信息版本号 </template>
-          xxxxxxxxxxxx
+          <template slot="label"> MEID </template>{{ infornr.cmld }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 生产厂家 </template>
-          xxxxxxxxxxxxxxxxxxxxxxxx
+          <template slot="label"> 网络连接状态 </template>{{ infornr.connectionState }}
         </el-descriptions-item>
-
         <el-descriptions-item>
-          <template slot="label"> 生产日期 </template>
-          xxxxxxxxxxxxxxxxxxxxx
+          <template slot="label"> 浮充状态 </template>{{ infornr.floatingCharge }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 出厂编号 </template>
-          xxxxxxxxxxxxxxxxxx
+          <template slot="label"> 工作总时间（小时） </template>{{ infornr.totalWorkingTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 本次连续工作时间（小时） </template>{{ infornr.workingTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 工作状态更新时间 </template>{{ infornr.wsUpdateTime }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
@@ -46,7 +45,7 @@
   </el-dialog>
 </template>
 <script>
-import { getChannelListJoggle } from "@/utils/api/index";
+import { getDeviceList, getNewDeviceList } from "@/utils/api/index";
 export default {
   props: {
     title: String,
@@ -55,16 +54,53 @@ export default {
     return {
       loading: true,
       isShow: false,
+      infornr:{},//装置信息内容
+      timer:null,
+      queryTime:'',//请求时间
     };
   },
   mounted() {},
   methods: {
+    //获取第一次数据
+    getListData(val){
+      getDeviceList({
+        termId: val,
+      }).then((res) => {
+        this.infornr = res.data;
+        this.queryTime = res.data.queryTime
+        console.log(this.queryTime)
+        this.timer = window.setInterval(() => {
+          this.getNewListData(val);
+        }, 10000);
+      })
+      .catch((err) => {});
+    },
+    //最新数据
+    getNewListData(val){
+      getNewDeviceList({
+        termId: val,
+        queryTime: this.queryTime
+      }).then((res) => {
+        if (res.data!==null) {
+          this.infornr = res.data;
+          this.$message({
+            message: "装置信息已更新",
+            type: "success",
+          });
+          clearInterval(this.timer);
+        }
+      })
+      .catch((err) => {});
+    },
     display() {
       this.isShow = true;
     },
     hide() {
       this.isShow = false;
     },
+    handleclose(){
+      clearInterval(this.timer);
+    }
   },
 };
 </script>
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index b51c976..0d9ee3b 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -467,6 +467,7 @@ export default {
     //装置信息handleShowInfo
     handleShowInfo() {
       this.$refs.infodialog_ref.display();
+      this.$refs.infodialog_ref.getListData(this.channelId);
     },
     //历史图片
     // handlehistoryPic() {