From 02bd2ea264467f672a38ae2872eff6caf080e21b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 18 Jan 2024 10:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E5=BA=A6-=E5=A2=9E=E5=8A=A0y?= =?UTF-8?q?ear=E7=9A=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Echart/Calendar.jsx | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx index 8aafa0c32..5b989721e 100644 --- a/src/forge/users/Echart/Calendar.jsx +++ b/src/forge/users/Echart/Calendar.jsx @@ -10,16 +10,18 @@ function Calendar({ userLogin , time , chooseTime }) { useEffect(()=>{ if(time){ let e,b = ""; - if(parseInt(time,0) === parseInt(moment().get('year'),0)){ - let y = moment().get('year'); - let m = moment().get('month'); - let d = moment().get('date'); - e = `${y}-${m+1}-${d}`; - b = `${y-1}-${m+1}-${d}`; - }else{ - e = `${time}-12-31`; - b = `${time}-01-01`; - } + // if(parseInt(time,0) === parseInt(moment().get('year'),0)){ + // let y = moment().get('year'); + // let m = moment().get('month'); + // let d = moment().get('date'); + // e = `${y}-${m+1}-${d}`; + // b = `${y-1}-${m+1}-${d}`; + // }else{ + // e = `${time}-12-31`; + // b = `${time}-01-01`; + // } + e = `${time}-12-31`; + b = `${time}-01-01`; setEndT(e); setBaginT(b); } @@ -33,7 +35,9 @@ function Calendar({ userLogin , time , chooseTime }) { function getData() { const url = `/users/${userLogin}/headmaps.json`; - Axios.get(url).then(result=>{ + Axios.get(url,{ + params:{year:time} + }).then(result=>{ if(result && result.data){ let m = []; let flag = true;