20201218-2

wei

2020-12-19 c5a873df96e4a797426e4dd5eafe5b43f7aea564

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs

old mode 100644
new mode 100755
@@ -3,6 +3,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
using HDL_ON.DAL.Server;

namespace HDL_ON.UI
{
@@ -641,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)
                {
@@ -892,7 +893,7 @@
//                    });
//#endif

                    foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
                    foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
                    {
                        if (sr.functionType != sensor.functionType)
                        {
@@ -903,13 +904,13 @@
                            i++;
                            continue;
                        }
                        var revertObj = new DAL.Server.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)
                        {
                            if (revertObj.StateCode == "SUCCESS")
                            if (revertObj.StateCode == StateCode.SUCCESS)
                            {
                                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>>(revertObj.ResponseData.ToString());