From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |   55 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 26 insertions(+), 29 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 ee99658..0d4dba9 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
@@ -11,7 +11,7 @@
             InitializeComponent();
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; 
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
         }
 
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -111,6 +111,7 @@
             }
             return _bimfaceCtrl;
         }
+
         //bimface鎺т欢
         private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
 
@@ -175,7 +176,7 @@
             }
         }
 
-        #endregion
+        #endregion Bimface
 
         #region Q3d
 
@@ -199,10 +200,11 @@
             }
             return _q3dCtrl;
         }
+
         //Q3d鎺т欢
         private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
 
-        #endregion
+        #endregion Q3d
 
         #region 灞炴�ч潰鏉�
 
@@ -216,10 +218,10 @@
             }
             return _propertyCtrl;
         }
+
         private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;//灞炴�ф帶浠�
 
-
-        #endregion
+        #endregion 灞炴�ч潰鏉�
 
         #region 鑷姩鍖归厤
 
@@ -258,6 +260,7 @@
             }
             return _matchingListCtrl;
         }
+
         //鍖归厤鍒楄〃鎺т欢
         private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;
 
@@ -278,8 +281,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-
-        #endregion
+        #endregion 鑷姩鍖归厤
 
         #region 鏈尮閰嶅垪琛�
 
@@ -317,6 +319,7 @@
             }
             return _unMatchingListCtrl;
         }
+
         private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//鏈尮閰嶅垪琛�
 
         //鏈尮閰嶅垪琛�
@@ -335,9 +338,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-
-
-        #endregion
+        #endregion 鏈尮閰嶅垪琛�
 
         #region 涓�閿樉闅�
 
@@ -367,7 +368,7 @@
             }
         }
 
-        #endregion
+        #endregion 涓�閿樉闅�
 
         #region 姘村姏鏍￠獙
 
@@ -405,6 +406,7 @@
             }
             return _checkResultCtrl;
         }
+
         //鏍￠獙缁撴灉鎺т欢
         private XhsProjectSimulationHydroCheckResultCtrl _checkResultCtrl = null;
 
@@ -425,7 +427,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion
+        #endregion 姘村姏鏍￠獙
 
         #region 淇濆瓨姘村姏淇℃伅
 
@@ -446,7 +448,7 @@
             TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
         }
 
-        #endregion
+        #endregion 淇濆瓨姘村姏淇℃伅
 
         #region 鏋勪欢鏄庣粏
 
@@ -472,6 +474,7 @@
             }
             return _parterListCtrl;
         }
+
         //鏋勪欢鏄庣粏鎺т欢
         private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;
 
@@ -491,8 +494,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-
-        #endregion
+        #endregion 鏋勪欢鏄庣粏
 
         #region INP瀵煎嚭
 
@@ -514,7 +516,7 @@
             TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
-        #endregion
+        #endregion INP瀵煎嚭
 
         #region 涓氬姟鏂规硶
 
@@ -568,10 +570,9 @@
                     }
                 }
             }
-
         }
 
-        #endregion
+        #endregion 涓氬姟鏂规硶
 
         #region 閰嶇疆
 
@@ -581,7 +582,7 @@
             this.rmSet.ShowPopup(MousePosition, true);
         }
 
-        #endregion
+        #endregion 閰嶇疆
 
         #region 鎬ц兘鏇茬嚎
 
@@ -648,10 +649,9 @@
             dlg.ShowDialog();
         }
 
-        #endregion
+        #endregion 鎬ц兘鏇茬嚎
 
         #region 姘村姏璁＄畻
-
 
         //鑾峰彇璁＄畻鎺т欢
         private XhsProjectSimulationCalcuCtrl GetCalcuCtrl()
@@ -724,11 +724,11 @@
                             this.docPnlBottom.Height = 350;
                             TipFormHelper.ShowError("璁＄畻澶辫触");
                         }
-
                     };
             }
             return _calcuCtrl;
         }
+
         private XhsProjectSimulationCalcuCtrl _calcuCtrl = null;//璁＄畻鎺т欢
 
         //姘村姏璁＄畻
@@ -748,9 +748,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-
-
-        #endregion
+        #endregion 姘村姏璁＄畻
 
         #region 鏋勪欢鏌ヨ
 
@@ -787,6 +785,7 @@
             }
             return _searchCtrl;
         }
+
         private XhsProjectSimulationSearchCtrl _searchCtrl = null;//鏌ヨ缁勪欢
 
         //鏌ヨ
@@ -805,9 +804,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion
-
-
+        #endregion 鏋勪欢鏌ヨ
 
         #region 鏍囨敞
 
@@ -879,6 +876,6 @@
             dlg.ShowDialog();
         }
 
-        #endregion
+        #endregion 鏍囨敞
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3