Merge remote-tracking branch 'origin/wxr0114' into wjc

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

 HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs

@@ -180,8 +180,15 @@
                double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
                tt *= 100;//乘以100，小于1无法加载echart
                tt = Math.Round(tt, 2);
                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));

            btnDrodDown = new Button()