Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 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}],
@@ -78,6 +79,63 @@
            }
            YvalueTextItem = YvalueTextItem.Replace("{1}", valueText);
            YvalueTextItem = YvalueTextItem.Replace("{2}", color);

            if (YvalueText == "")
            {
                YvalueText = YvalueTextItem;
            }
            else
            {
                YvalueText += "," + YvalueTextItem;
            }

            return YvalueTextItem;
        }


        /// <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 == "")
            {
@@ -124,23 +182,25 @@
                    ]
            }";
#else
 public string optionString = @"{
        public string optionString = @"{
                 tooltip: {
                    trigger: 'axis'
                    },
                    grid: {
                         top: '10%',
                         top: '15%',
                        left: '13%',
                        right: '10%',
                        bottom: '15%',
                        right: '12%',
                        bottom: '10%',
                    },
                    xAxis: {
                        type: 'category',
                        boundaryGap: false,
                        data: [{0}],
                        name: '{10}'
                    },
                    yAxis: {
                        type: 'value',
                        name: '{20}'
                    },
                    series: [  
                        {1}