From 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index b39f8be..9455d9a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -180,7 +180,14 @@
double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
tt *= 100;//涔樹互100锛屽皬浜�1鏃犳硶鍔犺浇echart
tt = Math.Round(tt, 2);
- list.Add(ene.name, tt.ToString());
+ if (list.ContainsKey(ene.name))
+ {
+ list.Add(ene.name + "1", tt.ToString());
+ }
+ else
+ {
+ list.Add(ene.name, tt.ToString());
+ }
}
myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list));
--
Gitblit v1.8.0