From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index fb73532..de9b405 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/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)
{
--
Gitblit v1.8.0