diff --git a/ui/dasadmin/src/api/backend/statAnalysis/request.ts b/ui/dasadmin/src/api/backend/statAnalysis/request.ts index 42abf4c3..73691363 100644 --- a/ui/dasadmin/src/api/backend/statAnalysis/request.ts +++ b/ui/dasadmin/src/api/backend/statAnalysis/request.ts @@ -12,6 +12,7 @@ export const historyReq = (data: any) => { url: '/api/data/history', method: 'post', data: data, + timeout: 60 * 1000, }) } diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue index b78656fe..bbcb9760 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue @@ -135,6 +135,9 @@ const switchTime = (index: number) => { } times.splice(index, 1) customName.splice(index, 1) + customName.forEach((item: any, index: number, arr: any) => { + arr[index] = statAnalysisSelect.attributes + String(index + 1) + }) } const timechange = (value: any) => { if (times.length) { @@ -148,11 +151,18 @@ const timechange = (value: any) => { return } else { times.push(value) + customName.push(statAnalysisSelect.attributes + times.length) + customName.forEach((item: any, index: number, arr: any) => { + arr[index] = statAnalysisSelect.attributes + String(index + 1) + }) } } else { times.push(value) customName.push(statAnalysisSelect.attributes + times.length) + customName.forEach((item: any, index: number, arr: any) => { + arr[index] = statAnalysisSelect.attributes + String(index + 1) + }) } } @@ -160,6 +170,7 @@ const showTime = ref(false) const clearList = () => { times.length = 0 time.value = [] + customName.length = 0 } const iotModelId = ref('')