From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 15 十二月 2020 12:04:42 +0800 Subject: [PATCH] 2020-12-15-1 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs index 0cf683f..15307dc 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs @@ -642,7 +642,7 @@ bool initTitleButton = true; - foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience) + foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience) { if (tempSensor.sid == sensor.sid) { @@ -893,7 +893,7 @@ // }); //#endif - foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience) + foreach (var sr in FunctionList.List.sensorsEnvironmentalScience) { if (sr.functionType != sensor.functionType) { @@ -905,8 +905,8 @@ continue; } var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID, - 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.LoopID, curMonth, - DB_ResidenceData.residenceData.residenceGatewayMAC); + 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.loopId, curMonth, + DB_ResidenceData.Instance.residenceGatewayMAC); if (revertObj != null) { -- Gitblit v1.8.0