重构设备操作界面

apps/web-antd/src/api-client/schemas.gen.ts

@@ -750,6 +750,10 @@ export const CTWingAccountListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         phoneNumber: {
             type: 'string',
             description: '手机号码',
@@ -1091,6 +1095,10 @@ export const CTWingPrivateProductInfoListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ctWingAccountId: {
             type: 'string',
             description: 'CTWing账户Id',
@@ -2238,6 +2246,10 @@ export const DeviceTableModelDataInfoPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTDataType: {
             type: 'string',
             description: `数据类型，用于构建存储路径
@@ -2528,6 +2540,10 @@ export const DeviceThingModelCommandInfoPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         deviceThingModelId: {
             type: 'string',
             description: '设备端物模型Id',
@@ -2550,10 +2566,6 @@ export const DeviceThingModelCommandInfoPageInputSchema = {
             type: 'string',
             description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst',
             nullable: true
-        },
-        isPage: {
-            type: 'boolean',
-            description: '是否分页'
         }
     },
     additionalProperties: false,
@@ -2793,6 +2805,10 @@ export const DeviceThingModelPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTPlatform: {
             '$ref': '#/components/schemas/IoTPlatformTypeEnum'
         },
@@ -2810,10 +2826,6 @@ export const DeviceThingModelPageInputSchema = {
             type: 'string',
             description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst',
             nullable: true
-        },
-        isPage: {
-            type: 'boolean',
-            description: '是否分页'
         }
     },
     additionalProperties: false
@@ -3070,6 +3082,10 @@ export const DeviceThingModelPropertyPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         deviceThingModelId: {
             type: 'string',
             description: '设备端物模型Id',
@@ -3092,10 +3108,6 @@ export const DeviceThingModelPropertyPageInputSchema = {
             type: 'string',
             description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst',
             nullable: true
-        },
-        isPage: {
-            type: 'boolean',
-            description: '是否分页'
         }
     },
     additionalProperties: false,
@@ -3236,6 +3248,10 @@ export const DeviceTreeModelDataInfoInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTDataType: {
             type: 'string',
             description: `数据类型，用于构建存储路径
@@ -4431,6 +4447,10 @@ export const GetOrganizationUnitRoleInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         organizationUnitId: {
             type: 'string',
             format: 'uuid'
@@ -4499,6 +4519,10 @@ export const GetOrganizationUnitUserInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         organizationUnitId: {
             type: 'string',
             format: 'uuid'
@@ -4608,6 +4632,10 @@ export const GetUnAddRoleInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         organizationUnitId: {
             type: 'string',
             format: 'uuid'
@@ -4680,6 +4708,10 @@ export const GetUnAddUserInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         organizationUnitId: {
             type: 'string',
             format: 'uuid'
@@ -5576,6 +5608,10 @@ export const IoTPlatformThingModelPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTPlatform: {
             '$ref': '#/components/schemas/IoTPlatformTypeEnum'
         },
@@ -5899,6 +5935,10 @@ export const MeterReadingPacketInfoPageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTDataType: {
             type: 'string',
             description: `数据类型，用于构建存储路径
@@ -6704,6 +6744,10 @@ export const OneNetAccountListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         phoneNumber: {
             type: 'string',
             description: '手机号码',
@@ -6817,6 +6861,10 @@ export const OneNetProductInfoListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         oneNETAccountId: {
             type: 'string',
             description: 'OneNET账户Id',
@@ -6948,6 +6996,10 @@ export const PageDeviceInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         deviceAddress: {
             type: 'string',
             description: '设备地址',
@@ -7002,6 +7054,10 @@ export const PageFileObjectInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         startCreationTime: {
             type: 'string',
             description: '开始创建时间',
@@ -7237,6 +7293,10 @@ export const PageLanguageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         filter: {
             type: 'string',
             nullable: true
@@ -7337,6 +7397,10 @@ export const PageLanguageTextInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         cultureName: {
             type: 'string',
             description: '语言',
@@ -7425,6 +7489,10 @@ export const PageMenuInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         startCreationTime: {
             type: 'string',
             description: '开始创建时间',
@@ -7650,6 +7718,10 @@ export const PageTextTemplateInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         name: {
             type: 'string',
             description: '名称',
@@ -7810,6 +7882,10 @@ export const PagingAuditLogInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         startTime: {
             type: 'string',
             description: '开始时间',
@@ -8029,6 +8105,10 @@ export const PagingDataDictionaryDetailInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         dataDictionaryId: {
             type: 'string',
             format: 'uuid'
@@ -8131,6 +8211,10 @@ export const PagingDataDictionaryInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         filter: {
             type: 'string',
             nullable: true
@@ -8294,6 +8378,10 @@ export const PagingIdentitySecurityLogInputSchema = {
             format: 'int32',
             readOnly: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         sorting: {
             type: 'string',
             description: '排序',
@@ -8456,6 +8544,10 @@ export const PagingNotificationInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         title: {
             type: 'string',
             description: '标题',
@@ -8640,6 +8732,10 @@ export const PagingNotificationSubscriptionInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         notificationId: {
             type: 'string',
             format: 'uuid'
@@ -8798,6 +8894,10 @@ export const PagingRoleListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         filter: {
             type: 'string',
             nullable: true
@@ -8833,6 +8933,10 @@ export const PagingTenantInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         filter: {
             type: 'string',
             nullable: true
@@ -8868,6 +8972,10 @@ export const PagingUserListInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         filter: {
             type: 'string',
             description: '关键字',
@@ -9082,6 +9190,10 @@ export const QueryCTWingAepReceiveMessageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTDataType: {
             type: 'string',
             description: `数据类型，用于构建存储路径
@@ -9295,6 +9407,10 @@ export const QueryOneNETReceiveMessageInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         ioTDataType: {
             type: 'string',
             description: `数据类型，用于构建存储路径
@@ -9696,6 +9812,10 @@ export const SelectDataDictionaryDetailInputSchema = {
 </example>`,
             nullable: true
         },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
         dataDictionaryId: {
             type: 'string',
             format: 'uuid'

apps/web-antd/src/api-client/types.gen.ts

@@ -622,6 +622,10 @@ export type CTWingAccountListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 手机号码
      */
@@ -848,6 +852,10 @@ export type CTWingPrivateProductInfoListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * CTWing账户Id
      */
@@ -1238,6 +1246,10 @@ export type DeviceTableModelDataInfoPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 数据类型，用于构建存储路径
      * JiShe.ServicePro.Consts.IoTDBDataTypeConst
@@ -1417,6 +1429,10 @@ export type DeviceThingModelCommandInfoPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 设备端物模型Id
      */
@@ -1434,10 +1450,6 @@ export type DeviceThingModelCommandInfoPageInput = {
      * 物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst
      */
     filedType?: (string) | null;
-    /**
-     * 是否分页
-     */
-    isPage?: boolean;
 };
 
 /**
@@ -1577,6 +1589,10 @@ export type DeviceThingModelPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     ioTPlatform?: IoTPlatformTypeEnum;
     /**
      * 搜索关键字
@@ -1590,10 +1606,6 @@ export type DeviceThingModelPageInput = {
      * 物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst
      */
     filedType?: (string) | null;
-    /**
-     * 是否分页
-     */
-    isPage?: boolean;
 };
 
 /**
@@ -1757,6 +1769,10 @@ export type DeviceThingModelPropertyPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 设备端物模型Id
      */
@@ -1774,10 +1790,6 @@ export type DeviceThingModelPropertyPageInput = {
      * 物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst
      */
     filedType?: (string) | null;
-    /**
-     * 是否分页
-     */
-    isPage?: boolean;
 };
 
 /**
@@ -1876,6 +1888,10 @@ export type DeviceTreeModelDataInfoInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 数据类型，用于构建存储路径
      * JiShe.ServicePro.Consts.IoTDBDataTypeConst
@@ -2321,6 +2337,10 @@ export type GetOrganizationUnitRoleInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     organizationUnitId?: string;
 };
 
@@ -2354,6 +2374,10 @@ export type GetOrganizationUnitUserInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     organizationUnitId?: string;
     filter?: (string) | null;
 };
@@ -2405,6 +2429,10 @@ export type GetUnAddRoleInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     organizationUnitId?: string;
     filter?: (string) | null;
 };
@@ -2439,6 +2467,10 @@ export type GetUnAddUserInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     organizationUnitId?: string;
     filter?: (string) | null;
 };
@@ -2828,6 +2860,10 @@ export type IoTPlatformThingModelPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     ioTPlatform?: IoTPlatformTypeEnum;
     /**
      * 搜索关键字
@@ -3040,6 +3076,10 @@ export type MeterReadingPacketInfoPageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 数据类型，用于构建存储路径
      * JiShe.ServicePro.Consts.IoTDBDataTypeConst
@@ -3369,6 +3409,10 @@ export type OneNetAccountListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 手机号码
      */
@@ -3589,6 +3633,10 @@ export type OneNetProductInfoListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * OneNET账户Id
      */
@@ -3688,6 +3736,10 @@ export type PageDeviceInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 设备地址
      */
@@ -3730,6 +3782,10 @@ export type PageFileObjectInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 开始创建时间
      */
@@ -3837,6 +3893,10 @@ export type PageLanguageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     filter?: (string) | null;
 };
 
@@ -3906,6 +3966,10 @@ export type PageLanguageTextInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 语言
      */
@@ -3966,6 +4030,10 @@ export type PageMenuInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 开始创建时间
      */
@@ -4110,6 +4178,10 @@ export type PageTextTemplateInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 名称
      */
@@ -4201,6 +4273,10 @@ export type PagingAuditLogInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 开始时间
      */
@@ -4301,6 +4377,10 @@ export type PagingDataDictionaryDetailInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     dataDictionaryId?: string;
     filter?: (string) | null;
 };
@@ -4362,6 +4442,10 @@ export type PagingDataDictionaryInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     filter?: (string) | null;
 };
 
@@ -4425,6 +4509,10 @@ export type PagingIdentitySecurityLogInput = {
      * 跳过多少条
      */
     readonly skipCount?: number;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 排序
      */
@@ -4505,6 +4593,10 @@ export type PagingNotificationInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 标题
      */
@@ -4617,6 +4709,10 @@ export type PagingNotificationSubscriptionInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     notificationId?: string;
     /**
      * 接受者Id
@@ -4713,6 +4809,10 @@ export type PagingRoleListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     filter?: (string) | null;
 };
 
@@ -4736,6 +4836,10 @@ export type PagingTenantInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     filter?: (string) | null;
 };
 
@@ -4759,6 +4863,10 @@ export type PagingUserListInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 关键字
      */
@@ -4846,6 +4954,10 @@ export type QueryCTWingAepReceiveMessageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 数据类型，用于构建存储路径
      * JiShe.ServicePro.Consts.IoTDBDataTypeConst
@@ -5002,6 +5114,10 @@ export type QueryOneNETReceiveMessageInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     /**
      * 数据类型，用于构建存储路径
      * JiShe.ServicePro.Consts.IoTDBDataTypeConst
@@ -5213,6 +5329,10 @@ export type SelectDataDictionaryDetailInput = {
      * </example>
      */
     sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
     dataDictionaryId?: string;
     filter?: (string) | null;
     typeCode?: (string) | null;

apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts

@@ -193,7 +193,7 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     title: $t('common.action'),
     field: 'action',
     fixed: 'right',
-    width: '280',
+    width: '260',
     slots: { default: 'action' },
   },
 ]);
@@ -330,20 +330,22 @@ export const addDeviceFormSchema: any = computed(() => [
       const accountId = formValues?.ioTPlatformAccountId;
 
       return {
-        api: platform && accountId
+        api:
-          ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
+          platform && accountId
-          : null,
+            ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
-        params: platform && accountId
+            : null,
-          ? {
+        params:
-              body: {
+          platform && accountId
-                ioTPlatformType:
+            ? {
-                  typeof platform === 'string'
+                body: {
-                    ? Number.parseInt(platform)
+                  ioTPlatformType:
-                    : platform,
+                    typeof platform === 'string'
-                ioTPlatformAccount: accountId,
+                      ? Number.parseInt(platform)
-              },
+                      : platform,
-            }
+                  ioTPlatformAccount: accountId,
-          : {},
+                },
+              }
+            : {},
         labelField: 'productName',
         valueField: 'ioTPlatformProductId',
         optionsPropName: 'options',
@@ -586,20 +588,22 @@ export const editDeviceFormSchemaEdit: any = computed(() => [
       const accountId = formValues?.ioTPlatformAccountId;
 
       return {
-        api: platform && accountId
+        api:
-          ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
+          platform && accountId
-          : null,
+            ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
-        params: platform && accountId
+            : null,
-          ? {
+        params:
-              body: {
+          platform && accountId
-                ioTPlatformType:
+            ? {
-                  typeof platform === 'string'
+                body: {
-                    ? Number.parseInt(platform)
+                  ioTPlatformType:
-                    : platform,
+                    typeof platform === 'string'
-                ioTPlatformAccount: accountId,
+                      ? Number.parseInt(platform)
-              },
+                      : platform,
-            }
+                  ioTPlatformAccount: accountId,
-          : {},
+                },
+              }
+            : {},
         labelField: 'productName',
         valueField: 'ioTPlatformProductId',
         optionsPropName: 'options',
@@ -784,20 +788,22 @@ export const batchAddDeviceFormSchema: any = computed(() => [
       const accountId = formValues?.ioTPlatformAccountId;
 
       return {
-        api: platform && accountId
+        api:
-          ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
+          platform && accountId
-          : null,
+            ? postAggregationIoTplatformGetIoTplatformProductInfoAsync
-        params: platform && accountId
+            : null,
-          ? {
+        params:
-              body: {
+          platform && accountId
-                ioTPlatformType:
+            ? {
-                  typeof platform === 'string'
+                body: {
-                    ? Number.parseInt(platform)
+                  ioTPlatformType:
-                    : platform,
+                    typeof platform === 'string'
-                ioTPlatformAccount: accountId,
+                      ? Number.parseInt(platform)
-              },
+                      : platform,
-            }
+                  ioTPlatformAccount: accountId,
-          : {},
+                },
+              }
+            : {},
         labelField: 'productName',
         valueField: 'ioTPlatformProductId',
         optionsPropName: 'options',