From 511e3258787646c08a6d4f9d8de2dd8192dc7348 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Sun, 4 Jan 2026 15:43:11 +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-=E5=AD=90=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E2=80=9C=E6=9C=80=E6=96=B0=E5=80=BC=E2=80=9D=E3=80=81=E2=80=9C?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=87=87=E9=9B=86=E6=97=B6=E9=97=B4=E2=80=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/DeviceAttributeList.vue | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue
index 2b7ce2e3..8c55bc14 100644
--- a/src/views/iot/device/components/DeviceAttributeList.vue
+++ b/src/views/iot/device/components/DeviceAttributeList.vue
@@ -56,16 +56,20 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
         </template>
       </el-table-column>
       <el-table-column label="寄存器地址" align="center" prop="address" min-width="140px" />
-      <el-table-column label="最新值" align="center" prop="latestValue" min-width="120px">
+      <el-table-column label="最新值" align="center" prop="addressValue" min-width="120px">
         <template #default="scope">
-          {{ scope.row.latestValue ?? '-' }}
+          {{ formatAddressValue(scope.row.addressValue) }}
         </template>
       </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" />
+        label="最新采集时间"
+        align="center"
+        prop="latestCollectionTime"
+        :formatter="dateFormatter"
+        width="170px"
+      />
       <el-table-column label="顺序" align="center" prop="sort" width="80px">
         <template #default="scope">
           {{ scope.row.sort ?? '-' }}
@@ -126,6 +130,16 @@ const queryFormRef = ref()
 
 const exportLoading = ref(false)
 
+const formatAddressValue = (value: unknown) => {
+  if (value === null || value === undefined) {
+    return '-'
+  }
+  if (typeof value === 'string' || typeof value === 'number') {
+    return value
+  }
+  return ''
+}
+
 const selectedIds = ref<number[]>([])
 const handleSelectionChange = (rows: any[]) => {
   selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined) ?? []