From 7961e3a75a2180778706ce45eb6152c2a2ca392b Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 16 十二月 2020 19:41:25 +0800 Subject: [PATCH] 2020-12-16 1.成员取消收藏按钮显示 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs index 0cf683f..c382507 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) { @@ -904,9 +904,9 @@ i++; 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); + var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID, + 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.loopId, curMonth, + DB_ResidenceData.Instance.residenceGatewayMAC); if (revertObj != null) { -- Gitblit v1.8.0