From 30e2b7671c85fe26861f7c06616a2e5b9c898351 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 9 Mar 2026 10:34:26 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87-=E8=AE=BE=E5=A4=87=E5=B1=9E=E6=80=A7-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9/=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E7=B1=BB=E5=9E=8B=E4=BC=A0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/index.ts                             | 5 +++++
 src/views/iot/device/components/DeviceAttributeList.vue | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

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"
         >
-          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.name" />
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -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 = []
   }