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 47510c9..082e88f 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -206,7 +206,13 @@ "ioTPlatformProductName": "ProductName", "ioTPlatformAccountId": "AccountId", "ioTPlatformAccountName": "AccountName", - "ioTPlatformResponse": "Response" + "ioTPlatformResponse": "Response", + "viewData": "Data", + "onlineStatus": "OnlineStatus", + "IsPlatformPushSuccess": "IsPlatformPushSuccess", + "DeviceOnlineStatus": "DeviceOnlineStatus", + "LastOnlineTime": "LastOnlineTime", + "LastOfflineTime": "LastOfflineTime" }, "IoTDBBase": { "IoTDataType": "IoTDataType", diff --git a/apps/web-antd/src/locales/langs/en-US/common.json b/apps/web-antd/src/locales/langs/en-US/common.json index fe10ee3..517bf0f 100644 --- a/apps/web-antd/src/locales/langs/en-US/common.json +++ b/apps/web-antd/src/locales/langs/en-US/common.json @@ -60,6 +60,7 @@ "lastModificationTime": "LastModificationTime", "BelongingProductName": "Belonging ProductName", "BelongingAccountName": "BelongingAccountName", + "BelongingIoTPlatform": "Belonging TPlatform", "AppId": "AppId", "AppKey": "AppKey", "AppSecret": "AppSecret" 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 0e8dd1f..d97791b 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -206,7 +206,13 @@ "ioTPlatformProductName": "产品名称", "ioTPlatformAccountId": "所属账号Id", "ioTPlatformAccountName": "所属账号", - "ioTPlatformResponse": "平台响应" + "ioTPlatformResponse": "平台响应", + "viewData": "数据", + "onlineStatus": "在线状态", + "IsPlatformPushSuccess": "是否推送成功", + "DeviceOnlineStatus": "在线状态", + "LastOnlineTime": "最后在线时间", + "LastOfflineTime": "最后离线时间" }, "IoTDBBase": { "IoTDataType": "数据类型", diff --git a/apps/web-antd/src/locales/langs/zh-CN/common.json b/apps/web-antd/src/locales/langs/zh-CN/common.json index 936ae3c..d657f96 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/common.json +++ b/apps/web-antd/src/locales/langs/zh-CN/common.json @@ -61,6 +61,7 @@ "lastModificationTime": "最后更新时间", "BelongingProductName": "所属产品", "BelongingAccountName": "所属账号", + "BelongingIoTPlatform": "所属平台", "AppId": "应用Id", "AppKey": "应用Key", "AppSecret": "应用Secret" diff --git a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue index 183c67d..1e03621 100644 --- a/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue +++ b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue @@ -14,7 +14,6 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { postAggregationDeviceCreateAsync, postAggregationDeviceDeleteAsync, - postDeviceInfoArchivesDown, postDeviceInfoPage, } from '#/api-client'; import { TableAction } from '#/components/table-action'; @@ -148,12 +147,12 @@ async function submit() { const fetchParams: any = isEdit ? { - id: editRow.value.id, - ...processedFormValues, - } + id: editRow.value.id, + ...processedFormValues, + } : { - ...processedFormValues, - }; + ...processedFormValues, + }; try { userModalApi.setState({ loading: true, confirmLoading: true }); @@ -233,26 +232,6 @@ const toStatusData = (row: Record) => { }, }); }; -// 档案下发 -const archivesIssued = async (row: Record) => { - try { - const result = await postDeviceInfoArchivesDown({ - body: { - meterAddress: row.deviceAddress, - meterType: row.ioTPlatform, - focusAddress: row.ioTPlatformDeviceOpenInfo, - }, - }); - if (result.data) { - Message.success($t('common.operationSuccess')); - } else { - Message.error($t('common.operationFail')); - } - } catch (error) { - console.error('档案下发失败:', error); - Message.error($t('common.operationFail')); - } -}; const openAddModal = async () => { editRow.value = {}; userModalApi.open(); @@ -263,17 +242,15 @@ const openAddModal = async () => { + - + ]" :drop-down-actions="[ + { + label: $t('common.delete'), + icon: 'ant-design:delete-outlined', + type: 'primary', + auth: ['AbpIdentity.Users.Delete'], + popConfirm: { + title: $t('common.askConfirmDelete'), + confirm: onDel.bind(null, row), + }, + }, + ]" /> + - + diff --git a/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts b/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts index 7fe081e..18ff9c1 100644 --- a/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts +++ b/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts @@ -23,6 +23,22 @@ export const querySchema = computed(() => [ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ { title: $t('common.seq'), type: 'seq', width: 50 }, + { + field: 'ioTPlatformName', + title: $t('common.BelongingIoTPlatform'), + minWidth: '150', + slots: { default: 'ioTPlatformName' }, + }, + { + field: 'accountPhoneNumber', + title: $t('common.BelongingAccountName'), + minWidth: '150', + }, + { + field: 'ioTPlatformProductName', + title: $t('common.BelongingProductName'), + minWidth: '150', + }, { field: 'deviceName', title: $t('abp.deviceInfos.deviceName'), @@ -33,36 +49,31 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ title: $t('abp.deviceInfos.deviceAddress'), minWidth: '150', }, - { - field: 'ioTPlatform', - title: $t('abp.deviceInfos.ioTPlatform'), - minWidth: '150', - }, - { - field: 'ioTPlatformName', - title: $t('abp.deviceInfos.ioTPlatformName'), - minWidth: '150', - }, { field: 'ioTPlatformDeviceOpenInfo', title: $t('abp.deviceInfos.ioTPlatformDeviceOpenInfo'), - minWidth: '100', + minWidth: '180', + }, + { + field: 'deviceOnlineStatusName', + title: $t('abp.deviceInfos.DeviceOnlineStatus'), + minWidth: '150', + }, + { + field: 'lastOnlineTime', + title: $t('abp.deviceInfos.LastOnlineTime'), + minWidth: '150', + }, + { + field: 'lastOfflineTime', + title: $t('abp.deviceInfos.LastOfflineTime'), + minWidth: '150', }, { field: 'platformPassword', title: $t('abp.deviceInfos.platformPassword'), minWidth: '150', }, - { - field: 'ioTPlatformProductName', - title: $t('abp.deviceInfos.ioTPlatformProductName'), - minWidth: '150', - }, - { - field: 'ioTPlatformAccountName', - title: $t('abp.deviceInfos.ioTPlatformAccountName'), - minWidth: '150', - }, { field: 'ioTPlatformResponse', title: $t('abp.deviceInfos.ioTPlatformResponse'), diff --git a/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue index e4ddbfc..dc1b549 100644 --- a/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue +++ b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue @@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { postDeviceInfoPage } from '#/api-client'; -import { postCTWingLogInfoPage } from '#/api-client'; +import { postTableModelCtWingLogInfo } from '#/api-client'; import DeviceSelect from '../deviceData/DeviceSelect.vue'; import { querySchema, tableSchema } from './schema'; @@ -221,7 +221,7 @@ const gridOptions: VxeGridProps = { if (DeviceType) queryParams.DeviceType = DeviceType; if (DeviceId) queryParams.DeviceId = DeviceId; - const { data } = await postCTWingLogInfoPage({ + const { data } = await postTableModelCtWingLogInfo({ body: queryParams, }); const result = { diff --git a/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue index deb24ef..6b9d8e6 100644 --- a/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue +++ b/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue @@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { postDeviceInfoPage } from '#/api-client'; -import { postOneNETLogInfoPage } from '#/api-client'; +import { postTableModelOneNetLogInfo } from '#/api-client'; import DeviceSelect from '../deviceData/DeviceSelect.vue'; import { querySchema, tableSchema } from './schema'; @@ -219,7 +219,7 @@ const gridOptions: VxeGridProps = { if (DeviceType) queryParams.DeviceType = DeviceType; if (DeviceId) queryParams.DeviceId = DeviceId; - const { data } = await postOneNETLogInfoPage({ + const { data } = await postTableModelOneNetLogInfo({ body: queryParams, }); const result = { diff --git a/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts b/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts index 462323f..a6801de 100644 --- a/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts +++ b/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts @@ -312,7 +312,7 @@ export const editProductFormSchemaEdit: any = computed(() => [ { component: 'ApiSelect', fieldName: 'oneNETAccountId', - label: $t('abp.OneNETManagement.BelongingAccountName'), + label: $t('common.BelongingAccountName'), componentProps: { api: postOneNetAccountListAsync, params: {