zS/go-viee-fetch-Demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复本周从七天开始的bug改为从周一开始

Browse Source
This commit is contained in:
Free-sss 2025-09-02 19:55:30 +08:00
parent 600b27aa5c
commit ba95104bea
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
View File

@ -143,9 +143,11 @@ function generateTimeRange(period: string): { startTime: string; endTime: string
startTime.setHours(0, 0, 0, 0); startTime.setHours(0, 0, 0, 0);
break; break;
case 'week': case 'week':
// 本周：7 天前的 00:00:00 // 本周：从周一到今天
startTime = new Date(now); startTime = new Date(now);
startTime.setDate(startTime.getDate() - 7); const dayOfWeek = now.getDay(); // 0(周日) to 6(周六)
const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek; // 周日需要调整为上周一
startTime.setDate(startTime.getDate() + diffToMonday);
startTime.setHours(0, 0, 0, 0); startTime.setHours(0, 0, 0, 0);
break; break;
case 'month': case 'month':

6
src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue
View File

@ -199,8 +199,10 @@ function generateTimeRange(period: string): { startTime: string; endTime: string
endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); // 当天 23:59:59.999 endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); // 当天 23:59:59.999
break; break;
case 'week': case 'week':
// 计算过去7天（包括今天）的起始时间 // 计算本周一到今天的起始和结束时间
startTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6, 0, 0, 0, 0); const dayOfWeek = now.getDay(); // 0(周日) to 6(周六)
const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek; // 周日需要调整为上周一
startTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate() + diffToMonday, 0, 0, 0, 0);
// 结束时间为今天 23:59:59.999 // 结束时间为今天 23:59:59.999
endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); endTimeDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
break; break;