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 c35b8d2..8ad3945 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -234,7 +234,8 @@ "DeviceId": "DeviceId", "Timestamps": "Timestamps", "FormattedTimestamps": "Formatted Timestamps", - "DevicePath": "DevicePath" + "DevicePath": "DevicePath", + "DeviceAddress": "Device Address" }, "CTWingLog": { "PlatformTenantId": "PlatformTenantId", 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 f70fbad..08b0945 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -234,7 +234,8 @@ "DeviceId": "设备ID", "Timestamps": "时标(纳秒)", "FormattedTimestamps": "时标", - "DevicePath": "设备路径" + "DevicePath": "设备路径", + "DeviceAddress": "设备地址" }, "CTWingLog": { "PlatformTenantId": "物联网平台租户Id", diff --git a/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts b/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts index 9b382f4..86bf3b9 100644 --- a/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts +++ b/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts @@ -8,8 +8,8 @@ import type { // 字段名映射配置 export const fieldNameMapping: FieldMapping = { SystemName: '系统名称', - ProjectId: '项目ID', - ProjectName: '项目名称', + // ProjectId: '项目ID', + // ProjectName: '项目名称', IoTDataType: 'IoT数据类型', DeviceType: '设备类型', DeviceId: '设备ID', @@ -35,12 +35,12 @@ export const fieldTypeConfig: FieldTypeConfig = { // 固定字段列表 - 这些字段已经在固定列中定义,不需要在动态列中重复生成 const FIXED_FIELDS = [ 'SystemName', - 'ProjectId', 'DeviceType', 'IoTDataType', 'DeviceId', 'Timestamps', 'FormattedTimestamps', + 'DeviceAddress', ]; // 动态生成表格列 diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/dataManger/deviceData/index.vue index 41e6129..d3c90ed 100644 --- a/apps/web-antd/src/views/dataManger/deviceData/index.vue +++ b/apps/web-antd/src/views/dataManger/deviceData/index.vue @@ -96,13 +96,6 @@ const fixedColumns = [ showOverflow: true, slots: {}, }, - { - field: 'ProjectId', - title: $t('abp.IoTDBBase.ProjectId'), - minWidth: 150, - showOverflow: true, - slots: {}, - }, { field: 'DeviceType', title: $t('abp.IoTDBBase.DeviceType'), @@ -124,6 +117,13 @@ const fixedColumns = [ showOverflow: true, slots: {}, }, + { + field: 'DeviceAddress', + title: $t('abp.IoTDBBase.DeviceAddress'), + minWidth: 150, + showOverflow: true, + slots: {}, + }, ]; // 合并固定列和动态列 - 使用计算属性确保响应式