From 5b77d9d57a6cddb474a66ca54401ad5ab0892db3 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 23 十一月 2022 14:23:42 +0800 Subject: [PATCH] Merge branch 'dev--wxr' into LcSdkV1 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs index c022001..08d7db5 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs @@ -62,6 +62,7 @@ public string InitYdataText(string name, List<EnvironmentalSensorHistor> yData, string color) { //缁勮Value + yTitle = name; string valueText = string.Empty; var YvalueTextItem = @"{name:'{0}', data:[{1}], @@ -92,6 +93,63 @@ } + /// <summary> + /// 缁勮y杞存枃鏈� + /// </summary> + /// <param name="yData"></param> + public string InitYdataTextLinearGradient(string name, List<EnvironmentalSensorHistor> yData, string color) + { + //缁勮Value + yTitle = name; + string valueText = string.Empty; + //string rColor = color.Substring(1, 2); + //string gColor = color.Substring(3, 2); + //string bColor = color.Substring(5, 2); + var YvalueTextItem = @"{name:'{0}', + data:[{1}], + type:'line', + smooth:0.6, + symbol:'none', + color:'{2}CC', + areaStyle: { + opacity: 0.8, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '{2}AA' + }, + { + offset: 1, + color: '{2}66' + } + ]) + },} + "; + YvalueTextItem = YvalueTextItem.Replace("{0}", name); + + foreach (var data in yData) + { + valueText += "'" + data.fieldValue + "',"; + } + YvalueTextItem = YvalueTextItem.Replace("{1}", valueText); + YvalueTextItem = YvalueTextItem.Replace("{2}", color); + //YvalueTextItem = YvalueTextItem.Replace("{111}", rColor); + //YvalueTextItem = YvalueTextItem.Replace("{222}", gColor); + //YvalueTextItem = YvalueTextItem.Replace("{333}", bColor); + + if (YvalueText == "") + { + YvalueText = YvalueTextItem; + } + else + { + YvalueText += "," + YvalueTextItem; + } + + return YvalueTextItem; + } + + #if __IOS__ public string optionString = @"{ tooltip: { -- Gitblit v1.8.0