From 13d157fa723028d1b1601b7ca550622433102a9b Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 17 Mar 2026 16:57:51 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2-=E7=82=B9=E4=BD=8D=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/index.ts                   | 10 ++-
 .../historyData/HistorySingleDeviceDialog.vue | 69 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index 5ba2ae53..3e85b97c 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import qs from 'qs'
 
 // 物联设备 VO
 export interface DeviceVO {
@@ -65,6 +66,7 @@ export interface HistoryRecordParams {
   deviceId: string | number
   collectionStartTime?: string
   collectionEndTime?: string
+  attributeCodes?: string[]
 }
 
 export interface DeviceContactModelVO {
@@ -143,7 +145,11 @@ export const DeviceApi = {
   },
 
   getHistoryRecord: async (params: HistoryRecordParams) => {
-    return await request.get({ url: `/iot/device/historyRecord`, params })
+    return await request.get({
+      url: `/iot/device/historyRecord`,
+      params,
+      paramsSerializer: (p) => qs.stringify(p, { allowDots: true, arrayFormat: 'repeat' })
+    })
   },
 
   devicePointList: async () => {
@@ -162,7 +168,7 @@ export const DeviceApi = {
     return await request.get({ url: `/iot/device/device-attribute/page`, params })
   },
   // 获得设备属性列表
-  getDeviceAttributeList: async (deviceId: number) => {
+  getDeviceAttributeList: async (deviceId: number | string) => {
     return await request.get({ url: `/iot/device/device-attribute/list?deviceId=` + deviceId })
   },
 
diff --git a/src/views/iot/historyData/HistorySingleDeviceDialog.vue b/src/views/iot/historyData/HistorySingleDeviceDialog.vue
index 95de4f2c..a53905ac 100644
--- a/src/views/iot/historyData/HistorySingleDeviceDialog.vue
+++ b/src/views/iot/historyData/HistorySingleDeviceDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="900" :scroll="true" max-height="80vh" align-center>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1100" :scroll="true" max-height="80vh" align-center>
     <div class="single-device-dialog">
       <el-form class="-mb-15px history-single-device-form" :inline="true" label-width="auto">
         <el-form-item :label="t('DataCollection.HistoryData.dialogCollectionTimeLabel')">
@@ -10,9 +10,30 @@
             :start-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeStartPlaceholder')"
             :end-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeEndPlaceholder')"
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-360px"
+            class="!w-280px"
           />
         </el-form-item>
+        <el-form-item :label="t('DataCollection.HistoryData.dialogPointFilterLabel')">
+          <el-select
+            v-model="attributeCodes"
+            class="!w-280px"
+            multiple
+            :max-collapse-tags="1"
+            collapse-tags
+            collapse-tags-tooltip
+            filterable
+            clearable
+            :loading="attributeLoading"
+            :placeholder="t('DataCollection.HistoryData.dialogPointFilterPlaceholder')"
+          >
+            <el-option
+              v-for="item in attributeOptions"
+              :key="item.attributeCode"
+              :label="item.label"
+              :value="item.attributeCode"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">{{ t('DataCollection.HistoryData.dialogSearchButtonText') }}</el-button>
           <el-button @click="resetQuery">{{ t('DataCollection.HistoryData.dialogResetButtonText') }}</el-button>
@@ -125,6 +146,14 @@ const loading = ref(false)
 const recordGroups = ref<RecordGroup[]>([])
 
 const collectionTimeRange = ref<string[]>([])
+const attributeCodes = ref<string[]>([])
+const attributeLoading = ref(false)
+
+type AttributeOption = {
+  attributeCode: string
+  label: string
+}
+const attributeOptions = ref<AttributeOption[]>([])
 
 const formatDateTime = (date: Date) => {
   const pad = (value: number) => String(value).padStart(2, '0')
@@ -204,6 +233,36 @@ const buildSectionsFromGroups = (groups: Record<string, any[]>): Section[] => {
   return result
 }
 
+const fetchDeviceAttributes = async () => {
+  if (props.deviceId === undefined || props.deviceId === null || props.deviceId === '') {
+    attributeOptions.value = []
+    return
+  }
+  attributeLoading.value = true
+  try {
+    const res: any = await DeviceApi.getDeviceAttributeList(props.deviceId)
+    const responseData = res?.data?.data ?? res?.data ?? res
+    const list: any[] = Array.isArray(responseData?.list)
+      ? responseData.list
+      : Array.isArray(responseData)
+        ? responseData
+        : []
+    attributeOptions.value = list
+      .map((item: any) => {
+        const code = String(item?.attributeCode ?? '').trim()
+        if (!code) return null
+        const name = String(item?.attributeName ?? '').trim()
+        return {
+          attributeCode: code,
+          label: name ? `${name}(${code})` : code
+        }
+      })
+      .filter(Boolean) as AttributeOption[]
+  } finally {
+    attributeLoading.value = false
+  }
+}
+
 const fetchHistory = async () => {
   if (props.deviceId === undefined || props.deviceId === null || props.deviceId === '') {
     recordGroups.value = []
@@ -221,6 +280,9 @@ const fetchHistory = async () => {
       params.collectionStartTime = collectionTimeRange.value[0]
       params.collectionEndTime = collectionTimeRange.value[1]
     }
+    if (Array.isArray(attributeCodes.value) && attributeCodes.value.length) {
+      params.attributeCodes = attributeCodes.value
+    }
     const res: any = await DeviceApi.getHistoryRecord(params)
     const responseData = res?.data?.data ?? res?.data ?? res
     
@@ -256,6 +318,7 @@ const handleQuery = () => {
 
 const resetQuery = () => {
   collectionTimeRange.value = []
+  attributeCodes.value = []
   queryParams.pageNo = 1
   queryParams.pageSize = 10
   fetchHistory()
@@ -268,8 +331,10 @@ watch(
       return
     }
     collectionTimeRange.value = buildLastHoursRange(4)
+    attributeCodes.value = []
     queryParams.pageNo = 1
     queryParams.pageSize = 10
+    fetchDeviceAttributes()
     fetchHistory()
   }
 )