wxr
2020-08-11 2bec9c838d2d688025698de8ec1de401ffd7dd1f
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -115,7 +115,7 @@
                TextColor = CSS_Color.PromptingColor2,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = StringId.month,
                Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Month);
            #endregion
@@ -840,17 +840,12 @@
                        curMonth = DateTime.Now.Month;
                    }
                    int i = 0;
                    foreach (var tempSensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
                    foreach (var sr in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
                    {
                        if (tempSensor.sid == sensor.sid)
                        if (sr.functionType != sensor.functionType)
                        {
                            continue;
                        }
                        if (tempSensor.functionType != sensor.functionType)
                        {
                            continue;
                        }
                        var sr = DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience[i];
                        if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
                        {
                            i++;
@@ -884,10 +879,18 @@
                                int ass = 0;
                                for (int j = 0; j < revertData.Count; j++)
                                {
                                    if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day )
                                    {
                                        continue;
                                    }
                                    if (revertData[j].TargetValue.ToString() != "NaN")
                                    {
                                        ass = Convert.ToInt32(revertData[j].TargetValue);
                                    }
                                    else
                                    {
                                        ass = 0;
                                    }
                                    sItem.data.Add(ass);
                                    switch (curQueryType)
                                    {