From 5dd7ab9852c9a5659cc916e9ed986b5099efeaf8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 23 十月 2024 13:04:33 +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/06-simulation/XhsProjectSimulationCorePage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 56bc317..6c19dca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -219,7 +219,7 @@
{
_propertyCtrl = new XhsProjectSimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
- _propertyCtrl.InitialData(() => _hydroInfo);
+ _propertyCtrl.InitialData(() => _hydroInfo, () => GetAllCalcuResult());
_propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
{ //寮鸿皟杩炴帴缁勪欢
if (string.IsNullOrEmpty(code))
@@ -398,7 +398,7 @@
}
this.controlContainerBottom.Controls.Clear();
var matchingListCtrl = GetMatchingListCtrl();
- var input = AssetsMatchingParasHelper.Create(_hydroInfo);
+ var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetAllCalcuResult());
matchingListCtrl.SetBindingData(input);
this.controlContainerBottom.Controls.Add(matchingListCtrl);
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -571,7 +571,7 @@
#endregion 姘村姏鏍￠獙
- #region 淇濆瓨姘村姏淇℃伅
+ #region 淇濆瓨淇℃伅
//淇濆瓨
private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
--
Gitblit v1.9.3