From 4e6242e1916f9b49ce88e826e7a486235877655a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 2 Aug 2024 13:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homePage/components/setConfig/mappSet.vue |  2 +-
 src/views/homePage/components/tableMain.vue   | 70 ++++++++++++++-----
 src/views/msgAuth/index.vue                   | 10 ++-
 3 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/src/views/homePage/components/setConfig/mappSet.vue b/src/views/homePage/components/setConfig/mappSet.vue
index 2fad99a..2bc541c 100644
--- a/src/views/homePage/components/setConfig/mappSet.vue
+++ b/src/views/homePage/components/setConfig/mappSet.vue
@@ -243,7 +243,7 @@ export default {
           valueToStore = value * 60000;
         }
         if (key == "absHeartbeats") {
-          type = 1; // 布尔值转换为整数
+          type = 0; // 布尔值转换为整数
           valueToStore = this.secondsArray;
         }
 
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 7630e57..a1d2608 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -224,22 +224,39 @@
           >
         </template>
       </u-table-column>
-      <u-table-column
-        label="传图"
-        prop="mntnStatus.reportMap.pic"
-        width="50"
-        class-name="picBg"
-        sortable
-        :sort-method="picSort"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.mntnStatus.reportMap &&
-            scope.row.mntnStatus.reportMap.hasOwnProperty("uploads")
-              ? Number(scope.row.mntnStatus.reportMap.uploads)
-              : 0
-          }}
-        </template>
+      <u-table-column label="传图" key="ct">
+        <u-table-column
+          label="当天"
+          width="50"
+          class-name="picBg"
+          sortable
+          :sort-method="picSort"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.mntnStatus.reportMap &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("uploads")
+                ? Number(scope.row.mntnStatus.reportMap.uploads)
+                : 0
+            }}
+          </template>
+        </u-table-column>
+        <u-table-column
+          label="历史"
+          width="50"
+          class-name="picBg"
+          sortable
+          :sort-method="pichistorySort"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.mntnStatus.reportMap &&
+              scope.row.mntnStatus.reportMap.hasOwnProperty("delayedUploads")
+                ? Number(scope.row.mntnStatus.reportMap.delayedUploads)
+                : 0
+            }}
+          </template>
+        </u-table-column>
       </u-table-column>
       <u-table-column
         prop="protocol"
@@ -1729,8 +1746,25 @@ export default {
     //传图pic排序
     picSort(a, b) {
       // 确保 a 和 b 都有 mntnStatus.reportMap 对象
-      const aPic = (a.mntnStatus.reportMap && a.mntnStatus.reportMap.pic) || 0;
-      const bPic = (b.mntnStatus.reportMap && b.mntnStatus.reportMap.pic) || 0;
+      const aPic =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.uploads) || 0;
+      const bPic =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.uploads) || 0;
+      // 将 pic 转换为数字进行比较
+      const numA = Number(aPic);
+      const numB = Number(bPic);
+      // 根据需要进行升序或降序排序
+      // 这里假设你想要升序排序（从小到大）
+      return numA - numB;
+      // 如果你想要降序排序（从大到小），则返回 numB - numA
+    },
+    //历史传图
+    pichistorySort(a, b) {
+      // 确保 a 和 b 都有 mntnStatus.reportMap 对象
+      const aPic =
+        (a.mntnStatus.reportMap && a.mntnStatus.reportMap.delayedUploads) || 0;
+      const bPic =
+        (b.mntnStatus.reportMap && b.mntnStatus.reportMap.delayedUploads) || 0;
       // 将 pic 转换为数字进行比较
       const numA = Number(aPic);
       const numB = Number(bPic);
diff --git a/src/views/msgAuth/index.vue b/src/views/msgAuth/index.vue
index 56c59aa..d570193 100644
--- a/src/views/msgAuth/index.vue
+++ b/src/views/msgAuth/index.vue
@@ -97,6 +97,14 @@ export default {
   },
   computed: {},
   watch: {},
+  created() {
+    let logSetparam = JSON.parse(localStorage.getItem("logset"));
+    if (logSetparam !== null) {
+      this.logset = logSetparam;
+    } else {
+      this.logset = { noSpecData: 0, mTime: 0 };
+    }
+  },
   mounted() {
     this.getAuthfn();
   },
@@ -196,7 +204,7 @@ export default {
   }
   .logSet {
     width: 300px;
-    border: 1px solid #f00;
+    border: 1px solid #eee;
     padding: 12px;
     .logMain {
       .top,