nuget包升级

duheng

2024-07-25 713d5218ee2b47c0c92f75c19c49bb7e883cd214

 WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoCalcCtrl.cs

@@ -180,19 +180,20 @@
            double sumPower = 0;
            double sumMoney = 0;

            var _realTimeDataList = _current_anaPrj.PointTimes;
            for (int i = 0; i < _realTimeDataList.Count; i++)
  
            var allTime = _current_anaPrj.GetAllPointTimeList();
            for (int i = 0; i < allTime.Count; i++)
            {
                var time = _realTimeDataList[i].Time;
                var time = allTime[i].Time;

                series累计流量.Points.Add(new SeriesPoint(time, new double[] { sumFlow }));
                series累计电量.Points.Add(new SeriesPoint(time, new double[] { sumPower }));
                series累计电费.Points.Add(new SeriesPoint(time, new double[] { sumMoney }));
                series用水量.Points.Add(new SeriesPoint(time, new double[] { _realTimeDataList[i].ReservoirDropFlowTotal }));
                series用水量.Points.Add(new SeriesPoint(time, new double[] { allTime[i].ReservoirDropFlowTotal }));

                sumFlow += _realTimeDataList[i].SumFlow;
                sumPower += _realTimeDataList[i].SumPower;
                sumMoney += _realTimeDataList[i].SumMoney;
                sumFlow += allTime[i].SumFlow;
                sumPower += allTime[i].SumPower;
                sumMoney += allTime[i].SumMoney;
            }


@@ -237,9 +238,11 @@
        {
            IStation.CalcModel.AnaPrjPointTime max_level = null;
            IStation.CalcModel.AnaPrjPointTime min_level = null;
            for (int i = 0; i < anaPrj.PointTimes.Count; i++)

            var allTime = anaPrj.GetAllPointTimeList();
            for (int i = 0; i < allTime.Count; i++)
            {
                var sd = anaPrj.PointTimes[i];
                var sd = allTime[i];
                if (max_level == null || max_level.WaterLevelH < sd.WaterLevelH)
                {
                    max_level = sd;
@@ -295,15 +298,15 @@
            //    isHaveYesterDay = true ;
            //    BuildRealTimeDataList(_yesterday2_anaPrj.PointTimes);
            //}

            if (_yesterday1_anaPrj != null && _yesterday1_anaPrj.PointTimes != null)
  
            if (_yesterday1_anaPrj != null  )
            {
                isHaveYesterDay = true;
                BuildRealTimeDataList(_yesterday1_anaPrj.PointTimes);
                BuildRealTimeDataList(_yesterday1_anaPrj.GetAllPointTimeList());
            }


            BuildRealTimeDataList(_current_anaPrj.PointTimes);
            BuildRealTimeDataList(_current_anaPrj.GetAllPointTimeList());



@@ -333,7 +336,7 @@
            //    constantLineIn日期.Visible = false;
            //}

            if (_yesterday1_anaPrj != null && _yesterday1_anaPrj.PointTimes != null)
            if (_yesterday1_anaPrj != null  )
            {
                DevExpress.XtraCharts.ConstantLine constantLineIn日期 = mainDiagram.AxisX.ConstantLines[2];
                constantLineIn日期.Visible = true;
@@ -348,6 +351,8 @@

        private void BuildRealTimeDataList(List<AnaPrjPointTime> realTimeDataList)
        {
            if (realTimeDataList == null || realTimeDataList.Count == 0)
                return;
            DevExpress.XtraCharts.Series series长江水位 = this.chartControl实时数据.Series[0];
            DevExpress.XtraCharts.Series series前池水位 = this.chartControl实时数据.Series[1];
            DevExpress.XtraCharts.Series series水库水位 = this.chartControl实时数据.Series[2];
@@ -621,7 +626,7 @@
                                list_draws.Add(sss_start);
                                g.DrawString(sss_start, font时间, brushText时间,    new Point(pt1.Point.X - 20, pt1.Point.Y - height - 19));

                                var pt = _yesterday1_anaPrj.FingPointTime(item.StartTime);
                                var pt = _yesterday1_anaPrj.FindPointTime(item.StartTime);
                                if (pt != null)
                                {
                                    g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2)), font水位, brushText时间, new Point(pt1.Point.X - 20, pt1.Point.Y + 5));
@@ -633,7 +638,7 @@
                                list_draws.Add(sss_end);
                                g.DrawString(sss_end, font时间, brushText时间,         new Point(pt2.Point.X - 20, pt1.Point.Y - height - 19));

                                var pt = _yesterday1_anaPrj.FingPointTime(item.EndTime);
                                var pt = _yesterday1_anaPrj.FindPointTime(item.EndTime);
                                if (pt != null)
                                {
                                    g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2)), font水位, brushText时间, new Point(pt2.Point.X - 20, pt2.Point.Y + 5));
@@ -673,7 +678,7 @@
                            list_draws.Add(sss_start);
                            g.DrawString(sss_start, font时间, brushText时间,    new Point(pt1.Point.X - 20, pt1.Point.Y - height - 19));

                            var pt = _current_anaPrj.FingPointTime(item.StartTime);
                            var pt = _current_anaPrj.FindPointTime(item.StartTime);
                            if (pt != null)
                            {
                                g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2) ), font水位, brushText时间, new Point(pt1.Point.X - 20, pt1.Point.Y + 5));
@@ -689,7 +694,7 @@
                            list_draws.Add(sss_end);
                            g.DrawString(sss_end, font时间, brushText时间,  new Point(pt2.Point.X - 20, pt1.Point.Y - height - 19));

                            var pt = _current_anaPrj.FingPointTime(item.EndTime);
                            var pt = _current_anaPrj.FindPointTime(item.EndTime);
                            if (pt != null)
                            {
                                g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2)), font水位, brushText时间, new Point(pt2.Point.X - 20, pt2.Point.Y + 5));