修改代码

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

@@ -3148,6 +3148,7 @@ export const postTreeModelDeviceDataInfoPage = <
     ThrowOnError
   >({
     ...options,
+    ...formDataBodySerializer,
     url: '/TreeModel/DeviceDataInfoPage',
   });
 };
@@ -3180,6 +3181,7 @@ export const postOneNETLogInfoPage = <ThrowOnError extends boolean = false>(
     ThrowOnError
   >({
     ...options,
+    ...formDataBodySerializer,
     url: '/TableModel/OneNETLogInfo',
   });
 };
@@ -3196,6 +3198,7 @@ export const postCTWingLogInfoPage = <ThrowOnError extends boolean = false>(
     ThrowOnError
   >({
     ...options,
+    ...formDataBodySerializer,
     url: '/TableModel/CTWingLogInfo',
   });
 };

apps/web-antd/src/views/dataManger/ctwingLog/index.vue

@@ -38,14 +38,26 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
-        const { data } = await postCTWingLogInfoPage({
+        // 构建查询参数
+        const queryParams: any = {
           pageIndex: page.currentPage,
           pageSize: page.pageSize,
-          DeviceType,
+        };
-          DeviceId,
+
-          FocusAddress,
+        // 如果有表单值，添加到查询参数中
-          ...formValues,
+        if (formValues) {
+          Object.assign(queryParams, formValues);
+        }
+
+        // 添加路由参数
+        if (DeviceType) queryParams.DeviceType = DeviceType;
+        if (DeviceId) queryParams.DeviceId = DeviceId;
+        if (FocusAddress) queryParams.FocusAddress = FocusAddress;
+
+        const { data } = await postCTWingLogInfoPage({
+          body: queryParams,
         });
+        
         // 确保返回的数据包含totalCount字段
         const result = {
           items: data.items || [],

apps/web-antd/src/views/dataManger/deviceData/index.vue

@@ -172,28 +172,20 @@ const gridOptions: VxeGridProps<any> = {
 
         // 处理DeviceId，当设备类型为集中器(10)时，使用focusId
         let finalDeviceId = formValues.DeviceId || DeviceId;
+        let finalFocusAddress = formValues.FocusAddress;
         if (formValues.DeviceId) {
           const deviceInfo = getDeviceInfoById(formValues.DeviceId);
           if (deviceInfo) {
+            finalFocusAddress = deviceInfo.focusAddress;
             if (deviceTypeNumber === 10) {
               // 集中器类型使用focusId
               if (deviceInfo.focusId) {
                 finalDeviceId = deviceInfo.focusId;
-                console.log('设备类型为集中器，使用focusId:', {
-                  originalDeviceId: formValues.DeviceId,
-                  focusId: deviceInfo.focusId,
-                  deviceInfo: deviceInfo,
-                });
               }
             } else {
               // 其他设备类型使用meterId
               if (deviceInfo.meterId) {
                 finalDeviceId = deviceInfo.meterId;
-                console.log('设备类型为非集中器，使用meterId:', {
-                  originalDeviceId: formValues.DeviceId,
-                  meterId: deviceInfo.meterId,
-                  deviceInfo: deviceInfo,
-                });
               }
             }
           }
@@ -205,8 +197,8 @@ const gridOptions: VxeGridProps<any> = {
               pageSize: page.pageSize,
               // 优先使用表单中的值，如果没有则使用路由参数
               DeviceType: deviceTypeNumber,
-              DeviceId: finalDeviceId,
+              DeviceId: finalDeviceId.toString(),
-              FocusAddress: formValues.FocusAddress || FocusAddress,
+              FocusAddress: finalFocusAddress || FocusAddress,
               // 添加其他表单参数
               SystemName: formValues.SystemName || SystemName,
               IoTDataType: ioTDataTypeValue,

apps/web-antd/src/views/dataManger/onenetLog/index.vue

@@ -38,14 +38,26 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
-        const { data } = await postOneNETLogInfoPage({
+        // 构建查询参数
+        const queryParams: any = {
           pageIndex: page.currentPage,
           pageSize: page.pageSize,
-          DeviceType,
+        };
-          DeviceId,
+
-          FocusAddress,
+        // 如果有表单值，添加到查询参数中
-          ...formValues,
+        if (formValues) {
+          Object.assign(queryParams, formValues);
+        }
+
+        // 添加路由参数
+        if (DeviceType) queryParams.DeviceType = DeviceType;
+        if (DeviceId) queryParams.DeviceId = DeviceId;
+        if (FocusAddress) queryParams.FocusAddress = FocusAddress;
+
+        const { data } = await postOneNETLogInfoPage({
+          body: queryParams,
         });
+        
         // 确保返回的数据包含totalCount字段
         const result = {
           items: data.items || [],