diff --git a/src/views/iot/runReport/index.vue b/src/views/iot/runReport/index.vue index 51a70324..15d77d08 100644 --- a/src/views/iot/runReport/index.vue +++ b/src/views/iot/runReport/index.vue @@ -150,13 +150,24 @@ const queryParams = reactive({ }) const queryFormRef = ref() -const getList = async () => { +const buildQueryParams = (): DeviceOperationRecordPageParams => { const range = (queryParams.timeRange || []) as string[] - queryParams.startTime = range[0] - queryParams.endTime = range[1] + const startTime = range[0] + const endTime = range[1] + return { + pageNo: queryParams.pageNo, + pageSize: queryParams.pageSize, + deviceCode: queryParams.deviceCode, + deviceName: queryParams.deviceName, + startTime, + endTime, + ids: queryParams.ids + } +} +const getList = async () => { loading.value = true try { - const params = queryParams as unknown as DeviceOperationRecordPageParams + const params = buildQueryParams() const data = await DeviceOperationRecordApi.getDeviceOperationRecordPage(params) list.value = data.list total.value = data.total @@ -179,10 +190,7 @@ const handleExport = async () => { try { await useMessage().exportConfirm() exportLoading.value = true - const range = (queryParams.timeRange || []) as string[] - queryParams.startTime = range[0] - queryParams.endTime = range[1] - const params = queryParams as unknown as DeviceOperationRecordPageParams + const params = buildQueryParams() const data = await DeviceOperationRecordApi.exportDeviceOperationReport(params) download.excel(data, t('DataCollection.RunReport.exportFilename')) } catch {