From ba95104bea8a21b5f84f08c0de8f00c962ddd2f6 Mon Sep 17 00:00:00 2001
From: Free-sss <630042479@qq.com>
Date: Tue, 2 Sep 2025 19:55:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=9C=AC?=
 =?UTF-8?q?=E5=91=A8=E4=BB=8E=E4=B8=83=E5=A4=A9=E5=BC=80=E5=A7=8B=E7=9A=84?=
 =?UTF-8?q?bug=E6=94=B9=E4=B8=BA=E4=BB=8E=E5=91=A8=E4=B8=80=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Charts/ConfinedSpace/PieCircleCommen/index.vue          | 6 ++++--
 .../Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
index b40f867..8564b54 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
@@ -143,9 +143,11 @@ function generateTimeRange(period: string): { startTime: string; endTime: string
       startTime.setHours(0, 0, 0, 0);
       break;
     case 'week':
-      // 本周：7 天前的 00:00:00
+      // 本周：从周一到今天
       startTime = new Date(now);
-      startTime.setDate(startTime.getDate() - 7);
+      const dayOfWeek = now.getDay(); // 0(周日) to 6(周六)
+      const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek; // 周日需要调整为上周一
+      startTime.setDate(startTime.getDate() + diffToMonday);
       startTime.setHours(0, 0, 0, 0);
       break;
     case 'month':
diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue
index 5f05e4d..9890e41 100644
--- a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue
+++ b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue
@@ -199,8 +199,10 @@ function generateTimeRange(period: string): { startTime: string; endTime: string
             endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); // 当天 23:59:59.999
             break;
         case 'week':
-            // 计算过去7天（包括今天）的起始时间
-            startTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6, 0, 0, 0, 0);
+            // 计算本周一到今天的起始和结束时间
+            const dayOfWeek = now.getDay(); // 0(周日) to 6(周六)
+            const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek; // 周日需要调整为上周一
+            startTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + diffToMonday, 0, 0, 0, 0);
             // 结束时间为今天 23:59:59.999
             endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
             break;