From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs | 139 ++++++++++++----------------------------------
1 files changed, 36 insertions(+), 103 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
index c6edf75..79ba10d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
@@ -4,139 +4,71 @@
namespace HDL_ON.UI
{
/// <summary>
- /// 鏇茬嚎鍥�
+ /// 楗煎浘
/// </summary>
public class EchartsOption_BrokenLine
{
/// <summary>
- /// x杞存暟鎹�
- /// </summary>
- public string XvalueText = "";
-
- /// <summary>
- /// Y杞存暟鎹�
- /// </summary>
- public string YvalueText = "";
- /// <summary>
- /// x杞存爣棰�
- /// </summary>
- public string xTitle = "";
- /// <summary>
- /// y杞存爣棰�
- /// </summary>
- public string yTitle = "";
-
-
- /// <summary>
- /// 缁勮Option鏁版嵁
- /// </summary>
- /// <returns></returns>
- public string InitOption()
- {
- //缁勮Value
- var newstring = optionString.Replace("{0}", XvalueText);
- newstring = newstring.Replace("{1}", YvalueText);
- newstring = newstring.Replace("{10}", xTitle);
- newstring = newstring.Replace("{20}", yTitle);
- return newstring;
- }
-
- /// <summary>
- /// 缁勮x杞存枃鏈�
+ ///
/// </summary>
/// <param name="xData"></param>
- public void InitXdataText(List<string> xData)
- {
- XvalueText = "";
- foreach (var data in xData)
- {
- XvalueText += "'" + data + "',";
- }
- }
-
- /// <summary>
- /// 缁勮y杞存枃鏈�
- /// </summary>
- /// <param name="yData"></param>
- public string InitYdataText(string name, List<EnvironmentalSensorHistor> yData, string color)
+ public void InitXdata (List<string> xData)
{
//缁勮Value
string valueText = string.Empty;
- var YvalueTextItem = @"{name:'{0}',
+ foreach (var data in xData)
+ {
+ valueText += "'" + data + "',";
+ }
+ optionString = optionString.Replace("{0}", valueText);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="yData"></param>
+ public string GetYdata(string name, List<EnvironmentalSensorHistor> yData, string color)
+ {
+ //缁勮Value
+ string valueText = string.Empty;
+ var yAxisValue = @"{name:'{0}',
data:[{1}],
type:'line',
smooth:0.6,
symbol:'none',
color:'{2}'}
";
- YvalueTextItem = YvalueTextItem.Replace("{0}", name);
+ yAxisValue = yAxisValue.Replace("{0}", name);
foreach (var data in yData)
{
valueText += "'" + data.fieldValue + "',";
}
- YvalueTextItem = YvalueTextItem.Replace("{1}", valueText);
- YvalueTextItem = YvalueTextItem.Replace("{2}", color);
+ yAxisValue = yAxisValue.Replace("{1}", valueText);
+ yAxisValue = yAxisValue.Replace("{2}", color);
+ return yAxisValue;
+ }
- if (YvalueText == "")
- {
- YvalueText = YvalueTextItem;
- }
- else
- {
- YvalueText += "," + YvalueTextItem;
- }
-
- return YvalueTextItem;
+ public void InitYdataString(string yData)
+ {
+ //缁勮Value
+ optionString = optionString.Replace("{1}", yData);
}
-#if __IOS__
- public string optionString = @"{
+ public string optionString = @"{
tooltip: {
trigger: 'axis'
},
grid: {
- top: '10%',
- left: '10%',
- right: '10%',
- bottom: '10%',
- },
- xAxis: {
- name: '{10}',
- type: 'category',
- boundaryGap: false,
- data: [{0}],
- axisLabel : {
- fontSize:30,
- },
- },
- yAxis: {
- name: '{20}',
- type: 'value',
- axisLabel : {
- fontSize:30,
- },
- },
- series: [
- {1}
- ]
- }";
-#else
- public string optionString = @"{
- tooltip: {
- trigger: 'axis'
- },
- grid: {
- top: '10%',
- left: '10%',
- right: '10%',
- bottom: '10%',
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
},
xAxis: {
type: 'category',
boundaryGap: false,
- data: [{0}],
+ data: [{0}]
},
yAxis: {
type: 'value',
@@ -145,17 +77,18 @@
{1}
]
}";
-#endif
/// <summary>
/// 棰滆壊鍒楄〃
/// </summary>
/// <returns></returns>
- public List<string> ColorList()
+ public List<string> ColorList ()
{
var list = new List<string>();
return list;
}
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0