From 09a71eefd35938320a187c600be7bd2bffe76f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=81=E4=B8=87=E6=88=90?= Date: Mon, 2 Dec 2024 10:38:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/report/SingleReport.vue | 74 ++++++++++--------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/ui/dasadmin/src/views/backend/report/SingleReport.vue b/ui/dasadmin/src/views/backend/report/SingleReport.vue index b086fd05..982d1f92 100644 --- a/ui/dasadmin/src/views/backend/report/SingleReport.vue +++ b/ui/dasadmin/src/views/backend/report/SingleReport.vue @@ -442,50 +442,54 @@ const queryHistoryData = () => { startTime: new Date(timeRange.value[0]).getTime(), endTime: new Date(timeRange.value[1]).getTime(), } as any - historyReq(requestData).then((res) => { - if (res.code == 200) { - const result = res.data - if (Object.keys(result)?.length) { - const realResult = result[windBlowerValue.value] - let tableData = [] as any - attributeCodes.forEach((item: any) => { - if (Object.keys(realResult).includes(item)) { - tableData.push({ - name: item, - times: realResult[item].times, - value: realResult[item].values.map((val: any) => (val === 0 ? 0 : val.toFixed(2))), + historyReq(requestData) + .then((res) => { + if (res.code == 200) { + const result = res.data + if (Object.keys(result)?.length) { + const realResult = result[windBlowerValue.value] + let tableData = [] as any + attributeCodes.forEach((item: any) => { + if (Object.keys(realResult).includes(item)) { + tableData.push({ + name: item, + times: realResult[item].times, + value: realResult[item].values.map((val: any) => (val === 0 ? 0 : val?.toFixed(2))), + }) + } + }) + const processedData = new Map() + idCounter.value = 0 + if (tableData.length) { + tableData.forEach(({ name, times, value }: any) => { + times.forEach((time: number, index: number) => { + if (!processedData.has(time)) { + processedData.set(time, { id: idCounter.value++, time: timestampToTime(time) }) + } + const values = value[index] + processedData.get(time)[name] = enumStore.keys.includes(name) ? enumStore.data?.[name]?.[values] : values + }) }) } - }) - const processedData = new Map() - idCounter.value = 0 - if (tableData.length) { - tableData.forEach(({ name, times, value }: any) => { - times.forEach((time: number, index: number) => { - if (!processedData.has(time)) { - processedData.set(time, { id: idCounter.value++, time: timestampToTime(time) }) - } - const values = value[index] - processedData.get(time)[name] = enumStore.keys.includes(name) ? enumStore.data?.[name]?.[values] : values - }) - }) - } - reportTableData.value = Array.from(processedData.values()) - if (!reportTableData.value.length) { + reportTableData.value = Array.from(processedData.values()) + if (!reportTableData.value.length) { + ElMessage.warning('查询数据为空!') + reportTableData.value = [] + } + reportLoading.value = false + } else { ElMessage.warning('查询数据为空!') reportTableData.value = [] + reportLoading.value = false } - reportLoading.value = false } else { - ElMessage.warning('查询数据为空!') - reportTableData.value = [] reportLoading.value = false + ElMessage.warning('查询失败') } - } else { + }) + .finally(() => { reportLoading.value = false - ElMessage.warning('查询失败') - } - }) + }) } // 时间转换 From 0a3d16b192321e0fc78ea3ba7e669420d2448618 Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Mon, 2 Dec 2024 10:44:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/api/backend/statAnalysis/request.ts | 1 + .../src/views/backend/statAnalysis/trendAnalysis.vue | 11 +++++++++++ 2 files changed, 12 insertions(+) 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('')