Commit 6f278cea0af99183696b827000c22aba3e0ba782
1 parent
98ceb262
perf(src/hooks/external): 优化日期控件,选择其他区间,传递参数错误
Showing
1 changed file
with
14 additions
and
6 deletions
| @@ -75,13 +75,21 @@ export const useChartDataFetch = ( | @@ -75,13 +75,21 @@ export const useChartDataFetch = ( | ||
| 75 | const {Params} = requestParams | 75 | const {Params} = requestParams | 
| 76 | const {entityType, startTs, endTs} = Params | 76 | const {entityType, startTs, endTs} = Params | 
| 77 | let days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000)) | 77 | let days = Math.ceil(((endTs as unknown as number) - (startTs as unknown as number)) / (1 * 60 * 60 * 24 * 1000)) | 
| 78 | + const ShortcutsDays = [1, 7, 30] | ||
| 78 | if (entityType === 'DEVICE') { | 79 | if (entityType === 'DEVICE') { | 
| 79 | - days = days <= 2 ? 1 : days<= 8 ? 7 : 30 | ||
| 80 | - startTsValue = dayjs().subtract(days - 1, 'day').startOf('day').valueOf() | ||
| 81 | - startTsValue = dayjs(startTsValue).startOf('day').valueOf() | ||
| 82 | - endTsValue = dayjs().endOf('day').valueOf() | ||
| 83 | - ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number | ||
| 84 | - ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue | 80 | + //等于这三个,说明是从快捷选项里面选的 | 
| 81 | + if(ShortcutsDays.includes(days)) { | ||
| 82 | + days = days <= 2 ? 1 : days<= 8 ? 7 : 30 | ||
| 83 | + startTsValue = dayjs().subtract(days - 1, 'day').startOf('day').valueOf() | ||
| 84 | + startTsValue = dayjs(startTsValue).startOf('day').valueOf() | ||
| 85 | + endTsValue = dayjs().endOf('day').valueOf() | ||
| 86 | + ;(toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTsValue as number | ||
| 87 | + ;(toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTsValue | ||
| 88 | + } else { | ||
| 89 | + //否则,选择的是什么日期区间就是什么 | ||
| 90 | + (toRaw(targetComponent.request).requestParams.Params.startTs as unknown as number) = startTs as unknown as number | ||
| 91 | + (toRaw(targetComponent.request).requestParams.Params.endTs as unknown as number) = endTs as unknown as number | ||
| 92 | + } | ||
| 85 | } | 93 | } | 
| 86 | const res = await customRequest(toRaw(targetComponent.request)) | 94 | const res = await customRequest(toRaw(targetComponent.request)) | 
| 87 | if (res) { | 95 | if (res) { |