From 02637f71fa8871b8d0f5fbc196f6312b9dcf7255 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 1 Jul 2024 07:44:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E8=AE=BF=E9=97=AE=E8=B6=8B?=
 =?UTF-8?q?=E5=8A=BF=E5=9B=BE=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E6=AE=B5=E8=AE=A1=E7=AE=97=E5=B0=91?=
 =?UTF-8?q?=E4=B8=80=E5=A4=A9=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/components/VisitTrend.vue | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/views/dashboard/components/VisitTrend.vue b/src/views/dashboard/components/VisitTrend.vue
index 3240f509..46c45d97 100644
--- a/src/views/dashboard/components/VisitTrend.vue
+++ b/src/views/dashboard/components/VisitTrend.vue
@@ -71,8 +71,8 @@ const setChartOptions = (data: VisitTrendVO) => {
       bottom: 0,
     },
     grid: {
-      left: "2%",
-      right: "7%",
+      left: "1%",
+      right: "5%",
       bottom: "10%",
       containLabel: true,
     },
@@ -126,22 +126,31 @@ const setChartOptions = (data: VisitTrendVO) => {
   chart.value.setOption(options);
 };
 
-// 计算日期范围
+/** 计算起止时间范围 */
 const calculateDateRange = () => {
   const now = new Date();
-  const endDate = now.toISOString().split("T")[0];
+
+  const endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+
   const days = dataRange.value === 1 ? 7 : 30;
-  const startDate = new Date(
-    now.getFullYear(),
-    now.getMonth(),
-    now.getDate() - days
-  )
-    .toISOString()
-    .split("T")[0];
-  return { startDate, endDate };
+  const startDate = new Date(endDate);
+  startDate.setDate(startDate.getDate() - days);
+
+  // 手动调整日期为当地时间的 23:59:59
+  const adjustDateToLocal = (date: Date) => {
+    date.setHours(23, 59, 59, 999);
+    return date;
+  };
+
+  const adjustedEndDate = adjustDateToLocal(new Date(endDate));
+  const adjustedStartDate = adjustDateToLocal(new Date(startDate));
+  const formattedStartDate = adjustedStartDate.toISOString().split("T")[0];
+  const formattedEndDate = adjustedEndDate.toISOString().split("T")[0];
+
+  return { startDate: formattedStartDate, endDate: formattedEndDate };
 };
 
-// 加载数据
+/** 加载数据 */
 const loadData = () => {
   const { startDate, endDate } = calculateDateRange();
   StatsAPI.getVisitTrend({
@@ -156,7 +165,7 @@ const handleDateRangeChange = () => {
   loadData();
 };
 
-// 下载图表
+/** 下载图表 */
 const handleDownloadChart = () => {
   if (!chart.value) {
     return;
@@ -187,13 +196,15 @@ const handleDownloadChart = () => {
   };
 };
 
+/** 窗口大小变化时，重置图表大小 */
 const handleResize = () => {
-  if (chart.value) {
-    chart.value.resize();
-  }
+  setTimeout(() => {
+    if (chart.value) {
+      chart.value.resize();
+    }
+  }, 100);
 };
-
-// 初始化图表
+/** 初始化图表  */
 onMounted(() => {
   chart.value = markRaw(
     echarts.init(document.getElementById(props.id) as HTMLDivElement)
@@ -203,6 +214,10 @@ onMounted(() => {
   window.addEventListener("resize", handleResize);
 });
 
+onBeforeUnmount(() => {
+  window.removeEventListener("resize", handleResize);
+});
+
 onActivated(() => {
   handleResize();
 });