From 3b28930e3537853b595350d7fe9fc0d8edb026e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:36:38 +0800
Subject: [PATCH] bf
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index a37e5be..bdbc4c5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -217,12 +217,8 @@
historyDataView.AddChidren(myEchartsView_Line);
//EnergyRow(energy, energyListView, index);
- new System.Threading.Thread(() =>
- {
- Control.Ins.SendReadCommand(device);
- })
- { IsBackground = true }.Start();
+ LoadMothed_GetHistoryData();
}
@@ -251,27 +247,60 @@
});
var sensorType = device.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "total_electricity");
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, device.deviceId, "power_a");
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
-
- List<string> vs = new List<string>();
- if (brokenLine.YvalueText == "")
- {
- foreach (var data in revertData)
+ if (revertData == null || revertData.Count == 0) {
+#if DEBUG
+ List<string> vs = new List<string>() {
+ "813","313","213","123",
+ "113","213","183","133",
+ "133","513","133","413",
+ };
+ brokenLine.InitXdataText(vs);
+ revertData = new List<EnvironmentalSensorHistor>()
{
- vs.Add(data.fieldName);
+ new EnvironmentalSensorHistor{ fieldValue = "100"},
+ new EnvironmentalSensorHistor{ fieldValue = "200"},
+ new EnvironmentalSensorHistor{ fieldValue = "300"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "500"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "100"},
+ new EnvironmentalSensorHistor{ fieldValue = "200"},
+ new EnvironmentalSensorHistor{ fieldValue = "300"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ new EnvironmentalSensorHistor{ fieldValue = "500"},
+ new EnvironmentalSensorHistor{ fieldValue = "400"},
+ };
+ if (device.GetAttribute("ydata") == null)
+ {
+ device.attributes.Add(new FunctionAttributes() { key = "ydata" });
}
- brokenLine.InitXdataText(vs);
+ device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, "#5C62FE") + ", ");
+
+#endif
}
- if (device.GetAttribute("ydata") == null)
+ else
{
- device.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ List<string> vs = new List<string>();
+ if (brokenLine.YvalueText == "")
+ {
+ foreach (var data in revertData)
+ {
+ vs.Add(data.fieldName);
+ }
+ brokenLine.InitXdataText(vs);
+ }
+ if (device.GetAttribute("ydata") == null)
+ {
+ device.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ }
+ device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, "#5C62FE") + ", ");
}
- device.SetAttrState("ydata", brokenLine.InitYdataText(device.name, revertData, device.GetAttrState("color")) + ",");
}
}
brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
@@ -280,7 +309,7 @@
{
brokenLine.xTitle = Language.StringByID(StringId.Date);
}
- var opString = brokenLine.InitOption();
+ var opString = brokenLine.InitOption(30);
Application.RunOnMainThread(() =>
{
--
Gitblit v1.8.0