Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

稳态电能质量分析时间修改

Browse Source
This commit is contained in:
stt
2025-12-04 19:11:21 +08:00
parent 1b23355134
commit d2357d4ad2
4 changed files with 62 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/utils/formatTime.ts
View File

@@ -352,8 +352,9 @@ export function getTimeOfTheMonth(key: any): [string, string] {
const dayOfWeek = now.getDay() // 0是周日
const diff = now.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1) // 调整为周一
const weekStart = new Date(year, month, diff)
console.log("🚀 ~ getTimeOfTheMonth ~ weekStart:", weekStart)
return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
const weekEnd = new Date(weekStart)
weekEnd.setDate(weekEnd.getDate() + 6)
return [formatDate(weekStart, 'YYYY-MM-DD'), formatDate(weekEnd, 'YYYY-MM-DD')]
case '5': // 日
return [formatDate(now, 'YYYY-MM-DD'), formatDate(now, 'YYYY-MM-DD')]
@@ -366,33 +367,19 @@ export function getTimeOfTheMonth(key: any): [string, string] {
/**
* 获取当月时间
* @param interval 组件外部时间 1 年 2 季 3 月 4 周 5 日
* @param timeList 组件勾选时间 []
* @param timeList 驾驶舱里面组件勾选时间 []
* @param externalTime //外部传入时间
* @param fullscreen // 全屏是否全屏
*/
export function getTime(interval: number | 3, timeList: any , externalTime: any, ) {
console.log("🚀 ~ getTime ~ timeList:", timeList)
export function getTime(interval: number | 3, timeList: any, externalTime: any) {
console.log('🚀 ~ getTime ~ timeList:', timeList)
// 1、先匹配时间
// 检查 interval 是否在 timeList 中
if (timeList && timeList.includes(interval.toString())) {
return [externalTime[0], externalTime[1], interval]
// 匹配上了，返回外部传入时间 externalTime
// if (externalTime && externalTime.length >= 2) {
// return [externalTime[0], externalTime[1]]
// } else {
// // 如果 externalTime 无效，回退到默认逻辑
// return getTimeOfTheMonth(interval.toString())
// }
} else {
return [...getTimeOfTheMonth(timeList[0]), timeList[0], ]
// 没有匹配上，返回 timeList 中最后一项的时间范围
// if (timeList && timeList.length > 0) {
// const lastItem = timeList[timeList.length - 1]
// return getTimeOfTheMonth(lastItem)
// } else {
// // 如果 timeList 为空，使用 interval 参数
// return getTimeOfTheMonth(interval.toString())
// }
if (timeList && timeList.length > 0) {
return [...getTimeOfTheMonth(timeList[0]), timeList[0]]
}
}
}