From 8e0fa97fd7a34fcb60dc5929d42d7b3aa96c5cac Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 Jul 2024 15:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=8D=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homePage/components/rowMsgDialog.vue      | 35 ++++++++++++-
 src/views/homePage/components/tableMain.vue   | 50 +++++++++++++++----
 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/src/views/homePage/components/rowMsgDialog.vue b/src/views/homePage/components/rowMsgDialog.vue
index a60f2da..9211880 100644
--- a/src/views/homePage/components/rowMsgDialog.vue
+++ b/src/views/homePage/components/rowMsgDialog.vue
@@ -87,12 +87,43 @@
 
         <el-table-column label="收" width="70">
           <template slot-scope="scope">
-            <span>{{ scope.row.reportMap.recv }}</span>
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">
+                  lastHbTime：
+                  {{
+                    $moment(scope.row.reportMap.lastHbTime * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  }}
+                  <br />
+                  lastHbRespTime：
+                  {{
+                    $moment(scope.row.reportMap.lastHbRespTime * 1000).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  }}
+                </div>
+                <span>
+                  {{
+                    $moment(scope.row.reportMap.lastRecvTime * 1000).format(
+                      "HH:mm"
+                    )
+                  }}</span
+                >
+              </el-tooltip>
+            </span>
+            <span v-else> {{ scope.row.reportMap.recv }}</span>
           </template>
         </el-table-column>
         <el-table-column label="传图" width="70">
           <template slot-scope="scope">
-            <span>{{ scope.row.reportMap.pic }}</span>
+            <span>{{ scope.row.reportMap.uploads }}</span>
           </template>
         </el-table-column>
         <el-table-column label="拍" width="60">
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index c4b4b5c..b8fbc6b 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -234,8 +234,8 @@
         <template slot-scope="scope">
           {{
             scope.row.mntnStatus.reportMap &&
-            scope.row.mntnStatus.reportMap.hasOwnProperty("pic")
-              ? Number(scope.row.mntnStatus.reportMap.pic)
+            scope.row.mntnStatus.reportMap.hasOwnProperty("uploads")
+              ? Number(scope.row.mntnStatus.reportMap.uploads)
               : 0
           }}
         </template>
@@ -307,12 +307,44 @@
         </u-table-column>
         <u-table-column label="CMA消息" min-width="48">
           <template slot-scope="scope">
-            <span>{{
+            <span
+              v-if="
+                scope.row.mntnStatus.reportMap !== null &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">
+                  lastHbTime：
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastHbTime * 1000
+                    ).format("YYYY-MM-DD HH:mm:ss")
+                  }}
+                  <br />
+                  lastHbRespTime：
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastHbRespTime * 1000
+                    ).format("YYYY-MM-DD HH:mm:ss")
+                  }}
+                </div>
+                <span>
+                  {{
+                    $moment(
+                      scope.row.mntnStatus.reportMap.lastRecvTime * 1000
+                    ).format("HH:mm")
+                  }}</span
+                >
+              </el-tooltip>
+            </span>
+            <span v-else> {{ scope.row.mntnStatus.reportMap.recv }}</span>
+            <!-- <span>{{
               scope.row.mntnStatus.reportMap !== null &&
               scope.row.mntnStatus.reportMap.hasOwnProperty("recv")
                 ? scope.row.mntnStatus.reportMap.recv
                 : 0
-            }}</span>
+            }}</span> -->
           </template>
         </u-table-column>
       </u-table-column>
@@ -2068,15 +2100,13 @@ export default {
     },
     //下发短信
     sendMsg() {
-      if (this.multipleSelection.length == 1) {
-        console.log(this.multipleSelection);
-
+      if (this.idArray.length !== 0) {
         this.senMsgVisible = true;
       } else {
         this.$message({
           duration: 1500,
           showClose: true,
-          message: "只能选中一个设备",
+          message: "最少选中一个设备",
           type: "warning",
         });
         return;
@@ -2085,7 +2115,7 @@ export default {
     handleSend(item) {
       console.log(item);
       let params = {
-        termId: this.multipleSelection[0].id,
+        termIdList: this.idArray,
         content: item.value,
       };
       sendMsgApi(params)
@@ -2108,7 +2138,7 @@ export default {
     //自定义输入
     handlemsgSend() {
       let params = {
-        termId: this.multipleSelection[0].id,
+        termIdList: this.idArray,
         content: this.sendForm.msginfo,
       };
       sendMsgApi(params)