lixiaojun
2024-10-24 41dae2f4180136aeb040e5c882cbcd1c67785cf3
优化水泵属性更新
已修改4个文件
22 ■■■■ 文件已修改
Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Yw.Service.Hydro.Core" Version="3.6.5" />
    <PackageReference Include="Yw.Service.Hydro.Core" Version="3.6.6" />
  </ItemGroup>
  <ItemGroup>
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
@@ -119,14 +119,15 @@
                        var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
                        var dlg = new SinglePumpAnalyDlg();
                        dlg.SetBindindData(input);
                        //dlg.ReloadDataEvent += (output) =>
                        //{
                        //    bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
                        //    if (bol)
                        //    {
                        //        propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
                        //    }
                        //};
                        dlg.ReloadDataEvent += (output) =>
                        {
                            var bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
                            if (bol)
                            {
                                propViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
                            }
                            return bol;
                        };
                        dlg.ShowDialog();
                        return true;
                    }
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
@@ -310,6 +310,7 @@
                this.UpdatePropStatus(nameof(this.SpeedRatio), hydroPumpInfo, nameof(hydroPumpInfo.SpeedRatio));
                this.SpeedRatioPattern = hydroPumpInfo.SpeedRatioPattern;
                this.UpdatePropStatus(nameof(this.SpeedRatioPattern), hydroPumpInfo, nameof(hydroPumpInfo.SpeedRatioPattern));
                this.Curve = string.IsNullOrEmpty(hydroPumpInfo.CurveQH) ? "未配置" : "已配置";
                this.CurveQH = hydroPumpInfo.CurveQH;
                this.UpdatePropStatus(nameof(this.CurveQH), hydroPumpInfo, nameof(hydroPumpInfo.CurveQH));
                this.CurveQP = hydroPumpInfo.CurveQP;
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
@@ -10,7 +10,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.3.7" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.3.9" />
  </ItemGroup>
  <ItemGroup>