From 3ac2ed83e9b58f162d1b4457d5ba4d2a4a43eb8d Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Thu, 5 Mar 2026 14:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=AD=90=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9D=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/locales/langs/en-US/abp.json |  3 ++-
 .../web-antd/src/locales/langs/zh-CN/abp.json |  3 ++-
 .../deviceData/dynamicColumns.ts              |  8 +++++++-
 .../iotdbdatamanagement/deviceData/index.vue  |  9 ++++++++-
 .../iotdbdatamanagement/deviceData/types.ts   | 19 ++++++++++---------
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/apps/web-antd/src/locales/langs/en-US/abp.json b/apps/web-antd/src/locales/langs/en-US/abp.json
index 954a12e..2b22029 100644
--- a/apps/web-antd/src/locales/langs/en-US/abp.json
+++ b/apps/web-antd/src/locales/langs/en-US/abp.json
@@ -244,7 +244,8 @@
     "Timestamps": "Timestamps",
     "FormattedTimestamps": "Formatted Timestamps",
     "DevicePath": "DevicePath",
-    "DeviceAddress": "Device Address",
+    "DeviceAddress": "MasterDeviceAddress",
+    "SubDevice": "SubDevice",
     "CacheRefresh": "Cache Refresh",
     "TelemetryLog": "Telemetry Log",
     "PlatformLog": "Platform Log",
diff --git a/apps/web-antd/src/locales/langs/zh-CN/abp.json b/apps/web-antd/src/locales/langs/zh-CN/abp.json
index b72c422..917fc48 100644
--- a/apps/web-antd/src/locales/langs/zh-CN/abp.json
+++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json
@@ -237,7 +237,8 @@
     "Timestamps": "UTC时标(纳秒)",
     "FormattedTimestamps": "本地时间",
     "DevicePath": "设备路径",
-    "DeviceAddress": "设备地址",
+    "DeviceAddress": "主设备地址",
+    "SubDevice": "从设备地址",
     "CacheRefresh": "缓存刷新",
     "TelemetryLog": "遥测日志",
     "PlatformLog": "平台日志",
diff --git a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts
index b1273d9..8a3b451 100644
--- a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts
+++ b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts
@@ -1,3 +1,9 @@
+/*
+ * @Description: 文件内容描述
+ * @Author: 陈益
+ * @Date: 2025-09-18 10:20:19
+ * @LastEditors: 陈益
+ */
 import type {
   ColumnConfig,
   DynamicDeviceData,
@@ -37,7 +43,7 @@ const FIXED_FIELDS = [
   // 'DataBaseName',
   'DeviceType',
   'IoTDataType',
-  'DeviceAddress',
+  'SubDevice',
   'TimestampStr',
   'FormattedTimestamps',
   'Timestamps', // 添加Timestamps到固定字段列表，确保它被隐藏
diff --git a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue
index 305dde8..2240e66 100644
--- a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue
+++ b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue
@@ -119,6 +119,13 @@ const fixedColumns = [
     showOverflow: true,
     slots: {},
   },
+  {
+    field: 'SubDevice',
+    title: $t('abp.IoTDBBase.SubDevice'),
+    minWidth: 150,
+    showOverflow: true,
+    slots: {},
+  },
 ];
 
 // 合并固定列和动态列 - 使用计算属性确保响应式
@@ -179,10 +186,10 @@ const formOptions: VbenFormProps = {
     // 当任何相关字段发生变化时，刷新表格数据
     const relevantFields = new Set([
       'DeviceAddress',
+      'DeviceType',
       'EndCreationTime',
       'IoTDataType',
       'StartCreationTime',
-      'DeviceType',
     ]);
     const hasRelevantChange = changedFields.some((field) =>
       relevantFields.has(field),
diff --git a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts
index 92a9e1a..45d68d5 100644
--- a/apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts
+++ b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts
@@ -6,10 +6,11 @@ export interface BaseDeviceData {
   IoTDataType?: string;
   DeviceType?: string;
   DeviceId?: string;
+  SubDevice?: string;
   Timestamps?: string;
   [key: string]: any; // 允许任意额外字段
 }
- 
+
 // 动态设备数据类型
 export interface DynamicDeviceData extends BaseDeviceData {
   [key: string]: any; // 允许任意字段
@@ -17,7 +18,7 @@ export interface DynamicDeviceData extends BaseDeviceData {
 
 // 分页响应类型
 export interface DynamicPageResponse<T = DynamicDeviceData> {
-  items?: T[] | null;
+  items?: null | T[];
   totalCount?: number;
   [key: string]: any; // 允许任意额外字段
 }
@@ -26,8 +27,8 @@ export interface DynamicPageResponse<T = DynamicDeviceData> {
 export interface ColumnConfig {
   field: string;
   title: string;
-  minWidth?: string | number;
-  width?: string | number;
+  minWidth?: number | string;
+  width?: number | string;
   showOverflow?: boolean;
   formatter?: (value: any) => string;
   slots?: Record<string, any>; // 添加slots属性
@@ -42,10 +43,10 @@ export interface FieldMapping {
 // 字段类型配置类型
 export interface FieldTypeConfig {
   [key: string]: {
-    formatter?: (value: any) => string;
-    width?: string | number;
-    minWidth?: string | number;
-    slots?: Record<string, any>;
     [key: string]: any;
+    formatter?: (value: any) => string;
+    minWidth?: number | string;
+    slots?: Record<string, any>;
+    width?: number | string;
   };
-} 
+}