Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3

duheng

2024-03-26 bb006801e4d7fc281e8c1b43ab4b7b83da044ab6

 WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs

@@ -17,7 +17,7 @@
    {

        private eAnaPrjType _anaPrjType = eAnaPrjType.Opt;
        private DateTime _anaDay = DateTime.Today;
 

        private IStation.CalcModel.AnaRequest _anaRequest;

@@ -73,7 +73,7 @@
                                {
                                    if (this._currentViewPrj == null)
                                        return;
                                    IStation.BLL.AnaPrj.SavePrj(this._anaDay,this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj, false);
                                    IStation.BLL.AnaPrj.SavePrj( this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj, false);
                                      
                                    MessageBox.Show("保存成功");
                          
@@ -95,7 +95,7 @@
                                    return;
                        
                                AlertTool.ShowInfo(this.ParentForm, "提示", "开始链接服务器");
                                IStation.BLL.AnaPrj.SavePrj(this._anaDay, this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj,true );
                                IStation.BLL.AnaPrj.SavePrj(  this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj,true );
                            };
                            break;

@@ -110,8 +110,11 @@
                        case "电价信息":
                            ui_btn.Click += (sender, e) =>
                            {
                                if (this._currentViewPrj == null)
                                    return;

                                ViewElecPriceByDay frm = new ViewElecPriceByDay();
                                frm.SetBindingData(this._anaDay);
                                frm.SetBindingData(this._currentViewPrj.StartTime);
                                frm.Show();
                            };
                            break;
@@ -283,26 +286,7 @@



        /// <summary>
        /// 
        /// </summary>
        /// <param name="startTime"></param>
        /// <param name="endTime"></param>
        private void GetAnaRangeTime(out DateTime startTime, out DateTime endTime)
        {
            var day = this._anaDay;
            var startHour = IStation.AnaGlobalParas.Setting.StartHourPerDay;
            if (startHour < 1)
            {
                startTime = day;
                endTime = startTime.AddDays(1);
            }
            else
            {
                startTime = new DateTime(day.Year, day.Month, day.Day, startHour, 0, 0);
                endTime = startTime.AddDays(1);
            }
        }
 

        /// <summary>
        /// 计算 手动
@@ -312,8 +296,7 @@
            this._anaRequest = anaRequest;
            if (anaRequest == null)
                return;

            this._anaDay = anaRequest.Day;
 

            if (anaRequest.WaterLevels长江 == null)
            {
@@ -366,7 +349,7 @@
            if (anaRequest == null)
                return;

            this._anaDay = anaRequest.Day;
 

            if (anaRequest.WaterLevels长江 == null)
            {