From d88c93bdfbe5f16e1ad645e8f163862105248a31 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Mon, 28 Jul 2025 15:24:23 +0800 Subject: [PATCH] =?UTF-8?q?OneNET=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api-client/schemas.gen.ts | 4 +- apps/web-antd/src/api-client/services.gen.ts | 12 +- apps/web-antd/src/api-client/types.gen.ts | 14 +- .../web-antd/src/locales/langs/en-US/abp.json | 3 + .../web-antd/src/locales/langs/zh-CN/abp.json | 3 + .../onenetmanagement/privateProduct/index.vue | 116 +---- .../onenetmanagement/privateProduct/schema.ts | 433 +++--------------- 7 files changed, 129 insertions(+), 456 deletions(-) diff --git a/apps/web-antd/src/api-client/schemas.gen.ts b/apps/web-antd/src/api-client/schemas.gen.ts index 5403b56..8588a90 100644 --- a/apps/web-antd/src/api-client/schemas.gen.ts +++ b/apps/web-antd/src/api-client/schemas.gen.ts @@ -1304,7 +1304,7 @@ export const DeviceTableModelDataInfoPageInputSchema = { export const DeviceTableModelDataInfoPageOutputSchema = { type: 'object', properties: { - dataBaseName: { + systemName: { type: 'string', description: '系统名称', nullable: true @@ -8383,4 +8383,4 @@ export const WindowsTimeZoneSchema = { } }, additionalProperties: false -} as const; +} as const; \ No newline at end of file diff --git a/apps/web-antd/src/api-client/services.gen.ts b/apps/web-antd/src/api-client/services.gen.ts index 6cd902e..d0f1fbd 100644 --- a/apps/web-antd/src/api-client/services.gen.ts +++ b/apps/web-antd/src/api-client/services.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { createClient, createConfig, type Options, formDataBodySerializer } from '@hey-api/client-axios'; -import type { GetApiAbpApiDefinitionData, GetApiAbpApiDefinitionError, GetApiAbpApiDefinitionResponse, GetApiAbpApplicationConfigurationData, GetApiAbpApplicationConfigurationError, GetApiAbpApplicationConfigurationResponse, GetApiAbpApplicationLocalizationData, GetApiAbpApplicationLocalizationError, GetApiAbpApplicationLocalizationResponse, PostApiAppAccountLoginData, PostApiAppAccountLoginError, PostApiAppAccountLoginResponse, PostApiAppAccountLogin2FaData, PostApiAppAccountLogin2FaError, PostApiAppAccountLogin2FaResponse, PostApiAppAccountLoginOidcData, PostApiAppAccountLoginOidcError, PostApiAppAccountLoginOidcResponse, PostApiAppAccountRefreshTokenData, PostApiAppAccountRefreshTokenError, PostApiAppAccountRefreshTokenResponse, PostApiAppAccountLogoutError, PostApiAppAccountLogoutResponse, PostAuditLogsPageData, PostAuditLogsPageError, PostAuditLogsPageResponse, PostAggregationBusinessReceiveCommandInfoAsyncData, PostAggregationBusinessReceiveCommandInfoAsyncError, PostAggregationBusinessReceiveCommandInfoAsyncResponse, GetCommonGetSelectListData, GetCommonGetSelectListError, GetCommonGetSelectListResponse, PostCtWingServiceReceiveStatusChangeError, PostCtWingServiceReceiveStatusChangeResponse, PostCtWingServiceReceiveDataChangeError, PostCtWingServiceReceiveDataChangeResponse, PostCtWingServiceReceiveCommandChangeError, PostCtWingServiceReceiveCommandChangeResponse, PostCtWingServiceReceiveEventChangeError, PostCtWingServiceReceiveEventChangeResponse, PostCtWingServiceReceiveDeviceChangeError, PostCtWingServiceReceiveDeviceChangeResponse, PostDataDictionaryPageData, PostDataDictionaryPageError, PostDataDictionaryPageResponse, PostDataDictionaryPageDetailData, PostDataDictionaryPageDetailError, PostDataDictionaryPageDetailResponse, PostDataDictionaryCreateData, PostDataDictionaryCreateError, PostDataDictionaryCreateResponse, PostDataDictionaryCreateDetailData, PostDataDictionaryCreateDetailError, PostDataDictionaryCreateDetailResponse, PostDataDictionaryStatusData, PostDataDictionaryStatusError, PostDataDictionaryStatusResponse, PostDataDictionaryUpdateDetailData, PostDataDictionaryUpdateDetailError, PostDataDictionaryUpdateDetailResponse, PostDataDictionaryDeleteData, PostDataDictionaryDeleteError, PostDataDictionaryDeleteResponse, PostDataDictionaryDeleteDataDictionaryTypeData, PostDataDictionaryDeleteDataDictionaryTypeError, PostDataDictionaryDeleteDataDictionaryTypeResponse, PostDataDictionaryUpdateData, PostDataDictionaryUpdateError, PostDataDictionaryUpdateResponse, PostAggregationDeviceCreateAsyncData, PostAggregationDeviceCreateAsyncError, PostAggregationDeviceCreateAsyncResponse, PostAggregationDeviceDeleteAsyncData, PostAggregationDeviceDeleteAsyncError, PostAggregationDeviceDeleteAsyncResponse, PostAggregationDeviceFindByIdAsyncData, PostAggregationDeviceFindByIdAsyncError, PostAggregationDeviceFindByIdAsyncResponse, PostDeviceInfoFindByDeviceAddressData, PostDeviceInfoFindByDeviceAddressError, PostDeviceInfoFindByDeviceAddressResponse, PostDeviceInfoPageData, PostDeviceInfoPageError, PostDeviceInfoPageResponse, PostDeviceInfoCacheDeviceDataToRedisError, PostDeviceInfoCacheDeviceDataToRedisResponse, PostDeviceInfoArchivesDownData, PostDeviceInfoArchivesDownError, PostDeviceInfoArchivesDownResponse, PostFeaturesListData, PostFeaturesListError, PostFeaturesListResponse, PostFeaturesUpdateData, PostFeaturesUpdateError, PostFeaturesUpdateResponse, PostFeaturesDeleteData, PostFeaturesDeleteError, PostFeaturesDeleteResponse, PostFilesPageData, PostFilesPageError, PostFilesPageResponse, PostFilesUploadData, PostFilesUploadError, PostFilesUploadResponse, PostFilesDeleteData, PostFilesDeleteError, PostFilesDeleteResponse, PostFilesDownloadData, PostFilesDownloadError, PostFilesDownloadResponse, PostIdentitySecurityLogsPageData, PostIdentitySecurityLogsPageError, PostIdentitySecurityLogsPageResponse, PostLanguagesAllError, PostLanguagesAllResponse, PostLanguagesPageData, PostLanguagesPageError, PostLanguagesPageResponse, PostLanguagesCreateData, PostLanguagesCreateError, PostLanguagesCreateResponse, PostLanguagesUpdateData, PostLanguagesUpdateError, PostLanguagesUpdateResponse, PostLanguagesDeleteData, PostLanguagesDeleteError, PostLanguagesDeleteResponse, PostLanguagesSetDefaultData, PostLanguagesSetDefaultError, PostLanguagesSetDefaultResponse, PostLanguageTextsAllResourceError, PostLanguageTextsAllResourceResponse, PostLanguageTextsPageData, PostLanguageTextsPageError, PostLanguageTextsPageResponse, PostLanguageTextsCreateData, PostLanguageTextsCreateError, PostLanguageTextsCreateResponse, PostLanguageTextsUpdateData, PostLanguageTextsUpdateError, PostLanguageTextsUpdateResponse, PostMenusUserMenuError, PostMenusUserMenuResponse, PostMenusPageData, PostMenusPageError, PostMenusPageResponse, PostMenusCreateData, PostMenusCreateError, PostMenusCreateResponse, PostMenusUpdateData, PostMenusUpdateError, PostMenusUpdateResponse, PostMenusDeleteData, PostMenusDeleteError, PostMenusDeleteResponse, PostMenusTreeError, PostMenusTreeResponse, PostNotificationNotificationPageData, PostNotificationNotificationPageError, PostNotificationNotificationPageResponse, PostNotificationNotificationSubscriptionPageData, PostNotificationNotificationSubscriptionPageError, PostNotificationNotificationSubscriptionPageResponse, PostNotificationDeleteData, PostNotificationDeleteError, PostNotificationDeleteResponse, PostNotificationSendCommonWarningMessageData, PostNotificationSendCommonWarningMessageError, PostNotificationSendCommonWarningMessageResponse, PostNotificationSendCommonInformationMessageData, PostNotificationSendCommonInformationMessageError, PostNotificationSendCommonInformationMessageResponse, PostNotificationSendCommonErrorMessageData, PostNotificationSendCommonErrorMessageError, PostNotificationSendCommonErrorMessageResponse, PostNotificationSendBroadCastWarningMessageData, PostNotificationSendBroadCastWarningMessageError, PostNotificationSendBroadCastWarningMessageResponse, PostNotificationSendBroadCastInformationMessageData, PostNotificationSendBroadCastInformationMessageError, PostNotificationSendBroadCastInformationMessageResponse, PostNotificationSendBroadCastErrorMessageData, PostNotificationSendBroadCastErrorMessageError, PostNotificationSendBroadCastErrorMessageResponse, PostNotificationReadData, PostNotificationReadError, PostNotificationReadResponse, PostNotificationBatchReadData, PostNotificationBatchReadError, PostNotificationBatchReadResponse, PostOneNetAccountInsertAsyncData, PostOneNetAccountInsertAsyncError, PostOneNetAccountInsertAsyncResponse, PostOneNetAccountModifyAsyncData, PostOneNetAccountModifyAsyncError, PostOneNetAccountModifyAsyncResponse, PostOneNetAccountDeleteAsyncData, PostOneNetAccountDeleteAsyncError, PostOneNetAccountDeleteAsyncResponse, PostOneNetAccountListAsyncData, PostOneNetAccountListAsyncError, PostOneNetAccountListAsyncResponse, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncData, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncError, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncResponse, PostAggregationOneNetGetProductListAsyncData, PostAggregationOneNetGetProductListAsyncError, PostAggregationOneNetGetProductListAsyncResponse, PostOneNetProductInsertAsyncData, PostOneNetProductInsertAsyncError, PostOneNetProductInsertAsyncResponse, PostOneNetProductModifyAsyncData, PostOneNetProductModifyAsyncError, PostOneNetProductModifyAsyncResponse, PostOneNetProductGetAsyncData, PostOneNetProductGetAsyncError, PostOneNetProductGetAsyncResponse, PostOneNetProductProductStatusChangeAsyncData, PostOneNetProductProductStatusChangeAsyncError, PostOneNetProductProductStatusChangeAsyncResponse, PostOneNetProductListAsyncData, PostOneNetProductListAsyncError, PostOneNetProductListAsyncResponse, PostOneNetServiceReceivePlaintextDataChangeData, PostOneNetServiceReceivePlaintextDataChangeError, PostOneNetServiceReceivePlaintextDataChangeResponse, GetOneNetServiceReceivePlaintextDataChangeData, GetOneNetServiceReceivePlaintextDataChangeError, GetOneNetServiceReceivePlaintextDataChangeResponse, PostOneNetServiceReceiveCiphertextDataChangeData, PostOneNetServiceReceiveCiphertextDataChangeError, PostOneNetServiceReceiveCiphertextDataChangeResponse, GetOneNetServiceReceiveCiphertextDataChangeData, GetOneNetServiceReceiveCiphertextDataChangeError, GetOneNetServiceReceiveCiphertextDataChangeResponse, PostOrganizationUnitsTreeError, PostOrganizationUnitsTreeResponse, PostOrganizationUnitsCreateData, PostOrganizationUnitsCreateError, PostOrganizationUnitsCreateResponse, PostOrganizationUnitsDeleteData, PostOrganizationUnitsDeleteError, PostOrganizationUnitsDeleteResponse, PostOrganizationUnitsUpdateData, PostOrganizationUnitsUpdateError, PostOrganizationUnitsUpdateResponse, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncData, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncError, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncResponse, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncData, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncError, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncResponse, PostOrganizationUnitsAddUserToOrganizationUnitData, PostOrganizationUnitsAddUserToOrganizationUnitError, PostOrganizationUnitsAddUserToOrganizationUnitResponse, PostOrganizationUnitsRemoveUserFromOrganizationUnitData, PostOrganizationUnitsRemoveUserFromOrganizationUnitError, PostOrganizationUnitsRemoveUserFromOrganizationUnitResponse, PostOrganizationUnitsGetUsersData, PostOrganizationUnitsGetUsersError, PostOrganizationUnitsGetUsersResponse, PostOrganizationUnitsGetRolesData, PostOrganizationUnitsGetRolesError, PostOrganizationUnitsGetRolesResponse, PostOrganizationUnitsGetUnAddUsersData, PostOrganizationUnitsGetUnAddUsersError, PostOrganizationUnitsGetUnAddUsersResponse, PostOrganizationUnitsGetUnAddRolesData, PostOrganizationUnitsGetUnAddRolesError, PostOrganizationUnitsGetUnAddRolesResponse, PostPermissionsTreeData, PostPermissionsTreeError, PostPermissionsTreeResponse, PostPermissionsUpdateData, PostPermissionsUpdateError, PostPermissionsUpdateResponse, PostRolesAllError, PostRolesAllResponse, PostRolesPageData, PostRolesPageError, PostRolesPageResponse, PostRolesCreateData, PostRolesCreateError, PostRolesCreateResponse, PostRolesUpdateData, PostRolesUpdateError, PostRolesUpdateResponse, PostRolesDeleteData, PostRolesDeleteError, PostRolesDeleteResponse, GetApiAppAbpProBasicApplicationConfigurationError, GetApiAppAbpProBasicApplicationConfigurationResponse, PostSettingsAllError, PostSettingsAllResponse, PostSettingsUpdateData, PostSettingsUpdateError, PostSettingsUpdateResponse, PostTableModelPacketInfoPageData, PostTableModelPacketInfoPageError, PostTableModelPacketInfoPageResponse, PostTableModelPacketInfoInsertData, PostTableModelPacketInfoInsertError, PostTableModelPacketInfoInsertResponse, PostTableModelPacketInfoBatchInsertData, PostTableModelPacketInfoBatchInsertError, PostTableModelPacketInfoBatchInsertResponse, PostTableModelDeviceDataInfoPageData, PostTableModelDeviceDataInfoPageError, PostTableModelDeviceDataInfoPageResponse, PostTableModelCtWingLogInfoData, PostTableModelCtWingLogInfoError, PostTableModelCtWingLogInfoResponse, PostTableModelOneNetLogInfoData, PostTableModelOneNetLogInfoError, PostTableModelOneNetLogInfoResponse, PostTenantsFindData, PostTenantsFindError, PostTenantsFindResponse, PostTenantsPageData, PostTenantsPageError, PostTenantsPageResponse, PostTenantsCreateData, PostTenantsCreateError, PostTenantsCreateResponse, PostTenantsUpdateData, PostTenantsUpdateError, PostTenantsUpdateResponse, PostTenantsDeleteData, PostTenantsDeleteError, PostTenantsDeleteResponse, PostTenantsPageConnectionStringData, PostTenantsPageConnectionStringError, PostTenantsPageConnectionStringResponse, PostTenantsAddOrUpdateConnectionStringData, PostTenantsAddOrUpdateConnectionStringError, PostTenantsAddOrUpdateConnectionStringResponse, PostTenantsDeleteConnectionStringData, PostTenantsDeleteConnectionStringError, PostTenantsDeleteConnectionStringResponse, PostTextTemplatesPageData, PostTextTemplatesPageError, PostTextTemplatesPageResponse, PostTextTemplatesCreateData, PostTextTemplatesCreateError, PostTextTemplatesCreateResponse, PostTextTemplatesUpdateData, PostTextTemplatesUpdateError, PostTextTemplatesUpdateResponse, PostTextTemplatesDeleteData, PostTextTemplatesDeleteError, PostTextTemplatesDeleteResponse, PostTextTemplatesExportData, PostTextTemplatesExportError, PostTextTemplatesExportResponse, PostTreeModelDeviceDataInfoPageData, PostTreeModelDeviceDataInfoPageError, PostTreeModelDeviceDataInfoPageResponse, PostUsersPageData, PostUsersPageError, PostUsersPageResponse, PostUsersListData, PostUsersListError, PostUsersListResponse, PostUsersExportData, PostUsersExportError, PostUsersExportResponse, PostUsersCreateData, PostUsersCreateError, PostUsersCreateResponse, PostUsersUpdateData, PostUsersUpdateError, PostUsersUpdateResponse, PostUsersDeleteData, PostUsersDeleteError, PostUsersDeleteResponse, PostUsersRoleData, PostUsersRoleError, PostUsersRoleResponse, PostUsersChangePasswordData, PostUsersChangePasswordError, PostUsersChangePasswordResponse, PostUsersResetPasswordData, PostUsersResetPasswordError, PostUsersResetPasswordResponse, PostUsersLockData, PostUsersLockError, PostUsersLockResponse, PostUsersFindByUserNameData, PostUsersFindByUserNameError, PostUsersFindByUserNameResponse, PostUsersMyProfileError, PostUsersMyProfileResponse, PostUsersCanUseTwoFactorError, PostUsersCanUseTwoFactorResponse, PostUsersGetQrCodeError, PostUsersGetQrCodeResponse, PostUsersEnabledTwoFactorData, PostUsersEnabledTwoFactorError, PostUsersEnabledTwoFactorResponse, PostUsersDisabledTwoFactorData, PostUsersDisabledTwoFactorError, PostUsersDisabledTwoFactorResponse, PostUsersResetTwoFactorData, PostUsersResetTwoFactorError, PostUsersResetTwoFactorResponse, PostUsersNeedChangePasswordError, PostUsersNeedChangePasswordResponse } from './types.gen'; +import type { GetApiAbpApiDefinitionData, GetApiAbpApiDefinitionError, GetApiAbpApiDefinitionResponse, GetApiAbpApplicationConfigurationData, GetApiAbpApplicationConfigurationError, GetApiAbpApplicationConfigurationResponse, GetApiAbpApplicationLocalizationData, GetApiAbpApplicationLocalizationError, GetApiAbpApplicationLocalizationResponse, PostApiAppAccountLoginData, PostApiAppAccountLoginError, PostApiAppAccountLoginResponse, PostApiAppAccountLogin2FaData, PostApiAppAccountLogin2FaError, PostApiAppAccountLogin2FaResponse, PostApiAppAccountLoginOidcData, PostApiAppAccountLoginOidcError, PostApiAppAccountLoginOidcResponse, PostApiAppAccountRefreshTokenData, PostApiAppAccountRefreshTokenError, PostApiAppAccountRefreshTokenResponse, PostApiAppAccountLogoutError, PostApiAppAccountLogoutResponse, PostAuditLogsPageData, PostAuditLogsPageError, PostAuditLogsPageResponse, PostAggregationBusinessReceiveCommandInfoAsyncData, PostAggregationBusinessReceiveCommandInfoAsyncError, PostAggregationBusinessReceiveCommandInfoAsyncResponse, GetCommonGetSelectListData, GetCommonGetSelectListError, GetCommonGetSelectListResponse, PostCtWingServiceReceiveStatusChangeError, PostCtWingServiceReceiveStatusChangeResponse, PostCtWingServiceReceiveDataChangeError, PostCtWingServiceReceiveDataChangeResponse, PostCtWingServiceReceiveCommandChangeError, PostCtWingServiceReceiveCommandChangeResponse, PostCtWingServiceReceiveEventChangeError, PostCtWingServiceReceiveEventChangeResponse, PostCtWingServiceReceiveDeviceChangeError, PostCtWingServiceReceiveDeviceChangeResponse, PostDataDictionaryPageData, PostDataDictionaryPageError, PostDataDictionaryPageResponse, PostDataDictionaryPageDetailData, PostDataDictionaryPageDetailError, PostDataDictionaryPageDetailResponse, PostDataDictionaryCreateData, PostDataDictionaryCreateError, PostDataDictionaryCreateResponse, PostDataDictionaryCreateDetailData, PostDataDictionaryCreateDetailError, PostDataDictionaryCreateDetailResponse, PostDataDictionaryStatusData, PostDataDictionaryStatusError, PostDataDictionaryStatusResponse, PostDataDictionaryUpdateDetailData, PostDataDictionaryUpdateDetailError, PostDataDictionaryUpdateDetailResponse, PostDataDictionaryDeleteData, PostDataDictionaryDeleteError, PostDataDictionaryDeleteResponse, PostDataDictionaryDeleteDataDictionaryTypeData, PostDataDictionaryDeleteDataDictionaryTypeError, PostDataDictionaryDeleteDataDictionaryTypeResponse, PostDataDictionaryUpdateData, PostDataDictionaryUpdateError, PostDataDictionaryUpdateResponse, PostAggregationDeviceCreateAsyncData, PostAggregationDeviceCreateAsyncError, PostAggregationDeviceCreateAsyncResponse, PostAggregationDeviceDeleteAsyncData, PostAggregationDeviceDeleteAsyncError, PostAggregationDeviceDeleteAsyncResponse, PostAggregationDeviceFindByIdAsyncData, PostAggregationDeviceFindByIdAsyncError, PostAggregationDeviceFindByIdAsyncResponse, PostDeviceInfoFindByDeviceAddressData, PostDeviceInfoFindByDeviceAddressError, PostDeviceInfoFindByDeviceAddressResponse, PostDeviceInfoPageData, PostDeviceInfoPageError, PostDeviceInfoPageResponse, PostDeviceInfoCacheDeviceDataToRedisError, PostDeviceInfoCacheDeviceDataToRedisResponse, PostDeviceInfoArchivesDownData, PostDeviceInfoArchivesDownError, PostDeviceInfoArchivesDownResponse, PostFeaturesListData, PostFeaturesListError, PostFeaturesListResponse, PostFeaturesUpdateData, PostFeaturesUpdateError, PostFeaturesUpdateResponse, PostFeaturesDeleteData, PostFeaturesDeleteError, PostFeaturesDeleteResponse, PostFilesPageData, PostFilesPageError, PostFilesPageResponse, PostFilesUploadData, PostFilesUploadError, PostFilesUploadResponse, PostFilesDeleteData, PostFilesDeleteError, PostFilesDeleteResponse, PostFilesDownloadData, PostFilesDownloadError, PostFilesDownloadResponse, PostIdentitySecurityLogsPageData, PostIdentitySecurityLogsPageError, PostIdentitySecurityLogsPageResponse, PostLanguagesAllError, PostLanguagesAllResponse, PostLanguagesPageData, PostLanguagesPageError, PostLanguagesPageResponse, PostLanguagesCreateData, PostLanguagesCreateError, PostLanguagesCreateResponse, PostLanguagesUpdateData, PostLanguagesUpdateError, PostLanguagesUpdateResponse, PostLanguagesDeleteData, PostLanguagesDeleteError, PostLanguagesDeleteResponse, PostLanguagesSetDefaultData, PostLanguagesSetDefaultError, PostLanguagesSetDefaultResponse, PostLanguageTextsAllResourceError, PostLanguageTextsAllResourceResponse, PostLanguageTextsPageData, PostLanguageTextsPageError, PostLanguageTextsPageResponse, PostLanguageTextsCreateData, PostLanguageTextsCreateError, PostLanguageTextsCreateResponse, PostLanguageTextsUpdateData, PostLanguageTextsUpdateError, PostLanguageTextsUpdateResponse, PostMenusUserMenuError, PostMenusUserMenuResponse, PostMenusPageData, PostMenusPageError, PostMenusPageResponse, PostMenusCreateData, PostMenusCreateError, PostMenusCreateResponse, PostMenusUpdateData, PostMenusUpdateError, PostMenusUpdateResponse, PostMenusDeleteData, PostMenusDeleteError, PostMenusDeleteResponse, PostMenusTreeError, PostMenusTreeResponse, PostNotificationNotificationPageData, PostNotificationNotificationPageError, PostNotificationNotificationPageResponse, PostNotificationNotificationSubscriptionPageData, PostNotificationNotificationSubscriptionPageError, PostNotificationNotificationSubscriptionPageResponse, PostNotificationDeleteData, PostNotificationDeleteError, PostNotificationDeleteResponse, PostNotificationSendCommonWarningMessageData, PostNotificationSendCommonWarningMessageError, PostNotificationSendCommonWarningMessageResponse, PostNotificationSendCommonInformationMessageData, PostNotificationSendCommonInformationMessageError, PostNotificationSendCommonInformationMessageResponse, PostNotificationSendCommonErrorMessageData, PostNotificationSendCommonErrorMessageError, PostNotificationSendCommonErrorMessageResponse, PostNotificationSendBroadCastWarningMessageData, PostNotificationSendBroadCastWarningMessageError, PostNotificationSendBroadCastWarningMessageResponse, PostNotificationSendBroadCastInformationMessageData, PostNotificationSendBroadCastInformationMessageError, PostNotificationSendBroadCastInformationMessageResponse, PostNotificationSendBroadCastErrorMessageData, PostNotificationSendBroadCastErrorMessageError, PostNotificationSendBroadCastErrorMessageResponse, PostNotificationReadData, PostNotificationReadError, PostNotificationReadResponse, PostNotificationBatchReadData, PostNotificationBatchReadError, PostNotificationBatchReadResponse, PostOneNetAccountInsertAsyncData, PostOneNetAccountInsertAsyncError, PostOneNetAccountInsertAsyncResponse, PostOneNetAccountModifyAsyncData, PostOneNetAccountModifyAsyncError, PostOneNetAccountModifyAsyncResponse, PostOneNetAccountDeleteAsyncData, PostOneNetAccountDeleteAsyncError, PostOneNetAccountDeleteAsyncResponse, PostOneNetAccountListAsyncData, PostOneNetAccountListAsyncError, PostOneNetAccountListAsyncResponse, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncData, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncError, PostAggregationOneNetReceiveWorkshopProductionInfoAsyncResponse, PostAggregationOneNetGetProductListAsyncData, PostAggregationOneNetGetProductListAsyncError, PostAggregationOneNetGetProductListAsyncResponse, PostOneNetProductInsertAsyncData, PostOneNetProductInsertAsyncError, PostOneNetProductInsertAsyncResponse, PostOneNetProductModifyAsyncData, PostOneNetProductModifyAsyncError, PostOneNetProductModifyAsyncResponse, PostOneNetProductDeleteAsyncData, PostOneNetProductDeleteAsyncError, PostOneNetProductDeleteAsyncResponse, PostOneNetProductGetAsyncData, PostOneNetProductGetAsyncError, PostOneNetProductGetAsyncResponse, PostOneNetProductProductStatusChangeAsyncData, PostOneNetProductProductStatusChangeAsyncError, PostOneNetProductProductStatusChangeAsyncResponse, PostOneNetProductListAsyncData, PostOneNetProductListAsyncError, PostOneNetProductListAsyncResponse, PostOneNetServiceReceivePlaintextDataChangeData, PostOneNetServiceReceivePlaintextDataChangeError, PostOneNetServiceReceivePlaintextDataChangeResponse, GetOneNetServiceReceivePlaintextDataChangeData, GetOneNetServiceReceivePlaintextDataChangeError, GetOneNetServiceReceivePlaintextDataChangeResponse, PostOneNetServiceReceiveCiphertextDataChangeData, PostOneNetServiceReceiveCiphertextDataChangeError, PostOneNetServiceReceiveCiphertextDataChangeResponse, GetOneNetServiceReceiveCiphertextDataChangeData, GetOneNetServiceReceiveCiphertextDataChangeError, GetOneNetServiceReceiveCiphertextDataChangeResponse, PostOrganizationUnitsTreeError, PostOrganizationUnitsTreeResponse, PostOrganizationUnitsCreateData, PostOrganizationUnitsCreateError, PostOrganizationUnitsCreateResponse, PostOrganizationUnitsDeleteData, PostOrganizationUnitsDeleteError, PostOrganizationUnitsDeleteResponse, PostOrganizationUnitsUpdateData, PostOrganizationUnitsUpdateError, PostOrganizationUnitsUpdateResponse, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncData, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncError, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncResponse, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncData, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncError, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncResponse, PostOrganizationUnitsAddUserToOrganizationUnitData, PostOrganizationUnitsAddUserToOrganizationUnitError, PostOrganizationUnitsAddUserToOrganizationUnitResponse, PostOrganizationUnitsRemoveUserFromOrganizationUnitData, PostOrganizationUnitsRemoveUserFromOrganizationUnitError, PostOrganizationUnitsRemoveUserFromOrganizationUnitResponse, PostOrganizationUnitsGetUsersData, PostOrganizationUnitsGetUsersError, PostOrganizationUnitsGetUsersResponse, PostOrganizationUnitsGetRolesData, PostOrganizationUnitsGetRolesError, PostOrganizationUnitsGetRolesResponse, PostOrganizationUnitsGetUnAddUsersData, PostOrganizationUnitsGetUnAddUsersError, PostOrganizationUnitsGetUnAddUsersResponse, PostOrganizationUnitsGetUnAddRolesData, PostOrganizationUnitsGetUnAddRolesError, PostOrganizationUnitsGetUnAddRolesResponse, PostPermissionsTreeData, PostPermissionsTreeError, PostPermissionsTreeResponse, PostPermissionsUpdateData, PostPermissionsUpdateError, PostPermissionsUpdateResponse, PostRolesAllError, PostRolesAllResponse, PostRolesPageData, PostRolesPageError, PostRolesPageResponse, PostRolesCreateData, PostRolesCreateError, PostRolesCreateResponse, PostRolesUpdateData, PostRolesUpdateError, PostRolesUpdateResponse, PostRolesDeleteData, PostRolesDeleteError, PostRolesDeleteResponse, GetApiAppAbpProBasicApplicationConfigurationError, GetApiAppAbpProBasicApplicationConfigurationResponse, PostSettingsAllError, PostSettingsAllResponse, PostSettingsUpdateData, PostSettingsUpdateError, PostSettingsUpdateResponse, PostTableModelPacketInfoPageData, PostTableModelPacketInfoPageError, PostTableModelPacketInfoPageResponse, PostTableModelPacketInfoInsertData, PostTableModelPacketInfoInsertError, PostTableModelPacketInfoInsertResponse, PostTableModelPacketInfoBatchInsertData, PostTableModelPacketInfoBatchInsertError, PostTableModelPacketInfoBatchInsertResponse, PostTableModelDeviceDataInfoPageData, PostTableModelDeviceDataInfoPageError, PostTableModelDeviceDataInfoPageResponse, PostTableModelCtWingLogInfoData, PostTableModelCtWingLogInfoError, PostTableModelCtWingLogInfoResponse, PostTableModelOneNetLogInfoData, PostTableModelOneNetLogInfoError, PostTableModelOneNetLogInfoResponse, PostTenantsFindData, PostTenantsFindError, PostTenantsFindResponse, PostTenantsPageData, PostTenantsPageError, PostTenantsPageResponse, PostTenantsCreateData, PostTenantsCreateError, PostTenantsCreateResponse, PostTenantsUpdateData, PostTenantsUpdateError, PostTenantsUpdateResponse, PostTenantsDeleteData, PostTenantsDeleteError, PostTenantsDeleteResponse, PostTenantsPageConnectionStringData, PostTenantsPageConnectionStringError, PostTenantsPageConnectionStringResponse, PostTenantsAddOrUpdateConnectionStringData, PostTenantsAddOrUpdateConnectionStringError, PostTenantsAddOrUpdateConnectionStringResponse, PostTenantsDeleteConnectionStringData, PostTenantsDeleteConnectionStringError, PostTenantsDeleteConnectionStringResponse, PostTextTemplatesPageData, PostTextTemplatesPageError, PostTextTemplatesPageResponse, PostTextTemplatesCreateData, PostTextTemplatesCreateError, PostTextTemplatesCreateResponse, PostTextTemplatesUpdateData, PostTextTemplatesUpdateError, PostTextTemplatesUpdateResponse, PostTextTemplatesDeleteData, PostTextTemplatesDeleteError, PostTextTemplatesDeleteResponse, PostTextTemplatesExportData, PostTextTemplatesExportError, PostTextTemplatesExportResponse, PostTreeModelDeviceDataInfoPageData, PostTreeModelDeviceDataInfoPageError, PostTreeModelDeviceDataInfoPageResponse, PostUsersPageData, PostUsersPageError, PostUsersPageResponse, PostUsersListData, PostUsersListError, PostUsersListResponse, PostUsersExportData, PostUsersExportError, PostUsersExportResponse, PostUsersCreateData, PostUsersCreateError, PostUsersCreateResponse, PostUsersUpdateData, PostUsersUpdateError, PostUsersUpdateResponse, PostUsersDeleteData, PostUsersDeleteError, PostUsersDeleteResponse, PostUsersRoleData, PostUsersRoleError, PostUsersRoleResponse, PostUsersChangePasswordData, PostUsersChangePasswordError, PostUsersChangePasswordResponse, PostUsersResetPasswordData, PostUsersResetPasswordError, PostUsersResetPasswordResponse, PostUsersLockData, PostUsersLockError, PostUsersLockResponse, PostUsersFindByUserNameData, PostUsersFindByUserNameError, PostUsersFindByUserNameResponse, PostUsersMyProfileError, PostUsersMyProfileResponse, PostUsersCanUseTwoFactorError, PostUsersCanUseTwoFactorResponse, PostUsersGetQrCodeError, PostUsersGetQrCodeResponse, PostUsersEnabledTwoFactorData, PostUsersEnabledTwoFactorError, PostUsersEnabledTwoFactorResponse, PostUsersDisabledTwoFactorData, PostUsersDisabledTwoFactorError, PostUsersDisabledTwoFactorResponse, PostUsersResetTwoFactorData, PostUsersResetTwoFactorError, PostUsersResetTwoFactorResponse, PostUsersNeedChangePasswordError, PostUsersNeedChangePasswordResponse } from './types.gen'; export const client = createClient(createConfig()); @@ -655,6 +655,16 @@ export const postOneNetProductModifyAsync = (options?: Options) => { + return (options?.client ?? client).post({ + ...options, + url: '/OneNETProduct/DeleteAsync' + }); +}; + /** * 获取OneNET产品 */ diff --git a/apps/web-antd/src/api-client/types.gen.ts b/apps/web-antd/src/api-client/types.gen.ts index 1fa7966..ca67f5d 100644 --- a/apps/web-antd/src/api-client/types.gen.ts +++ b/apps/web-antd/src/api-client/types.gen.ts @@ -617,7 +617,7 @@ export type DeviceTableModelDataInfoPageOutput = { /** * 系统名称 */ - dataBaseName?: (string) | null; + systemName?: (string) | null; /** * 数据类型 */ @@ -4840,6 +4840,16 @@ export type PostOneNetProductModifyAsyncResponse = (OneNETProductInfoDto); export type PostOneNetProductModifyAsyncError = unknown; +export type PostOneNetProductDeleteAsyncData = { + query?: { + input?: IdInput; + }; +}; + +export type PostOneNetProductDeleteAsyncResponse = (OneNETProductInfoDto); + +export type PostOneNetProductDeleteAsyncError = unknown; + export type PostOneNetProductGetAsyncData = { query?: { input?: IdInput; @@ -5374,4 +5384,4 @@ export type PostUsersResetTwoFactorError = (RemoteServiceErrorResponse); export type PostUsersNeedChangePasswordResponse = (NeedChangePasswordOutput); -export type PostUsersNeedChangePasswordError = (RemoteServiceErrorResponse); +export type PostUsersNeedChangePasswordError = (RemoteServiceErrorResponse); \ No newline at end of file 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 f231b8f..ef4b306 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -267,6 +267,9 @@ "AccountAccesskey": "AccountAccesskey", "ProductCount": "ProductCount", "OneNETAccountId": "OneNETAccountId", + "OneNETProductId": "OneNETProductId", + "ProductKey": "ProductKey", + "ProductSecret": "ProductSecret", "IoTPlatformProductId": "IoTPlatformProductId", "ProductName": "ProductName", "ProductAccesskey": "ProductAccesskey", 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 745ffab..fd8b286 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -269,6 +269,9 @@ "AccountAccesskey": "账户通信密钥", "ProductCount": "产品数量", "OneNETAccountId": "OneNET账户Id", + "OneNETProductId": "OneNET产品Id", + "ProductKey": "产品密钥", + "ProductSecret": "产品密钥", "IoTPlatformProductId": "物联网平台对应的产品Id", "ProductName": "产品名称", "ProductAccesskey": "产品访问密钥", diff --git a/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue b/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue index e466f2c..d8f27b3 100644 --- a/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue +++ b/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue @@ -7,7 +7,7 @@ import { useRouter } from 'vue-router'; import { Page, useVbenModal } from '@vben/common-ui'; -import { message as Message, Modal, Tag } from 'ant-design-vue'; +import { message as Message, Tag } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; @@ -21,16 +21,14 @@ import { TableAction } from '#/components/table-action'; import { $t } from '#/locales'; import { - addUserFormSchema, - editUserFormSchemaEdit, - meterTypeOptions, + addProductFormSchema, + editProductFormSchemaEdit, querySchema, - rateOptions, tableSchema, } from './schema'; defineOptions({ - name: 'AbpUser', + name: 'OneNETProduct', }); const router = useRouter(); @@ -75,7 +73,7 @@ const [UserModal, userModalApi] = useVbenModal({ draggable: true, onConfirm: submit, onBeforeClose: () => { - editRow.value = {}; + // 只在确认提交后重置，而不是每次关闭都重置 return true; }, }); @@ -91,7 +89,7 @@ const [AddForm, addFormApi] = useVbenForm({ }, }, layout: 'horizontal', - schema: addUserFormSchema.value, + schema: addProductFormSchema.value, showCollapseButton: false, showDefaultActions: false, wrapperClass: 'grid-cols-2', @@ -109,7 +107,7 @@ const [EditForm, editFormApi] = useVbenForm({ }, // 提交函数 layout: 'horizontal', - schema: editUserFormSchemaEdit.value, + schema: editProductFormSchemaEdit.value, showCollapseButton: false, showDefaultActions: false, wrapperClass: 'grid-cols-2', @@ -119,7 +117,7 @@ const [EditForm, editFormApi] = useVbenForm({ async function submit() { const isEdit = !!editRow.value.id; const formApi = isEdit ? editFormApi : addFormApi; - const api = isEdit ? postOneNetProductModifyAsync : postOneNetProductInsertAsync; + const api = isEdit ? postOneNetProductModifyAsync : postOneNetProductInsertAsync; const { valid } = await formApi.validate(); if (!valid) return; @@ -128,11 +126,9 @@ async function submit() { ? { id: editRow.value.id, ...formValues, - password: formValues.password || '000000', } : { ...formValues, - password: formValues.password || '000000', }; try { @@ -143,6 +139,7 @@ async function submit() { editRow.value.id ? $t('common.editSuccess') : $t('common.addSuccess'), ); userModalApi.close(); + editRow.value = {}; gridApi.reload(); } else { Message.error( @@ -160,35 +157,25 @@ async function onEdit(record: any) { editFormApi.setValues({ ...record }); } -function onDel(row: any) { - Modal.confirm({ - title: `${$t('common.confirmDelete')}${row.meterName} ?`, - onOk: async () => { - const result = await postOneNetProductDeleteAsync({ body: { id: row.id } }); - if (result) { - gridApi.reload(); - Message.success($t('common.deleteSuccess')); - } else { - Message.error($t('common.deleteFail')); - } - }, - }); -} -const toStatusData = (row: Record) => { - // 或者使用编程式导航 - router.push({ - path: '/iotdb/point', - query: { - DeviceType: row.meterType, - DeviceId: row.meterId, - FocusAddress: row.focusAddress, - }, - }); -}; const openAddModal = async () => { editRow.value = {}; userModalApi.open(); }; + +// 删除函数 +async function onDel(record: any) { + try { + const resp = await postOneNetProductDeleteAsync({ body: { id: record.id } }); + if (resp.data) { + Message.success($t('common.deleteSuccess')); + gridApi.reload(); + } else { + Message.error($t('common.deleteFail')); + } + } catch { + Message.error($t('common.deleteFail')); + } +} - - - - - - - diff --git a/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts b/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts index ff24414..db4734e 100644 --- a/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts +++ b/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts @@ -9,103 +9,37 @@ import { $t } from '#/locales'; export const querySchema = computed(() => [ { component: 'Input', - fieldName: 'meterAddress', - label: $t('abp.meters.meterAddress'), + fieldName: 'productName', + label: $t('abp.OneNETManagement.ProductName'), }, ]); -export const meterTypeOptions = [ - { - label: $t('abp.meters.ElectricityMeter'), - value: 1, - }, - { - label: $t('abp.meters.waterMeter'), - value: 2, - }, - { - label: $t('abp.meters.GasMeter'), - value: 3, - }, - { - label: $t('abp.meters.HeatMeter'), - value: 4, - }, - { - label: $t('abp.meters.WaterMeterFlowmeter'), - value: 5, - }, - { - label: $t('abp.meters.GasMeterFlowmeter'), - value: 6, - }, -]; -export const rateOptions = [ - { - label: $t('abp.meters.MultipleRate'), - value: false, - }, - { - label: $t('abp.meters.SingleRate'), - value: true, - }, -]; + export const tableSchema: any = computed((): VxeGridProps['columns'] => [ { title: $t('common.seq'), type: 'seq', width: 50 }, - { field: 'meterName', title: $t('abp.meters.meterName'), minWidth: '150' }, { - field: 'meterAddress', - title: $t('abp.meters.meterAddress'), + field: 'oneNETProductId', + title: $t('abp.OneNETManagement.OneNETProductId'), minWidth: '150', }, { - field: 'meterType', - title: $t('abp.meters.meterType'), + field: 'productName', + title: $t('abp.OneNETManagement.ProductName'), minWidth: '150', - slots: { default: 'isMeterType' }, }, { - field: 'dynamicPassword', - title: $t('abp.meters.dynamicPassword'), + field: 'productKey', + title: $t('abp.OneNETManagement.ProductKey'), minWidth: '150', - slots: { default: 'isDynamicPassword' }, }, { - field: 'password', - title: $t('abp.meters.password'), - minWidth: '100', + field: 'productSecret', + title: $t('abp.OneNETManagement.ProductSecret'), + minWidth: '150', }, { - field: 'singleRate', - title: $t('abp.meters.singleRate'), + field: 'accountName', + title: $t('abp.OneNETManagement.AccountName'), minWidth: '150', - slots: { default: 'isSingleRate' }, - }, - { - field: 'selfDevelop', - title: $t('abp.meters.selfDevelop'), - minWidth: '150', - slots: { default: 'isSelfDevelop' }, - }, - { field: 'brandType', title: $t('abp.meters.brandType'), minWidth: '150' }, - { - field: 'archiveStatus', - title: $t('abp.meters.archiveStatus'), - minWidth: '150', - slots: { default: 'isArchiveStatus' }, - }, - { - field: 'tripState', - title: $t('abp.meters.tripState'), - minWidth: '150', - slots: { default: 'isTripState' }, - }, - { field: 'timesA', title: $t('abp.meters.timesA'), minWidth: '100' }, - { field: 'timev', title: $t('abp.meters.timev'), minWidth: '100' }, - { - field: 'haveValve', - title: $t('abp.meters.haveValve'), - minWidth: '150', - slots: { default: 'isHaveValve' }, }, { field: 'enabled', @@ -122,321 +56,102 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ }, ]); -export const addUserFormSchema: any = computed(() => [ +export const addProductFormSchema: any = computed(() => [ { component: 'Input', - fieldName: 'meterName', - label: $t('abp.meters.meterName'), + fieldName: 'oneNETProductId', + label: $t('abp.OneNETManagement.OneNETProductId'), rules: z.string().min(1, { - message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.meters.meterName')}`, + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.OneNETProductId')}`, }), }, { component: 'Input', - fieldName: 'meterAddress', - label: $t('abp.meters.meterAddress'), - rules: z - .string() - .min(1, { - message: `${$t('common.pleaseInput')}${$t('common.numberType')}${$t('abp.meters.meterAddress')}`, - }) - .refine((value) => /^\d+$/.test(value), { - message: $t('abp.meters.checkmeterAddress'), - }), + fieldName: 'productName', + label: $t('abp.OneNETManagement.ProductName'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductName')}`, + }), }, { - component: 'Select', - componentProps: { - allowClear: true, - options: meterTypeOptions, - placeholder: `${$t('common.pleaseSelect')}${$t('abp.meters.meterType')}`, - }, - fieldName: 'meterType', - label: $t('abp.meters.meterType'), - rules: z - .number() - .min(1, { - message: `${$t('common.pleaseSelect')}${$t('abp.meters.meterType')}`, - }) - .default(1), + component: 'Input', + fieldName: 'productKey', + label: $t('abp.OneNETManagement.ProductKey'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductKey')}`, + }), }, { - component: 'Select', - componentProps: { - allowClear: true, - options: rateOptions, - placeholder: `${$t('common.pleaseSelect')}${$t('abp.meters.singleRate')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - rules(values: any) { - if (values.meterType === 1) { - return 'required'; - } - return null; - }, - triggerFields: ['meterType'], - }, - fieldName: 'singleRate', - label: $t('abp.meters.singleRate'), + component: 'Input', + fieldName: 'productSecret', + label: $t('abp.OneNETManagement.ProductSecret'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductSecret')}`, + }), + }, + { + component: 'Input', + fieldName: 'accountName', + label: $t('abp.OneNETManagement.AccountName'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.AccountName')}`, + }), }, { component: 'Switch', componentProps: { class: 'w-auto', }, - fieldName: 'selfDevelop', - label: $t('abp.meters.selfDevelop'), - }, - { - component: 'Input', - fieldName: 'brandType', - label: $t('abp.meters.brandType'), - rules: z.string().optional(), - }, - { - component: 'Switch', - componentProps: { - class: 'w-auto', - }, - fieldName: 'dynamicPassword', - label: $t('abp.meters.dynamicPassword'), - }, - { - component: 'Input', - fieldName: 'password', - label: $t('abp.meters.password'), - rules: z.string().optional(), - }, - { - component: 'Switch', - componentProps: { - class: 'w-auto', - }, - dependencies: { - show(values: any) { - return values.meterType === 2; - }, - triggerFields: ['meterType'], - }, - fieldName: 'haveValve', - label: $t('abp.meters.haveValve'), - }, - { - component: 'Input', - fieldName: 'timesA', - label: $t('abp.meters.timesA'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.timesA')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - triggerFields: ['meterType'], - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.timesA')}`, - }) - .default('1'), - }, - { - component: 'Input', - fieldName: 'timev', - label: $t('abp.meters.timev'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.timev')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - triggerFields: ['meterType'], - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.timesA')}`, - }) - .default('1'), - }, - { - component: 'Input', - fieldName: 'meteringCode', - label: $t('abp.meters.meteringCode'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.meteringCode')}`, - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.meteringCode')}`, - }) - .default('1'), + fieldName: 'enabled', + label: $t('common.isEnable'), }, ]); -export const editUserFormSchemaEdit: any = computed(() => [ +export const editProductFormSchemaEdit: any = computed(() => [ { component: 'Input', - fieldName: 'meterName', - label: $t('abp.meters.meterName'), + fieldName: 'oneNETProductId', + label: $t('abp.OneNETManagement.OneNETProductId'), + disabled: true, + }, + { + component: 'Input', + fieldName: 'productName', + label: $t('abp.OneNETManagement.ProductName'), rules: z.string().min(1, { - message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.meters.meterName')}`, + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductName')}`, }), }, { component: 'Input', - fieldName: 'meterAddress', - label: $t('abp.meters.meterAddress'), - rules: z - .string() - .min(1, { - message: `${$t('common.pleaseInput')}${$t('common.numberType')}${$t('abp.meters.meterAddress')}`, - }) - .refine((value) => /^\d+$/.test(value), { - message: $t('abp.meters.checkmeterAddress'), - }), + fieldName: 'productKey', + label: $t('abp.OneNETManagement.ProductKey'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductKey')}`, + }), }, { - component: 'Select', - componentProps: { - allowClear: true, - options: meterTypeOptions, - placeholder: `${$t('common.pleaseSelect')}${$t('abp.meters.meterType')}`, - }, - fieldName: 'meterType', - label: $t('abp.meters.meterType'), - rules: z - .number() - .min(1, { - message: `${$t('common.pleaseSelect')}${$t('abp.meters.meterType')}`, - }) - .default(1), + component: 'Input', + fieldName: 'productSecret', + label: $t('abp.OneNETManagement.ProductSecret'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.ProductSecret')}`, + }), }, { - component: 'Select', - componentProps: { - allowClear: true, - options: rateOptions, - placeholder: `${$t('common.pleaseSelect')}${$t('abp.meters.singleRate')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - rules(values: any) { - if (values.meterType === 1) { - return 'required'; - } - return null; - }, - triggerFields: ['meterType'], - }, - fieldName: 'singleRate', - label: $t('abp.meters.singleRate'), + component: 'Input', + fieldName: 'accountName', + label: $t('abp.OneNETManagement.AccountName'), + rules: z.string().min(1, { + message: `${$t('common.pleaseInput')}${$t('common.info')}${$t('abp.OneNETManagement.AccountName')}`, + }), }, { component: 'Switch', componentProps: { class: 'w-auto', }, - fieldName: 'selfDevelop', - label: $t('abp.meters.selfDevelop'), - }, - { - component: 'Input', - fieldName: 'brandType', - label: $t('abp.meters.brandType'), - rules: z.string().optional(), - }, - { - component: 'Switch', - componentProps: { - class: 'w-auto', - }, - fieldName: 'dynamicPassword', - label: $t('abp.meters.dynamicPassword'), - }, - { - component: 'Input', - fieldName: 'password', - label: $t('abp.meters.password'), - rules: z.string().optional(), - }, - { - component: 'Switch', - componentProps: { - class: 'w-auto', - }, - dependencies: { - show(values: any) { - return values.meterType === 2; - }, - triggerFields: ['meterType'], - }, - fieldName: 'haveValve', - label: $t('abp.meters.haveValve'), - }, - { - component: 'Input', - fieldName: 'timesA', - label: $t('abp.meters.timesA'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.timesA')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - triggerFields: ['meterType'], - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.timesA')}`, - }) - .default('1'), - }, - { - component: 'Input', - fieldName: 'timev', - label: $t('abp.meters.timev'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.timev')}`, - }, - dependencies: { - show(values: any) { - return values.meterType === 1; - }, - triggerFields: ['meterType'], - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.timev')}`, - }) - .default('1'), - }, - { - component: 'Input', - fieldName: 'meteringCode', - label: $t('abp.meters.meteringCode'), - componentProps: { - allowClear: true, - placeholder: `${$t('common.pleaseInput')}${$t('abp.meters.meteringCode')}`, - }, - rules: z - .string({ - message: `${$t('common.pleaseInput')}${$t('abp.meters.meteringCode')}`, - }) - .min(1, { - message: `${$t('common.MustGreaterTthan0')}`, - }) - .default('1'), + fieldName: 'enabled', + label: $t('common.isEnable'), }, ]);