From d7e25d6a5960b3495cd4d8a67545410e03ca7962 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:08 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index 0bccd57..f6365e3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -386,13 +386,15 @@
brokenLine.YvalueText = "";
foreach (var ene in queryList)
{
- brokenLine.YvalueText += ene.GetAttrState("ydata") + ",";
+ brokenLine.YvalueText += ene.GetAttrState("ydata");
}
+ var opString = brokenLine.InitOption();
Application.RunOnMainThread(() =>
{
- myEchartsView.ShowWithOption(brokenLine.InitOption());
+ myEchartsView.ShowWithOption(opString);
});
+
return;
}
@@ -427,21 +429,17 @@
vs.Add(data.fieldName);
}
brokenLine.InitXdataText(vs);
-
- if (sr.GetAttribute("ydata") == null)
- {
- sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
- }
- sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
}
- else
+ if (sr.GetAttribute("ydata") == null)
{
- if (sr.GetAttribute("ydata") == null)
- {
- sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
- }
- sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color"))+",");
+ sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
}
+ sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
+ //if (sr.GetAttribute("ydata") == null)
+ //{
+ // sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
+ //}
+ //sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
}
}
brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
--
Gitblit v1.8.0