修复bug

This commit is contained in:
ChenYi 2025-07-14 15:28:20 +08:00
parent a5781829e9
commit a532440685

View File

@ -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,
FocusAddress: formValues.FocusAddress || FocusAddress,
DeviceId: finalDeviceId.toString(),
FocusAddress: finalFocusAddress || FocusAddress,
//
SystemName: formValues.SystemName || SystemName,
IoTDataType: ioTDataTypeValue,