From b0944e2f380a3d538e6cc740673ea49c67abfebf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 16:33:45 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 7abaef5..46c7174 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
@@ -27,13 +27,15 @@
//姘村姏淇℃伅鏂规硶
private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
+ private Func<List<IHydroCalcuResult>> _allHydroCalcuResultListFunc = null;
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
- public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
+ public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<IHydroCalcuResult>> allHydroCalcuResultListFunc)
{
_hydroInfoFunc = hydroInfoFunc;
+ _allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
}
@@ -144,7 +146,7 @@
}
var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == propViewModel.Code);
- var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
var dlg = new PumpSingleMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (rhs) =>
@@ -243,7 +245,7 @@
break;
}
- var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
if (string.IsNullOrEmpty(pumpInfo.DbId))
{
var dlg = new PumpSingleMatchingDlg();
@@ -281,7 +283,7 @@
{
break;
}
- var input = AssetsMatchingParasHelper.Create(hydroInfo, valveInfo);
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, valveInfo, _allHydroCalcuResultListFunc?.Invoke());
var dlg = new ValveSingleMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (rhs) =>
@@ -302,7 +304,7 @@
{
break;
}
- var input = AssetsMatchingParasHelper.Create(hydroInfo, elbowInfo);
+ var input = AssetsMatchingParasHelper.Create(hydroInfo, elbowInfo, _allHydroCalcuResultListFunc?.Invoke());
var dlg = new ElbowSingMatchingDlg();
dlg.SetBindingData(input);
dlg.ReloadDataEvent += (output) =>
--
Gitblit v1.9.3