diff --git a/apps/web-antd/src/api-client/schemas.gen.ts b/apps/web-antd/src/api-client/schemas.gen.ts index 4b41c25..5c73148 100644 --- a/apps/web-antd/src/api-client/schemas.gen.ts +++ b/apps/web-antd/src/api-client/schemas.gen.ts @@ -497,6 +497,9 @@ export const BatchCreateDeviceAggregationInputSchema = { }, deviceType: { '$ref': '#/components/schemas/DeviceTypeEnum' + }, + encryptionType: { + '$ref': '#/components/schemas/DeviceAuthenticationModeEnum' } }, additionalProperties: false, @@ -1528,6 +1531,9 @@ export const CreateDeviceAggregationInputSchema = { }, deviceType: { '$ref': '#/components/schemas/DeviceTypeEnum' + }, + encryptionType: { + '$ref': '#/components/schemas/DeviceAuthenticationModeEnum' } }, additionalProperties: false, diff --git a/apps/web-antd/src/api-client/types.gen.ts b/apps/web-antd/src/api-client/types.gen.ts index 3b35336..381502e 100644 --- a/apps/web-antd/src/api-client/types.gen.ts +++ b/apps/web-antd/src/api-client/types.gen.ts @@ -191,6 +191,7 @@ export type BatchCreateDeviceAggregationInput = { ioTPlatformProductId: string; deviceSourceType?: DeviceSourceTypeEnum; deviceType?: DeviceTypeEnum; + encryptionType?: DeviceAuthenticationModeEnum; }; /** @@ -407,6 +408,7 @@ export type CreateDeviceAggregationInput = { ioTPlatformProductId: string; deviceSourceType?: DeviceSourceTypeEnum; deviceType?: DeviceTypeEnum; + encryptionType?: DeviceAuthenticationModeEnum; }; /** 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 b12db92..8ccd7e0 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -223,7 +223,8 @@ "readingMode": "ReadingMode", "deviceType": "DeviceType", "deviceThingModelName": "ThingModelInfoManage", - "lifeInfoName": "Life Cycle" + "lifeInfoName": "Life Cycle", + "encryptionType": "Authentication Mode" }, "thingModelInfos": { "FiledType": "FiledType", 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 e4aa1f1..74dadac 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -216,7 +216,8 @@ "deviceType": "设备类型", "readingMode": "抄读模式", "deviceThingModelName": "设备物模型名称", - "lifeInfoName": "生命周期" + "lifeInfoName": "生命周期", + "encryptionType": "设备鉴权模式" }, "thingModelInfos": { "FiledType": "物模型类型", diff --git a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue index 4b9918e..df21ebe 100644 --- a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue +++ b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue @@ -330,6 +330,15 @@ function setDeviceLifeInfo(row: Record, lifeInfo: number) { row.lifeInfo = lifeInfo; } +function getEncryptionTypeTagColor(encryptionType: unknown): string { + const type = Number(encryptionType); + if (type === 1) return 'blue'; + if (type === 2) return 'green'; + if (encryptionType === 'PerProductTypeSecret') return 'blue'; + if (encryptionType === 'PerDeviceSecret') return 'green'; + return 'default'; +} + // 设备升级相关 const upgradeRow: Record = ref({}); @@ -2599,6 +2608,7 @@ async function submitBatchAdd() { addressList, ioTPlatform: formValues.ioTPlatform, ioTPlatformProductId, + EncryptionType: formValues.EncryptionType, }; try { @@ -2997,6 +3007,12 @@ const toolbarActions = computed(() => [ ) " /> +