From 517f6ad21141c2574a4e1a65004b07ef5607a2b0 Mon Sep 17 00:00:00 2001 From: JustSong Date: Tue, 11 Feb 2025 01:48:26 +0800 Subject: [PATCH] feat: update date range to display at least 7 days of data in Dashboard --- web/default/src/pages/Dashboard/index.js | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/web/default/src/pages/Dashboard/index.js b/web/default/src/pages/Dashboard/index.js index 21151519..37ba424b 100644 --- a/web/default/src/pages/Dashboard/index.js +++ b/web/default/src/pages/Dashboard/index.js @@ -1,6 +1,6 @@ -import React, { useEffect, useState } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Card, Grid } from 'semantic-ui-react'; +import React, {useEffect, useState} from 'react'; +import {useTranslation} from 'react-i18next'; +import {Card, Grid} from 'semantic-ui-react'; import { Bar, BarChart, @@ -122,11 +122,11 @@ const Dashboard = () => { ? new Date(Math.min(...dates.map((d) => new Date(d)))) : new Date(); - // 确保至少显示5天的数据 - const fiveDaysAgo = new Date(); - fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天 - if (minDate > fiveDaysAgo) { - minDate = fiveDaysAgo; + // 确保至少显示7天的数据 + const sevenDaysAgo = new Date(); + sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天 + if (minDate > sevenDaysAgo) { + minDate = sevenDaysAgo; } // 生成所有日期 @@ -164,11 +164,11 @@ const Dashboard = () => { ? new Date(Math.min(...dates.map((d) => new Date(d)))) : new Date(); - // 确保至少显示5天的数据 - const fiveDaysAgo = new Date(); - fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天 - if (minDate > fiveDaysAgo) { - minDate = fiveDaysAgo; + // 确保至少显示7天的数据 + const sevenDaysAgo = new Date(); + sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天 + if (minDate > sevenDaysAgo) { + minDate = sevenDaysAgo; } // 生成所有日期