From 598f0d8399304b97376c65ce85abe670f118744d Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 14 Jul 2025 09:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataManger/deviceData/index.vue | 64 +++----------------
 .../src/views/dataManger/deviceData/schema.ts |  4 +-
 2 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/dataManger/deviceData/index.vue
index 50de69b..f915860 100644
--- a/apps/web-antd/src/views/dataManger/deviceData/index.vue
+++ b/apps/web-antd/src/views/dataManger/deviceData/index.vue
@@ -165,61 +165,17 @@ const gridOptions: VxeGridProps<any> = {
           ? Number(deviceTypeValue)
           : undefined;
 
-        const ioTDataTypeValue = formValues.IoTDataType;
-        const ioTDataTypeNumber = ioTDataTypeValue
-          ? Number(ioTDataTypeValue)
-          : undefined;
+        const ioTDataTypeValue = formValues.IoTDataType; 
+
+        console.log('=== API调用开始 ===2', ioTDataTypeValue); 
 
         // 处理DeviceId，当设备类型为集中器(10)时，使用focusId
-        let finalDeviceId = formValues.DeviceId || DeviceId;
-        if (deviceTypeNumber === 10 && formValues.DeviceId) {
-          const deviceInfo = getDeviceInfoById(formValues.DeviceId);
-          if (deviceInfo && deviceInfo.focusId) {
-            finalDeviceId = deviceInfo.focusId;
-            console.log('设备类型为集中器，使用focusId:', {
-              originalDeviceId: formValues.DeviceId,
-              focusId: deviceInfo.focusId,
-              deviceInfo,
-            });
-          }
-        }
-
-        console.log('请求参数:', {
-          page,
-          formValues,
-          routeParams: { DeviceType, DeviceId, FocusAddress },
-          typeConversions: {
-            deviceType: {
-              originalValue: deviceTypeValue,
-              convertedValue: deviceTypeNumber,
-              type: typeof deviceTypeNumber,
-            },
-            ioTDataType: {
-              originalValue: ioTDataTypeValue,
-              convertedValue: ioTDataTypeNumber,
-              type: typeof ioTDataTypeNumber,
-            },
-            deviceId: {
-              originalValue: formValues.DeviceId || DeviceId,
-              finalValue: finalDeviceId,
-              isFocusId:
-                deviceTypeNumber === 10 &&
-                formValues.DeviceId &&
-                getDeviceInfoById(formValues.DeviceId)?.focusId,
-            },
-          },
-          finalParams: {
-            ...formValues,
-            pageIndex: page.currentPage,
-            pageSize: page.pageSize,
-            DeviceType: deviceTypeNumber,
-            DeviceId: finalDeviceId,
-            FocusAddress: formValues.FocusAddress || FocusAddress,
-            SystemName: formValues.SystemName,
-            IoTDataType: ioTDataTypeNumber,
-          },
-        });
-
+        let finalDeviceId = 0;
+        const deviceInfo = getDeviceInfoById(formValues.DeviceId);
+        finalDeviceId =
+          deviceTypeNumber === 10 && deviceInfo
+            ? deviceInfo.focusId
+            : deviceInfo.meterId;
         try {
           const { data } = await postTreeModelDeviceDataInfoPage({
             body: {
@@ -232,7 +188,7 @@ const gridOptions: VxeGridProps<any> = {
               FocusAddress: formValues.FocusAddress || FocusAddress,
               // 添加其他表单参数
               SystemName: formValues.SystemName,
-              IoTDataType: ioTDataTypeNumber,
+              IoTDataType: ioTDataTypeValue,
             },
           });
 
diff --git a/apps/web-antd/src/views/dataManger/deviceData/schema.ts b/apps/web-antd/src/views/dataManger/deviceData/schema.ts
index 0bc20c1..fae0742 100644
--- a/apps/web-antd/src/views/dataManger/deviceData/schema.ts
+++ b/apps/web-antd/src/views/dataManger/deviceData/schema.ts
@@ -50,8 +50,8 @@ export const querySchema = computed(() => [
           TypeName: 'MeterTypeEnum',
         },
       },
-      labelField: 'secondValue',
-      valueField: 'value',
+      labelField: 'value',
+      valueField: 'key',
       optionsPropName: 'options',
       immediate: true,
       afterFetch: (res: any) => {