From 1e60bd6de5a16a5d95b5be04957c5e2dbb98bda3 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 30 Dec 2025 17:09:04 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AD=90=E5=88=97=E8=A1=A8-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/index.ts                   |   5 +
 .../device/components/DeviceAttributeList.vue | 119 ++++++---------
 .../components/ModelAttributeList.vue         | 135 +++++-------------
 src/views/iot/devicemodel/index.vue           |  21 ++-
 4 files changed, 104 insertions(+), 176 deletions(-)

diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index 5ab9bdb7..3dbc001f 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -89,5 +89,10 @@ export const DeviceApi = {
   // 获得设备属性
   getDeviceAttribute: async (id: number) => {
     return await request.get({ url: `/iot/device-contact-model/get?id=` + id })
+  },
+
+  // 导出设备属性 Excel
+  exportDeviceAttribute: async (params) => {
+    return await request.download({ url: `/iot/device-contact-model/export-excel`, params })
   }
 }
diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue
index 196ffaf8..310d7814 100644
--- a/src/views/iot/device/components/DeviceAttributeList.vue
+++ b/src/views/iot/device/components/DeviceAttributeList.vue
@@ -1,52 +1,33 @@
 <template>
   <ContentWrap>
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="100px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
       <el-form-item label="点位编码" prop="attributeCode">
