Commit 2bc4c607e0166ff225aea181ec331b4725883c54
Merge branch 'perf/datepicker' into 'main_dev'
perf: 优化日期区间起始与结束范围 See merge request yunteng/thingskit-view!230
Showing
1 changed file
with
3 additions
and
2 deletions
... | ... | @@ -76,8 +76,9 @@ export const useChartDataFetch = ( |
76 | 76 | const {entityType, startTs, endTs} = Params |
77 | 77 | const days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000)) |
78 | 78 | if (entityType === 'DEVICE') { |
79 | - startTsValue = Date.now() - days <= 32 ? 2592000000 : days <= 8 ? 604800000 : startTs | |
80 | - endTsValue = Date.now() | |
79 | + startTsValue = Date.now() - (days <= 32 ? 2592000000 : days <= 8 ? 604800000 : days <= 2 ? 86400000 : startTs as unknown as number) | |
80 | + startTsValue = dayjs(startTsValue).startOf('day').valueOf() | |
81 | + endTsValue = dayjs().endOf('day').valueOf() | |
81 | 82 | ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number |
82 | 83 | ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue |
83 | 84 | } | ... | ... |