diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/dataManger/deviceData/index.vue index f915860..8711c43 100644 --- a/apps/web-antd/src/views/dataManger/deviceData/index.vue +++ b/apps/web-antd/src/views/dataManger/deviceData/index.vue @@ -165,9 +165,9 @@ const gridOptions: VxeGridProps = { ? Number(deviceTypeValue) : undefined; - const ioTDataTypeValue = formValues.IoTDataType; + const ioTDataTypeValue = formValues.IoTDataType; - console.log('=== API调用开始 ===2', ioTDataTypeValue); + console.log('=== API调用开始 ===2', ioTDataTypeValue); // 处理DeviceId,当设备类型为集中器(10)时,使用focusId let finalDeviceId = 0; @@ -184,8 +184,8 @@ const gridOptions: VxeGridProps = { pageSize: page.pageSize, // 优先使用表单中的值,如果没有则使用路由参数 DeviceType: deviceTypeNumber, - DeviceId: finalDeviceId, - FocusAddress: formValues.FocusAddress || FocusAddress, + DeviceId: finalDeviceId.toString(), + FocusAddress: deviceInfo.focusAddress, // 添加其他表单参数 SystemName: formValues.SystemName, IoTDataType: ioTDataTypeValue,