Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

ningshuxia

2025-03-24 f7d479db638f3d9e3aeb05ec82dc2818f14bf903

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs

@@ -174,13 +174,13 @@
                        Power = newel / 60,
                        Time = DateTime.Parse(item.Time)
                    });
                    var el = oldel - newel;
                    totalOldEl += oldel;
                    var el = oldel / 60 - newel / 60;
                    totalOldEl += oldel / 60;
                    totalEl += el;
                    var Fy = ElecPriceHelper.CalcuShysElectricityFees(DateTime.Parse(item.Time), el);
                    //totalFy += Fy;
                }
                item.Y = Press;//Yw.Pump.CalculationHelper.CalcuP();
                //item.Y = Press;//Yw.Pump.CalculationHelper.CalcuP();
            }

            AddLineSeries("原泵后压力", axis_x, _axis_y_eff, _default_pane, tempdatas.Datas);
@@ -207,25 +207,32 @@

        private void SetEffData()
        {
            var SeriseOld = this.chartControl1.GetSeriesByName("Series 1");
            double totalEffBefore = 0;
            double totalEffAfter = 0;
            var SeriseOld = this.chartControl1.GetSeriesByName("改造前(度)");
            SeriseOld.Points.Clear();
            if (_oldData != null)
            {
                foreach (var item in _oldData)
                {
                    totalEffBefore += item.Power;
                    SeriseOld.Points.Add(new SeriesPoint(item.Time, item.Power));
                }
            }
            var SeriseNew = this.chartControl1.GetSeriesByName("Series 2");
            this.textEditEffBefore.Text = Math.Round(totalEffBefore).ToString();
            var SeriseNew = this.chartControl1.GetSeriesByName("改造后(度)");
            SeriseNew.Points.Clear();
            if (_newData != null)
            {
                foreach (var item in _newData)
                {
                    totalEffAfter += item.Power;
                    SeriseNew.Points.Add(new SeriesPoint(item.Time, item.Power));
                }
            }
            var SeriesDef = this.chartControl1.GetSeriesByName("Series 3");
            this.textEditEffAfter.Text = Math.Round(totalEffAfter).ToString();

            var SeriesDef = this.chartControl1.GetSeriesByName("节省值(度)");
            SeriesDef.Points.Clear();

            if (_oldData != null && _newData != null)
@@ -241,9 +248,11 @@
        private void SetEffPriceData()
        {
            _totalPrice = default;
            double totalBeforePrice = 0;
            double totalAfterPrice = 0;
            List<PowerData> oldPrice = null;
            List<PowerData> newPrice = null;
            var SeriseOld = this.chartControl1.GetSeriesByName("Series 4");
            var SeriseOld = this.chartControl1.GetSeriesByName("改造前(元)");
            SeriseOld.Points.Clear();
            if (_oldData != null)
            {
@@ -251,11 +260,13 @@
                foreach (var item in _oldData)
                {
                    var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
                    totalBeforePrice += price;
                    SeriseOld.Points.Add(new SeriesPoint(item.Time, price));
                    oldPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
                }
            }
            var SeriseNew = this.chartControl1.GetSeriesByName("Series 5");
            this.textEditPriceBefore.Text = Math.Round(totalBeforePrice).ToString();
            var SeriseNew = this.chartControl1.GetSeriesByName("改造后(元)");
            SeriseNew.Points.Clear();
            if (_newData != null)
            {
@@ -263,11 +274,13 @@
                foreach (var item in _newData)
                {
                    var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
                    totalAfterPrice += price;
                    SeriseNew.Points.Add(new SeriesPoint(item.Time, price));
                    newPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
                }
            }
            var SeriesDef = this.chartControl1.GetSeriesByName("Series 6");
            this.textEditPriceAfter.Text = Math.Round(totalAfterPrice).ToString();
            var SeriesDef = this.chartControl1.GetSeriesByName("节省值(元)");
            SeriesDef.Points.Clear();

            if (oldPrice != null && newPrice != null)
@@ -454,7 +467,9 @@
        {
            if (_datalist.Any())
            {
                WaitFormHelper.ShowWaitForm();
                SetBindingData(_datalist, _datatable);
                WaitFormHelper.HideWaitForm();
            }
        }
    }