From 7c4fde84af5d666236c85b784bf13c9295bcb605 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 29 十月 2024 14:18:46 +0800
Subject: [PATCH] bimface 业务计算显示距离设定

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 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 217d09e..f3781c9 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
@@ -457,7 +457,7 @@
             return _checkCtrl;
         }
 
-        //鏄剧ず鏍¢獙鎺т欢
+        //鏄剧ず妫�鏌ユ帶浠�
         private void ShowCheckCtrl()
         {
             if (_checkResult == null)
@@ -469,12 +469,12 @@
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(checkCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏍¢獙缁撴灉";
+            this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
             this.docPnlBottom.Height = 350;
 
         }
 
-        //姘村姏楠岃瘉
+        //姘村姏妫�鏌�
         private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             if (_hydroInfo == null)
@@ -1007,7 +1007,7 @@
 
             }
 
-            var dlg = new PumpParallelChartDlg();
+            var dlg = new PumpParallelAnalyDlg();
             dlg.SetBindingData(vmList);
             dlg.ReloadDataEvent += (list) =>
             {
@@ -1082,10 +1082,7 @@
                 }
 
             };
-            if (dlg.ShowDialog() == DialogResult.Cancel)
-            {
-                await _bimfaceCtrl?.ClearLogicCalcuCustomLabels();
-            }
+            dlg.ShowDialog();
         }
 
         #endregion
@@ -1273,7 +1270,7 @@
                                 {
                                     calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
                                 }
-                                if (pump.RatedN.HasValue)
+                                if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
                                 {
                                     var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
                                     if (curveqp != null)

--
Gitblit v1.9.3