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/06-simulation/XhsProjectSimulationCorePage.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 ccd2fc9..24f81e9 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
@@ -13,7 +13,7 @@
this.PageTitle.Caption = "姘村姏妯℃嫙";
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
- this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+ this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
}
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -72,6 +72,8 @@
this.tabPageQ3d.Controls.Clear();
this.tabPageQ3d.Controls.Add(q3dCtrl);
q3dCtrl.InitialData(() => _hydroInfo);
+ ShowPropertyCtrl();
+
}
#region Bimface
@@ -216,7 +218,7 @@
{
_propertyCtrl = new XhsProjectSimulationPropertyCtrl();
_propertyCtrl.Dock = DockStyle.Fill;
- _propertyCtrl.InitialData(() => _hydroInfo);
+ _propertyCtrl.InitialData(() => _hydroInfo, () => GetAllCalcuResult());
_propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
{ //寮鸿皟杩炴帴缁勪欢
if (string.IsNullOrEmpty(code))
@@ -395,7 +397,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;
@@ -682,15 +684,16 @@
{
return;
}
- if (_calcuResult == null)
- {
- return;
- }
- if (!_calcuResult.Succeed)
- {
- return;
- }
- var pumps = _hydroInfo.Pumps;
+ //if (_calcuResult == null)
+ //{
+ // return;
+ //}
+ //if (!_calcuResult.Succeed)
+ //{
+ // return;
+ //}
+ var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.LinkStatus.Open).ToList();
+
var curve_list = _hydroInfo.Curves;
if (curve_list == null || !curve_list.Any())
{
@@ -721,7 +724,7 @@
var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
vm.Id = x.Code;
- vm.Name = x.Code;
+ vm.Name = x.Name;
//vm.IsBp = ;
vm.RatedSpeed = rated_speed;
vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio);
@@ -738,7 +741,7 @@
dlg.ShowDialog();
}
- #endregion 鎬ц兘鏇茬嚎
+ #endregion
#region 姘村姏璁＄畻
--
Gitblit v1.9.3