diff --git a/web/default/package.json b/web/default/package.json index 15e48f48..7cd9219c 100644 --- a/web/default/package.json +++ b/web/default/package.json @@ -9,6 +9,7 @@ "i18next-browser-languagedetector": "^8.0.2", "i18next-http-backend": "^3.0.2", "marked": "^4.1.1", + "moment": "^2.30.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-dropzone": "^14.2.3", diff --git a/web/default/src/pages/Dashboard/index.js b/web/default/src/pages/Dashboard/index.js index f3b72f22..0d90a1a5 100644 --- a/web/default/src/pages/Dashboard/index.js +++ b/web/default/src/pages/Dashboard/index.js @@ -1,6 +1,8 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Card, Grid, Statistic } from 'semantic-ui-react'; +import { Card, Grid, Header, Segment, Statistic } from 'semantic-ui-react'; +import { API, showError } from '../../helpers'; +import moment from 'moment'; import { LineChart, Line, @@ -116,8 +118,11 @@ const Dashboard = () => { // 获取日期范围 const dates = data.map((item) => item.Day); - const minDate = new Date(Math.min(...dates.map((d) => new Date(d)))); - const maxDate = new Date(Math.max(...dates.map((d) => new Date(d)))); + const minDate = + dates.length > 0 + ? new Date(Math.min(...dates.map((d) => new Date(d)))) + : new Date(); + const maxDate = new Date(); // 总是使用今天作为最后一天 // 生成所有日期 for (let d = new Date(minDate); d <= maxDate; d.setDate(d.getDate() + 1)) { @@ -148,8 +153,11 @@ const Dashboard = () => { // 获取日期范围 const dates = data.map((item) => item.Day); - const minDate = new Date(Math.min(...dates.map((d) => new Date(d)))); - const maxDate = new Date(Math.max(...dates.map((d) => new Date(d)))); + const minDate = + dates.length > 0 + ? new Date(Math.min(...dates.map((d) => new Date(d)))) + : new Date(); + const maxDate = new Date(); // 总是使用今天作为最后一天 // 生成所有日期 for (let d = new Date(minDate); d <= maxDate; d.setDate(d.getDate() + 1)) { diff --git a/web/default/src/pages/Home/index.js b/web/default/src/pages/Home/index.js index 736f5b5e..5e764abb 100644 --- a/web/default/src/pages/Home/index.js +++ b/web/default/src/pages/Home/index.js @@ -68,11 +68,7 @@ const Home = () => {

{t('home.welcome.description')}

- {!userState.user && ( -

- {t('home.welcome.login_notice')} -

- )} + {!userState.user &&

{t('home.welcome.login_notice')}

}