From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 5adc74f..de2bdaa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -26,6 +26,7 @@
Function function;
List<Function> showFunctions;
+ List<Function> sensorList;
/// <summary>
/// 褰撳墠鏌ヨ绫诲瀷
/// </summary>
@@ -45,6 +46,17 @@
{
bodyView = this;
function = ss;
+ showFunctions = new List<Function>();
+ showFunctions.Add(ss);
+ sensorList = FunctionList.List.GetEnvirSensorsList();
+ }
+
+
+ public EnvironmentalSensorPage(Function ss,List<Function> functions)
+ {
+ bodyView = this;
+ function = ss;
+ sensorList = functions;
showFunctions = new List<Function>();
showFunctions.Add(ss);
}
@@ -118,7 +130,7 @@
TextColor = CSS_Color.PromptingColor2,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
+ Text = Language.StringByID(StringId.month),//DateTime.Now.Month.ToString() +
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
#endregion
@@ -644,9 +656,8 @@
bool initTitleButton = true;
- var tempList = FunctionList.List.GetEnvirSensorsList();
- foreach (var tempSensor in tempList)
+ foreach (var tempSensor in sensorList)
{
if (tempSensor.sid == function.sid)
{
@@ -850,7 +861,11 @@
}
var sensorType = sr.spk.Split(".")[1];
- var queryType = sr.GetAttrState("spk")==null? "value": sr.GetAttrState("spk");
+ var queryType = sr.GetAttrState("spk").ToString();
+ if(queryType == "0")
+ {
+ queryType = "value";
+ }
var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, queryType);
if (revertObj != null)
--
Gitblit v1.8.0