Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

Merge branch 'gitlink_server' of https://gitlink.org.cn/Gitlink/forgeplus-react into gitlink_server

This commit is contained in:
谢思 2024-01-30 08:34:12 +08:00
parent 9954fd82e5 1d96b58f52
commit bee3b793e4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/forge/users/Echart/Calendar.jsx
View File

@ -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;