From 0e7881aa010ff350d04895a0687ffb7d5ca46168 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 13:09:16 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 89cd0cb..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)
{
@@ -906,7 +906,7 @@
}
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);
+ DB_ResidenceData.Instance.residenceGatewayMAC);
if (revertObj != null)
{
--
Gitblit v1.8.0