From d423f16696c568b51c8bdfe6b4b2af60a7c90a51 Mon Sep 17 00:00:00 2001
From: zengmingjie <zengmingjie@qq.com>
Date: Thu, 21 Aug 2025 21:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/menuData/AnalysisDialog.vue |  4 ++-
 src/views/menuData/WhitListDialog.vue | 42 ++++++++++++++++-----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/menuData/AnalysisDialog.vue b/src/views/menuData/AnalysisDialog.vue
index f72b5ac..9187569 100644
--- a/src/views/menuData/AnalysisDialog.vue
+++ b/src/views/menuData/AnalysisDialog.vue
@@ -93,8 +93,10 @@ export default {
             const seriesData = sortedDateData.map((item) => item.count);
 
             const sortedDateData1 = res.data.time.sort(
-              (a, b) => new Date(a.key) - new Date(b.key)
+              (a, b) => Number(a.key) - Number(b.key)
             );
+
+            console.log(sortedDateData1, "sortedDateData1");
             const xAxisData1 = sortedDateData1.map((item) => item.key);
             const seriesData1 = sortedDateData1.map((item) => item.count);
             this.chartData = res.data;
diff --git a/src/views/menuData/WhitListDialog.vue b/src/views/menuData/WhitListDialog.vue
index 96742ed..418a4aa 100644
--- a/src/views/menuData/WhitListDialog.vue
+++ b/src/views/menuData/WhitListDialog.vue
@@ -36,6 +36,9 @@
         @changePage="handlePageChange"
         @selectionChange="handleSelectionChange"
       >
+        <template #whitTime="{ data }">
+          {{ data.createTime }} - {{ data.endTime }}
+        </template>
         <template #operate="{ data }">
           <el-link
             type="primary"
@@ -112,19 +115,13 @@ export default {
           prop: "allDay"
         },
         {
-          type: "text",
-          label: "所属单位",
-          prop: "company"
+          slot: "whitTime",
+          label: "白名单生效的起止日期"
         },
         {
           type: "text",
-          label: "机型",
-          prop: "model"
-        },
-        {
-          type: "text",
-          label: "备注",
-          prop: "mark"
+          label: "状态",
+          prop: "status"
         },
         {
           slot: "operate",
@@ -268,10 +265,21 @@ export default {
         whitListList(params).then((res) => {
           if (res.code === 0) {
             this.tableData = res.data.items.map((item) => {
-              return item.allDay
-                ? { ...item, allDay: "是" }
-                : { ...item, allDay: "否" };
+              let status = "未启用";
+              if (item.allDay) {
+                status = "启用中";
+              } else {
+                const now = new Date();
+                const endTime = new Date(item.endTime);
+                status = endTime > now ? "启用中" : "未启用";
+              }
+              return {
+                ...item,
+                allDay: item.allDay ? "是" : "否",
+                status
+              };
             });
+
             this.paginationParam.total = res.data.total;
           }
         });
@@ -340,11 +348,11 @@ export default {
         this.isType = "edit";
         this.title = "编辑白名单";
         this.isEditFlag = false;
-        this.fromItem = { ...value };
-        this.fromItem.positionId = value.positionIds;
+        this.fromItem = JSON.parse(JSON.stringify(value));
+        this.fromItem.positionId = this.fromItem.positionIds;
         this.formDrawerList = this.getDefaultFormDrawerList();
-        value.allDay = value.allDay ? "0" : "1";
-        this.changeSelect(value.allDay); // 根据 allDay 调整时间日期字段
+        this.fromItem.allDay = this.fromItem.allDay ? "0" : "1";
+        this.changeSelect(this.fromItem.allDay); // 根据 allDay 调整时间日期字段
         this.initPosition();
         this.drawer = true;
       } else if (type === "delete") {