diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts index e313378e..5ba2ae53 100644 --- a/src/api/iot/device/index.ts +++ b/src/api/iot/device/index.ts @@ -184,6 +184,11 @@ export const DeviceApi = { return await request.delete({ url: `/iot/device-contact-model/delete?ids=` + ids }) }, + // 导出设备属性 Excel + exportDeviceContactModel: async (params) => { + return await request.download({ url: `/iot/device-contact-model/export-excel`, params }) + }, + // 获得设备属性 getDeviceAttribute: async (id: number) => { return await request.get({ url: `/iot/device-contact-model/get?id=` + id }) diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue index 382091f7..0dd0f354 100644 --- a/src/views/iot/device/components/DeviceAttributeList.vue +++ b/src/views/iot/device/components/DeviceAttributeList.vue @@ -33,7 +33,7 @@ :placeholder="t('DataCollection.Device.placeholderAttributeType')" class="!w-240px" > - + @@ -184,7 +184,6 @@ import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import { DeviceApi } from '@/api/iot/device' -import { DeviceModelAttributeApi } from '@/api/iot/devicemodelattribute' import DeviceAttributeForm from './DeviceAttributeForm.vue' import { DeviceAttributeTypeApi, DeviceAttributeTypeVO } from '@/api/iot/deviceattributetype' @@ -332,7 +331,7 @@ const handleExport = async () => { if (selectedIds.value.length) { params.ids = selectedIds.value.join(',') } - const data = await DeviceModelAttributeApi.exportDeviceModelAttribute(params) + const data = await DeviceApi.exportDeviceContactModel(params) download.excel(data, t('DataCollection.Device.attributeExportFilename')) } catch { } finally { @@ -342,8 +341,8 @@ const handleExport = async () => { onMounted(async () => { try { - const data = await DeviceAttributeTypeApi.getDeviceAttributeTypePage({ pageNo: 1, pageSize: 10 }) - typeList.value = data?.list ?? [] + const data = await DeviceAttributeTypeApi.getDeviceAttributeTypeList() + typeList.value = data ?? [] } catch { typeList.value = [] }