From 3c97b9e33918b8c2805dc9ad44c3234a84980933 Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Tue, 23 May 2023 10:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E8=80=97=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/analyse/nhtj/index.vue | 33 ++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/psdc-ui/src/views/analyse/nhtj/index.vue b/psdc-ui/src/views/analyse/nhtj/index.vue index 22fc4a8..82613fe 100644 --- a/psdc-ui/src/views/analyse/nhtj/index.vue +++ b/psdc-ui/src/views/analyse/nhtj/index.vue @@ -114,9 +114,16 @@ const startDate = ref() const endDate = ref() const data = reactive({ filterForm: { - dev: '', + dev: '0', } }); +//拿到耗能设备的devid +const checkDevId = ref(); +function handleDevChange(devid){ + console.log('点击的devid:',devid) + checkDevId.value = devid +} + //监听日期选择 const wacthSelectDate = watch(()=> dateRange.value,(val) =>{ console.log(val[0]) @@ -130,10 +137,15 @@ function handleQuery(){ } //重置按钮 function resetQuery(){ - dateRange.value = [] + dateRange.value = []; + currentPage.value = 1 + pageSize.value = 10 + data.filterForm.dev = '0' + checkDevId.value = null getTable({ + "deviceId":null, "timeType":activeIndex.value, - "startTime":'2023-01-01', + "startTime":null, "endTime":YYYYMMDD.value, "pageNum": 1, "pageSize": 10 @@ -181,16 +193,11 @@ const small = ref(false) const background = ref(false) const disabled = ref(false) const total = ref() -//拿到下拉条的devid -let checkDevId; -function handleDevChange(devid){ - console.log(devid) - checkDevId = devid -} + //获取表格数据 function getTableFun(){ getTable({ - "deviceId":checkDevId, + "deviceId":checkDevId.value, "timeType":activeIndex.value, "startTime":startDate.value, "endTime":endDate.value, @@ -422,9 +429,9 @@ function handleMonth() { /** 页面销毁时*/ -onBeforeUnmount(() => { - myChart.dispose(); // 销毁实例,防止内存泄漏 -}); +// onBeforeUnmount(() => { +// myChart.dispose(); // 销毁实例,防止内存泄漏 +// });