From 3a437b6d57ea17f9ea2e94aabcd13dd5591769d3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 27 九月 2024 19:57:35 +0800
Subject: [PATCH] 控件修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |   65 ++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 28 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 5b768cb..99d8242 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
@@ -76,35 +76,9 @@
             this.xhsProjectSimulationPropertyCtrl1.SetBindingData(() => _hydroInfo);
         }
 
-        //姘村姏璁$畻
-        private async void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-
-            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-            _calcuResult = netWork.Calcu();
-            if (_calcuResult.Succeed)
-            {
-                ShowProperty();
-                TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-            }
-            else
-            {
-                this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
-                this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlHydroCalcu.Height = 350;
-            }
-            await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
-        }
 
 
+        #region INP瀵煎嚭
 
         //瀵煎嚭姘村姏INP鏂囦欢
         private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -124,7 +98,7 @@
             TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
-
+        #endregion
 
         #region Bimface
 
@@ -491,5 +465,40 @@
         }
 
         #endregion
+
+        #region 姘村姏璁$畻
+
+        //姘村姏璁$畻
+        private async void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+
+            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+            _calcuResult = netWork.Calcu();
+            if (_calcuResult.Succeed)
+            {
+                ShowProperty();
+                TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+            }
+            else
+            {
+                this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
+                this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlHydroCalcu.Height = 350;
+            }
+            await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
+        }
+
+        #endregion
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3