From 12b809879c1748116cc51629619c0a01418fd1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Tue, 14 Jan 2025 09:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/backend/historyData/index.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue index 3d77eabf..9dd78781 100644 --- a/ui/dasadmin/src/views/backend/historyData/index.vue +++ b/ui/dasadmin/src/views/backend/historyData/index.vue @@ -184,6 +184,7 @@ import { getModelAttributeListReq, getRealValueRangeReq } from '/@/api/backend/d import { getTemplateListReq, addTemplateListReq, delTemplateListReq } from '/@/api/backend/historyData/request' import { windowReq } from '/@/api/backend/statAnalysis/request' import { selectData } from '/@/views/backend/historyData/type' +import { getCutDecimalsValue } from '/@/views/backend/equipment/airBlower/utils' const shortcuts = [ { @@ -399,10 +400,11 @@ const getRealValueRange = () => { interpolationAttr.forEach((attr) => { device[attr].times.forEach((t: number, index: number) => { const attrNameKey = attr + '--interpolation' + const val = getCutDecimalsValue(device[attr].values[index], 2) tableDataList.push({ name: deviceNameData[deviceId], time: dayjs(t).format('YYYY-MM-DD HH:mm:ss'), - [attrNameKey]: device[attr].values[index], + [attrNameKey]: val, }) }) }) @@ -414,10 +416,11 @@ const getRealValueRange = () => { averageAttr.forEach((attr) => { device[attr].times.forEach((t: number, index: number) => { const attrNameKey = attr + '--average' + const val = getCutDecimalsValue(device[attr].values[index], 2) const tableDataIndex = tableDataList.findIndex( (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss') ) - tableDataList[tableDataIndex][attrNameKey] = device[attr].values[index] + tableDataList[tableDataIndex][attrNameKey] = val }) }) }) @@ -428,10 +431,11 @@ const getRealValueRange = () => { maxAttr.forEach((attr) => { device[attr].times.forEach((t: number, index: number) => { const attrNameKey = attr + '--max' + const val = getCutDecimalsValue(device[attr].values[index], 2) const tableDataIndex = tableDataList.findIndex( (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss') ) - tableDataList[tableDataIndex][attrNameKey] = device[attr].values[index] + tableDataList[tableDataIndex][attrNameKey] = val }) }) }) @@ -442,10 +446,11 @@ const getRealValueRange = () => { minAttr.forEach((attr) => { device[attr].times.forEach((t: number, index: number) => { const attrNameKey = attr + '--min' + const val = getCutDecimalsValue(device[attr].values[index], 2) const tableDataIndex = tableDataList.findIndex( (data: any) => data.name == deviceNameData[deviceId] && data.time == dayjs(t).format('YYYY-MM-DD HH:mm:ss') ) - tableDataList[tableDataIndex][attrNameKey] = device[attr].values[index] + tableDataList[tableDataIndex][attrNameKey] = val }) }) }) @@ -458,7 +463,6 @@ const getRealValueRange = () => { }) } -const exportData = () => {} const addTemplate = () => { ElMessageBox.prompt('请输入模板名称', '添加模板', { confirmButtonText: '确定',