From 41dae2f4180136aeb040e5c882cbcd1c67785cf3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 24 十月 2024 14:02:36 +0800
Subject: [PATCH] 优化水泵属性更新
---
Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj | 2 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 17 +++++++++--------
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj b/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
index 2118b27..3e97fe4 100644
--- a/Hydro/Yw.Hydro.Core/Yw.Hydro.Core.csproj
+++ b/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>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
index 9d3b1a5..6eee46b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs
+++ b/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;
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
index c1dc41d..0b204c9 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
+++ b/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;
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
index bcd70e5..696d27b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
+++ b/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>
--
Gitblit v1.9.3