From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index b39f8be..e3e0903 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -83,10 +83,7 @@
public EnergyMainPage()
{
bodyView = this;
- energyList = FunctionList.List.GetEnergyList();
- var breaker = FunctionList.List.Functions.FindAll((obj) => obj.spk == SPK.AirSwitch);
- var energyBreker = breaker.FindAll((obj) => obj.GetAttribute("power") != null);
- energyList.AddRange(energyBreker);
+ energyList = FunctionList.List.GetEnergyList().FindAll((obj)=>obj.spk == SPK.AirSwitch || obj.spk == SPK.ElectricEnergy);
}
/// <summary>
@@ -174,13 +171,28 @@
echartsView.AddChidren(myEchartsView_Pie);
Dictionary<string, string> list = new Dictionary<string, string>();
+
+ int count = 0;
foreach(var ene in energyList)
{
+ if (count > 10)
+ {
+ break;
+ }
double tt = 0;
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
tt *= 100;//涔樹互100锛屽皬浜�1鏃犳硶鍔犺浇echart
tt = Math.Round(tt, 2);
- list.Add(ene.name, tt.ToString());
+ string key = ene.name;
+ if (list.ContainsKey(key))
+ {
+ list.Add(ene.name + DateTime.Now.Ticks, tt.ToString());
+ }
+ else
+ {
+ list.Add(ene.name, tt.ToString());
+ }
+ count++;
}
myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list));
@@ -212,6 +224,10 @@
int index = 0;
foreach (var energy in energyList)
{
+ if (index > 10)
+ {
+ break;
+ }
EnergyRow(energy, energyListView, index);
index++;
new System.Threading.Thread(() =>
@@ -555,8 +571,14 @@
double totalValue = 0;
double realtimeValue = 0;
Dictionary<string, string> list = new Dictionary<string, string>();//楗煎浘鏁版嵁
+ int count = 0;
foreach (var ene in bodyView.energyList)
{
+ if (count > 10)
+ {
+ break;
+ }
+ count++;
double power = 0.00;
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out power);
power = Math.Round(power, 2);
--
Gitblit v1.8.0