From d72d98b6e2694275b1fb08d751a480250b8e78c6 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 13 Jun 2024 10:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homePage/components/rowMsgDialog.vue      | 48 +++++++++++--------
 src/views/report/index.vue                    |  1 +
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/views/homePage/components/rowMsgDialog.vue b/src/views/homePage/components/rowMsgDialog.vue
index b173551..1a45478 100644
--- a/src/views/homePage/components/rowMsgDialog.vue
+++ b/src/views/homePage/components/rowMsgDialog.vue
@@ -18,9 +18,10 @@
         </el-table-column>
         <el-table-column prop="createTime" label="时间">
           <template slot-scope="scope">
-            {{ $moment(scope.row.createTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
+            {{
+              $moment(scope.row.createTime * 1000).format("YYYY-MM-DD HH:mm:ss")
+            }}
           </template>
-          
         </el-table-column>
         <el-table-column label="id">
           <template slot-scope="scope">
@@ -41,83 +42,88 @@
         <el-table-column label="电池">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.battery }}</span>
-           
           </template>
         </el-table-column>
         <el-table-column label="电池温度" width="70">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.batteryTmp }}</span>
-           
           </template>
         </el-table-column>
         <el-table-column label="主板温度" width="70">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.mainBoardTmp }}</span>
-           
           </template>
         </el-table-column>
 
         <el-table-column label="系统重启" width="70">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.rebootTimes }}</span>
-           
           </template>
         </el-table-column>
         <el-table-column label="i1重启" width="70">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.i1RebootTimes }}</span>
-           
           </template>
         </el-table-column>
 
         <el-table-column label="收" width="70">
           <template slot-scope="scope">
             <span>{{ 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>
-           
           </template>
         </el-table-column>
         <el-table-column label="拍" width="60">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.photoTimes }}</span>
-           
           </template>
         </el-table-column>
         <el-table-column label="成/败/传" width="70">
           <template slot-scope="scope">
-            <span> {{ scope.row.reportMap.success }}/{{
+            <span>
+              {{ scope.row.reportMap.success }}/{{
                 scope.row.reportMap.failure
-              }}/{{ scope.row.reportMap.uploads }}</span>
-           
+              }}/{{ scope.row.reportMap.uploads }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column label="心跳累计" width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.numberOfHb }}</span>
-            
           </template>
         </el-table-column>
         <el-table-column label="网络异常" width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.reportMap.networkError }}</span>
-            
           </template>
         </el-table-column>
         <el-table-column label="信号1" width="60">
           <template slot-scope="scope">
-            <span>{{ scope.row.reportMap.signature1 }}</span>
-           
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.reportMap.signalLevel1 }}</span
+            >
+            <span v-else> {{ scope.row.reportMap.signature1 }}</span>
           </template>
         </el-table-column>
         <el-table-column label="信号2" width="60">
           <template slot-scope="scope">
-            <span>{{ scope.row.reportMap.signature2 }}</span>
-           
+            <span
+              v-if="
+                scope.row.reportMap !== null &&
+                scope.row.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.reportMap.signalLevel2 }}</span
+            >
+            <span v-else> {{ scope.row.reportMap.signature2 }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="其他">
@@ -186,7 +192,7 @@ export default {
     },
     getQueryList() {
       this.girdloading = true;
-      this.gridData = []
+      this.gridData = [];
       heartListApi({
         termId: this.termid,
         pageNum: this.page,
@@ -195,7 +201,7 @@ export default {
         .then((res) => {
           console.log(res);
           this.gridData = res.data.list;
-           this.total = Number(res.data.total);
+          this.total = Number(res.data.total);
           this.girdloading = false;
         })
         .catch((err) => {});
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index 207875b..fd696ca 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -463,6 +463,7 @@ export default {
         line-height: 40px;
         display: flex;
         align-items: center;
+        white-space: nowrap;
         .title {
           font-size: 16px;
           font-weight: normal;