-        <el-input
-          v-model="queryParams.attributeCode"
-          placeholder="请输入点位编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.attributeCode" placeholder="请输入点位编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="点位名称" prop="attributeName">
-        <el-input
-          v-model="queryParams.attributeName"
-          placeholder="请输入点位名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.attributeName" placeholder="请输入点位名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="点位类型" prop="attributeType">
-        <el-select
-          v-model="queryParams.attributeType"
-          clearable
-          filterable
-          placeholder="请选择"
-          class="!w-240px"
-        >
+        <el-select v-model="queryParams.attributeType" clearable filterable placeholder="请选择" class="!w-240px">
           <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['iot:device:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['iot:device:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['iot:device:export']">
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
         <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['iot:device:delete']">
           <Icon icon="ep:delete" class="mr-5px" /> 批量删除
         </el-button>
@@ -55,15 +36,8 @@
   </ContentWrap>
 
   <ContentWrap>
-    <el-table
-      ref="tableRef"
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" reserve-selection />
       <el-table-column label="点位编码" align="left" prop="attributeCode" width="150px" />
       <el-table-column label="点位名称" align="left" prop="attributeName" width="150px" />
@@ -85,13 +59,8 @@
       </el-table-column>
       <el-table-column label="单位" align="center" prop="dataUnit" width="80px" />
       <el-table-column label="倍率" align="center" prop="ratio" width="80px" />
-      <el-table-column
-        label="最新采集时间"
-        align="center"
-        prop="latestCollectTime"
-        :formatter="dateFormatter"
-        width="170px"
-      />
+      <el-table-column label="最新采集时间" align="center" prop="latestCollectTime" :formatter="dateFormatter"
+        width="170px" />
       <el-table-column label="顺序" align="center" prop="sort" width="80px">
         <template #default="scope">
           {{ scope.row.sort ?? '-' }}
@@ -100,31 +69,17 @@
       <el-table-column label="备注" align="center" prop="remark" min-width="160px" />
       <el-table-column label="操作" align="center" width="150px" fixed="right">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['iot:device:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['iot:device:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['iot:device:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['iot:device:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <DeviceAttributeForm ref="formRef" @success="getList" />
@@ -132,6 +87,7 @@
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
 import { DeviceApi } from '@/api/iot/device'
 import DeviceAttributeForm from './DeviceAttributeForm.vue'
 import { DeviceAttributeTypeApi, DeviceAttributeTypeVO } from '@/api/iot/deviceattributetype'
@@ -161,6 +117,8 @@ const queryParams = reactive({
 
 const queryFormRef = ref()
 
+const exportLoading = ref(false)
+
 const selectedIds = ref<number[]>([])
 const handleSelectionChange = (rows: any[]) => {
   selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []
@@ -186,7 +144,7 @@ watch(
     queryParams.deviceId = val
     handleQuery()
   },
-    { immediate: true, deep: true }
+  { immediate: true, deep: true }
 )
 
 /** 查询列表 */
@@ -248,7 +206,7 @@ const handleDelete = async (ids: number | number[]) => {
     tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 const handleBatchDelete = async () => {
@@ -259,6 +217,23 @@ const handleBatchDelete = async () => {
   await handleDelete(selectedIds.value)
 }
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要导出的数据')
+    return
+  }
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await DeviceApi.exportDeviceAttribute({ ids: selectedIds.value.join(',') })
+    download.excel(data, '采集设备-点位管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 onMounted(async () => {
   try {
     const data = await DeviceAttributeTypeApi.getDeviceAttributeTypePage({ pageNo: 1, pageSize: 10 })
diff --git a/src/views/iot/devicemodel/components/ModelAttributeList.vue b/src/views/iot/devicemodel/components/ModelAttributeList.vue
index fbf560c2..defc8605 100644
--- a/src/views/iot/devicemodel/components/ModelAttributeList.vue
+++ b/src/views/iot/devicemodel/components/ModelAttributeList.vue
@@ -1,47 +1,20 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="100px"
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
       <el-form-item label="点位编码" prop="attributeCode">
-        <el-input
-          v-model="queryParams.attributeCode"
-          placeholder="请输入点位编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.attributeCode" placeholder="请输入点位编码" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="点位名称" prop="attributeName">
-        <el-input
-          v-model="queryParams.attributeName"
-          placeholder="请输入点位名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.attributeName" placeholder="请输入点位名称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
       <el-form-item label="点位类型" prop="attributeType">
-            <el-select
-              v-model="queryParams.attributeType"
-              clearable
-              filterable
-              placeholder="请选择"
-              class="!w-240px"
-            >
-              <el-option
-                v-for="item in typeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
+        <el-select v-model="queryParams.attributeType" clearable filterable placeholder="请选择" class="!w-240px">
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <!-- <el-form-item label="寄存器地址" prop="address">
         <el-input
           v-model="queryParams.address"
@@ -63,48 +36,31 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['iot:device-model:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
-        <el-button
-          type="danger"
-          plain
-          @click="handleBatchDelete"
-          v-hasPermi="['iot:device-model:delete']"
-        >
-          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['iot:device-model:export']"
-        >
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['iot:device-model:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['iot:device-model:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
+        <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['iot:device-model:delete']">
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
+
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table
-      ref="tableRef"
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      row-key="id"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" reserve-selection />
       <!-- <el-table-column label="ID" align="center" prop="id" /> -->
       <el-table-column label="点位编码" align="center" prop="attributeCode" />
@@ -116,41 +72,22 @@
       <el-table-column label="倍率" align="center" prop="ratio" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="采集设备模型id" align="center" prop="deviceModelId" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center" width="150px" fixed="right">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['iot:device-model:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['iot:device-model:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['iot:device-model:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['iot:device-model:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -211,7 +148,7 @@ watch(
     queryParams.id = val
     handleQuery()
   },
-    { immediate: true, deep: true }
+  { immediate: true, deep: true }
 )
 
 /** 查询列表 */
@@ -251,7 +188,7 @@ const openForm = (type: string, id?: number) => {
     message.error('请选择一个采集设备模型')
     return
   }
-  formRef.value.open(type, id,props.id)
+  formRef.value.open(type, id, props.id)
 }
 
 
@@ -271,7 +208,7 @@ const handleDelete = async (ids: number | number[]) => {
     tableRef.value?.clearSelection?.()
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 const handleBatchDelete = async () => {
@@ -284,12 +221,16 @@ const handleBatchDelete = async () => {
 
 /** 导出按钮操作 */
 const handleExport = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要导出的数据')
+    return
+  }
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await DeviceModelAttributeApi.exportDeviceModelAttribute(queryParams)
+    const data = await DeviceModelAttributeApi.exportDeviceModelAttribute({ ids: selectedIds.value.join(',') })
     download.excel(data, '采集设备模型-点位管理.xls')
   } catch {
   } finally {
diff --git a/src/views/iot/devicemodel/index.vue b/src/views/iot/devicemodel/index.vue
index 79f6ec17..401a659b 100644
--- a/src/views/iot/devicemodel/index.vue
+++ b/src/views/iot/devicemodel/index.vue
@@ -3,17 +3,20 @@
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="模型编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入模型编码" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.code" placeholder="请输入模型编码" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="模型名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入模型名称" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.name" placeholder="请输入模型名称" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
 
       <el-form-item label="通讯协议" prop="protocol">
         <el-select v-model="queryParams.protocol" placeholder="请选择通讯协议" clearable class="!w-240px">
-          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.IOT_PROTOCOL)" :key="dict.value" :label="dict.label"
+          <el-option
+v-for="dict in getStrDictOptions(DICT_TYPE.IOT_PROTOCOL)" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -51,7 +54,8 @@
         <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['iot:device-model:delete']">
           <Icon icon="ep:delete" class="mr-5px" /> 批量删除
         </el-button>
-        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+        <el-button
+type="success" plain @click="handleExport" :loading="exportLoading"
           v-hasPermi="['iot:device-model:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -61,7 +65,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+    <el-table
+ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
       highlight-current-row row-key="id" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" reserve-selection />
       <el-table-column label="模型编码" align="center" prop="code" />
@@ -79,7 +84,8 @@
           <el-button link type="primary" @click="handleCopy(scope.row.id)" v-hasPermi="['iot:device-model:create']">
             复制
           </el-button>
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+          <el-button
+link type="primary" @click="openForm('update', scope.row.id)"
             v-hasPermi="['iot:device-model:update']">
             编辑
           </el-button>
@@ -90,7 +96,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+    <Pagination
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>