From 2af3ae119846a6b12cabdc28fb67329e122e39b5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 16:19:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
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;
}
--
Gitblit v1.9.3