From 0546be6cf30609c37b7f561461b879fb0eba1585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Mon, 20 Jan 2025 10:45:24 +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=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/historyData/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue index 7f816d5e..51ea2832 100644 --- a/ui/dasadmin/src/views/backend/historyData/index.vue +++ b/ui/dasadmin/src/views/backend/historyData/index.vue @@ -300,6 +300,7 @@ const changeTemplate = () => { selectRowList.value = selectList } tableData.value = [] + pageSetting.total = 0 } const delTemplate = (id: string) => { @@ -324,7 +325,7 @@ const openMeasure = () => { selectWindBlower.value = JSON.parse(JSON.stringify(submitParams.windBlowerList)) multipleSelection.value = JSON.parse(JSON.stringify(submitParams.column)) const selectList: any = [] - multipleSelection.value.forEach((item: { label: string; prop: string; id: string }) => { + multipleSelection.value.forEach((item: { label: string; prop: string; id: string; highSpeed: 0 | 1 }) => { const realProp = item.prop.split('--') const exist = selectList.find((v: any) => v.id === item.id) if (exist) { @@ -334,6 +335,7 @@ const openMeasure = () => { id: item.id, attributeCode: realProp[0], attributeName: item.label, + highSpeed: item.highSpeed, [realProp[1]]: true, }) } @@ -1011,6 +1013,7 @@ const submitPointDialog = () => { submitParams.column = JSON.parse(JSON.stringify(multipleSelection.value)) tableColumn.value = [...oririnTableColumn, ...submitParams.column] tableData.value = [] + pageSetting.total = 0 pointDialogVisible.value = false } const cancelPointDialog = () => { @@ -1086,6 +1089,7 @@ const exportExcel = () => { const checkOnlyHighSpeed = (curData: selectData) => { if (searchData.interval === 'NONE' && multipleSelection.value.length) { const firstData = multipleSelection.value[0] + console.log('highSpeed', curData.highSpeed, firstData.highSpeed, firstData) if (curData.highSpeed !== firstData.highSpeed) { curData.interpolation = false