diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue index 76ce27b0..854b40c1 100644 --- a/src/views/iot/device/index.vue +++ b/src/views/iot/device/index.vue @@ -271,16 +271,16 @@ const handleCopy = async (id: number) => { /** 导出按钮操作 */ const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { // 导出的二次确认 await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await DeviceApi.exportDevice({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await DeviceApi.exportDevice(params) download.excel(data, '物联设备.xls') } catch { } finally { diff --git a/src/views/iot/devicemodel/index.vue b/src/views/iot/devicemodel/index.vue index d7de7ec8..d0b892a3 100644 --- a/src/views/iot/devicemodel/index.vue +++ b/src/views/iot/devicemodel/index.vue @@ -208,16 +208,16 @@ const handleBatchDelete = async () => { /** 导出按钮操作 */ const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { // 导出的二次确认 await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await DeviceModelApi.exportDeviceModel({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await DeviceModelApi.exportDeviceModel(params) download.excel(data, '采集设备模型.xls') } catch { } finally { diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index f05a40a2..499853ef 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -913,16 +913,16 @@ const handleBatchDelete = async () => { /** 导出按钮操作 */ const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { // 导出的二次确认 await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await DeviceLedgerApi.exportDeviceLedger({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await DeviceLedgerApi.exportDeviceLedger(params) download.excel(data, '设备台账.xls') } catch { } finally { diff --git a/src/views/mes/dvsubject/index.vue b/src/views/mes/dvsubject/index.vue index 060d4ffe..15d67458 100644 --- a/src/views/mes/dvsubject/index.vue +++ b/src/views/mes/dvsubject/index.vue @@ -226,16 +226,16 @@ const handleBatchDelete = async () => { /** 导出按钮操作 */ const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { // 导出的二次确认 await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await DvSubjectApi.exportDvSubject({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await DvSubjectApi.exportDvSubject(params) download.excel(data, '维保项目.xls') } catch { } finally { diff --git a/src/views/mes/planMaintenance/index.vue b/src/views/mes/planMaintenance/index.vue index 60ea4744..4b310931 100644 --- a/src/views/mes/planMaintenance/index.vue +++ b/src/views/mes/planMaintenance/index.vue @@ -304,14 +304,14 @@ const handleBatchDelete = async () => { } const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { await message.exportConfirm() exportLoading.value = true - const data = await PlanMaintenanceApi.exportPlanMaintenance({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await PlanMaintenanceApi.exportPlanMaintenance(params) download.excel(data, '方案维护.xls') } catch { } finally { diff --git a/src/views/mold/inspectionItems/index.vue b/src/views/mold/inspectionItems/index.vue index 7c987a06..1aac0d42 100644 --- a/src/views/mold/inspectionItems/index.vue +++ b/src/views/mold/inspectionItems/index.vue @@ -226,16 +226,14 @@ const handleBatchDelete = async () => { /** 导出按钮操作 */ const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { - // 导出的二次确认 await message.exportConfirm() - // 发起导出 exportLoading.value = true - const data = await DvSubjectApi.exportDvSubject({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined, + } + const data = await DvSubjectApi.exportDvSubject(params) download.excel(data, '维保项目.xls') } catch { } finally { diff --git a/src/views/mold/inspectionPlan/index.vue b/src/views/mold/inspectionPlan/index.vue index c4ee6be0..7b82b614 100644 --- a/src/views/mold/inspectionPlan/index.vue +++ b/src/views/mold/inspectionPlan/index.vue @@ -304,14 +304,14 @@ const handleBatchDelete = async () => { } const handleExport = async () => { - if (!selectedIds.value.length) { - message.error('请选择需要导出的数据') - return - } try { await message.exportConfirm() exportLoading.value = true - const data = await PlanMaintenanceApi.exportPlanMaintenance({ ids: selectedIds.value.join(',') }) + const params: any = { + ...queryParams, + ids: selectedIds.value.length ? selectedIds.value.join(',') : undefined + } + const data = await PlanMaintenanceApi.exportPlanMaintenance(params) download.excel(data, '方案维护.xls') } catch { } finally { @@ -325,4 +325,3 @@ onMounted(async () => { getList() }) -