From f661d7da8be688bfbe5c4977dc68223b5aa63959 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 20:51:36 +0800
Subject: [PATCH] 核心界面调整

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |  534 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 317 insertions(+), 217 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 6daccb3..7ee31cc 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
@@ -1,10 +1,5 @@
 锘縢lobal using Yw.EPAnet;
-using DevExpress.Xpo.Helpers;
-using HStation.WinFrmUI.Xhs;
-using HStation.WinFrmUI.Xhs.Core;
-using NPOI.SS.Formula.Functions;
-using Yw.WinFrmUI.HydroL2d;
-using Yw.WinFrmUI.HydroL3d;
+using NetTaste;
 
 namespace HStation.WinFrmUI
 {
@@ -15,18 +10,9 @@
             InitializeComponent();
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
 
-            this.xhsProjectSimulationSearchCtrl1.ApplySearchEvent += XhsProjectSimulationSearchCtrl1_ApplySearchEvent;
-
-            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;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
         }
-
-
 
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -79,30 +65,9 @@
             await this.xhsProjectSimulationBimfaceCtrl1.SetBindingData(_project, _projectSite, () => _hydroInfo);
             this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
             this.xhsProjectSimulationPropertyCtrl1.InitialData(() => _hydroInfo);
-            this.xhsProjectSimulationSearchCtrl1.InitialData(() => _hydroInfo);
         }
 
-        #region INP瀵煎嚭
 
-        //瀵煎嚭姘村姏INP鏂囦欢
-        private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var fileName = Yw.WinFrmUI.FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-            var result = netWork.ToInpString();
-            File.WriteAllText(fileName, result);
-            TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
-        }
-
-        #endregion
 
         #region Bimface
 
@@ -184,7 +149,23 @@
             await this.xhsProjectSimulationBimfaceCtrl1.SetLinkComponentsColor(elementIds);
         }
 
-        #endregion Bimface
+        #endregion
+
+        #region Q3d
+
+        //鐐瑰嚮浜嬩欢
+        private void xhsProjectSimulationQ3dCtrl1_ClickParterEvent(string code)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allParterList = _hydroInfo.GetAllParters();
+            _parter = allParterList?.Find(x => x.Code == code);
+            ShowProperty();
+        }
+
+        #endregion
 
         #region 灞炴�ч潰鏉�
 
@@ -194,6 +175,44 @@
 
         #region 鑷姩鍖归厤
 
+        //鑾峰彇鍖归厤鍒楄〃鎺т欢
+        private XhsProjectSimulationMatchingListCtrl GetMatchingListCtrl()
+        {
+            if (_matchingListCtrl == null)
+            {
+                _matchingListCtrl = new XhsProjectSimulationMatchingListCtrl();
+                _matchingListCtrl.Dock = DockStyle.Fill;
+                _matchingListCtrl.HydroClickEvent += async (code) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var allParterList = _hydroInfo.GetAllParters();
+                    _parter = allParterList?.Find(x => x.Code == code);
+                    var elementIds = new List<string>();
+                    if (_parter != null)
+                    {
+                        elementIds.Add(_parter.Code);
+                    }
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
+                    ShowProperty();
+                    SetBimfaceLinkColor();
+                };
+                _matchingListCtrl.ApplyMatchingEvent += (output) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return false;
+                    }
+                    return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
+                };
+            }
+            return _matchingListCtrl;
+        }
+        //鍖归厤鍒楄〃鎺т欢
+        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;
+
         //鑷姩鍖归厤
         private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
@@ -201,43 +220,56 @@
             {
                 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.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-
+            this.controlContainerBottom.Controls.Clear();
+            var matchingListCtrl = GetMatchingListCtrl();
             var input = AssetsMatchingParasHelper.Create(_hydroInfo);
-            this.xhsProjectSimulationMatchingListCtrl1.SetBindingData(input);
-            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlMatchingList.Height = 350;
+            matchingListCtrl.SetBindingData(input);
+            this.controlContainerBottom.Controls.Add(matchingListCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鍖归厤鍒楄〃";
+            this.docPnlBottom.Height = 350;
         }
 
-        //姘村姏淇℃伅鐐瑰嚮
-        private async void xhsProjectSimulationMatchingListCtrl1_HydroClickEvent(string code)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allParterList = _hydroInfo.GetAllParters();
-            _parter = allParterList.Find(x => x.Code == code);
-            var elementIds = new List<string>() { _parter.Code };
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
-            ShowProperty();
-            SetBimfaceLinkColor();
-        }
-
-        //搴旂敤鍖归厤浜嬩欢
-        private bool xhsProjectSimulationMatchingListCtrl1_ApplyMatchingEvent(AssetsMatchingViewModel output)
-        {
-            return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
-        }
 
         #endregion
 
         #region 鏈尮閰嶅垪琛�
+
+        //鑾峰彇鏈尮閰嶅垪琛ㄦ帶浠�
+        private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
+        {
+            if (_unMatchingListCtrl == null)
+            {
+                _unMatchingListCtrl = new XhsProjectSimulationUnMatchingListCtrl();
+                _unMatchingListCtrl.Dock = DockStyle.Fill;
+                _unMatchingListCtrl.HydroClickEvent += async (parter) =>//琛岀偣鍑�
+                {
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var allParterList = _hydroInfo.GetAllParters();
+                    _parter = allParterList?.Find(x => x.Code == parter.Code);
+                    var elementIds = new List<string>() { parter.Code };
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
+                    ShowProperty();
+                    SetBimfaceLinkColor();
+                };
+                _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
+                {
+                    var codes = parters?.Select(x => x.Code).Distinct().ToList();
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(codes);
+                    _parter = null;
+                    ShowProperty();
+                };
+            }
+            return _unMatchingListCtrl;
+        }
+        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//鏈尮閰嶅垪琛�
 
         //鏈尮閰嶅垪琛�
         private void barBtnUnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -246,37 +278,16 @@
             {
                 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.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-
-            this.xhsProjectSimulationUnMatchingListCtrl1.SetBindingData(_hydroInfo);
-            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlUnMatchingList.Height = 350;
+            this.controlContainerBottom.Controls.Clear();
+            var unMatchingListCtrl = GetUnMatchingListCtrl();
+            unMatchingListCtrl.SetBindingData(_hydroInfo);
+            this.controlContainerBottom.Controls.Add(unMatchingListCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鏈尮閰嶅垪琛�";
+            this.docPnlBottom.Height = 350;
         }
 
-        //鏈尮閰嶅垪琛ㄧ偣鍑讳簨浠�
-        private async void xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
-        {
-            var allParterList = _hydroInfo.GetAllParters();
-            _parter = allParterList.Find(x => x.ID == parter.ID);
-            var elementIds = new List<string>() { _parter.Code };
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
-            ShowProperty();
-            SetBimfaceLinkColor();
-        }
 
-        //鏈尮閰嶅垪琛ㄦ煡鐪嬫ā鍨�
-        private async void xhsProjectSimulationUnMatchingListCtrl1_ViewModelEvent(List<Yw.Model.HydroParterInfo> parters)
-        {
-            var codes = parters?.Select(x => x.Code).Distinct().ToList();
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(codes);
-            _parter = null;
-            ShowProperty();
-        }
 
         #endregion
 
@@ -312,6 +323,43 @@
 
         #region 姘村姏鏍¢獙
 
+        //鑾峰彇鏍¢獙缁撴灉鎺т欢
+        private XhsProjectSimulationHydroCheckResultCtrl GetCheckResultCtrl()
+        {
+            if (_checkResultCtrl == null)
+            {
+                _checkResultCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
+                _checkResultCtrl.Dock = DockStyle.Fill;
+                _checkResultCtrl.HydroClickEvent += async (code) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var elementIds = new List<string>();
+                    if (string.IsNullOrEmpty(code))
+                    {
+                        _parter = null;
+                    }
+                    else
+                    {
+                        var allParterList = _hydroInfo.GetAllParters();
+                        _parter = allParterList?.Find(x => x.Code == code);
+                        if (_parter != null)
+                        {
+                            elementIds.Add(_parter.Code);
+                        }
+                    }
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
+                    ShowProperty();
+                    SetBimfaceLinkColor();
+                };
+            }
+            return _checkResultCtrl;
+        }
+        //鏍¢獙缁撴灉鎺т欢
+        private XhsProjectSimulationHydroCheckResultCtrl _checkResultCtrl = null;
+
         //姘村姏楠岃瘉
         private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
@@ -319,43 +367,14 @@
             {
                 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;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-
             _checkResult = _hydroInfo.Check();
-            this.xhsProjectSimulationHydroCheckResultCtrl1.SetBindingData(_checkResult);
-            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlHydroCheck.Height = 350;
-        }
-
-        //姘村姏鏍¢獙鐐瑰嚮
-        private async void xhsProjectSimulationHydroCheckResultCtrl1_HydroClickEvent(string code)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var elementIds = new List<string>();
-            if (string.IsNullOrEmpty(code))
-            {
-                _parter = null;
-            }
-            else
-            {
-                var allParterList = _hydroInfo.GetAllParters();
-                _parter = allParterList.Find(x => x.Code == code);
-                if (_parter != null)
-                {
-                    elementIds.Add(_parter.Code);
-                }
-            }
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
-            ShowProperty();
-            SetBimfaceLinkColor();
+            this.controlContainerBottom.Controls.Clear();
+            var checkResultCtrl = GetCheckResultCtrl();
+            checkResultCtrl.SetBindingData(_checkResult);
+            this.controlContainerBottom.Controls.Add(checkResultCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鏍¢獙缁撴灉";
+            this.docPnlBottom.Height = 350;
         }
 
         #endregion
@@ -383,6 +402,31 @@
 
         #region 鏋勪欢鏄庣粏
 
+        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroParterListCtrl GetParterListCtrl()
+        {
+            if (_parterListCtrl == null)
+            {
+                _parterListCtrl = new HydroParterListCtrl();
+                _parterListCtrl.Dock = DockStyle.Fill;
+                _parterListCtrl.HydroClickEvent += async (parter) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var allParterList = _hydroInfo.GetAllParters();
+                    _parter = allParterList?.Find(x => x.Code == parter.Code);
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(new List<string>() { _parter.Code });
+                    ShowProperty();
+                    SetBimfaceLinkColor();
+                };
+            }
+            return _parterListCtrl;
+        }
+        //鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;
+
         //姘村姏鏋勪欢鍒楄〃
         private void barBtnHydroParterList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
@@ -390,26 +434,36 @@
             {
                 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;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-
-            this.hydroParterListCtrl1.SetBindingData(_hydroInfo);
-            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlHydroParterList.Height = 350;
+            this.controlContainerBottom.Controls.Clear();
+            var parterListCtrl = GetParterListCtrl();
+            parterListCtrl.SetBindingData(_hydroInfo);
+            this.controlContainerBottom.Controls.Add(parterListCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+            this.docPnlBottom.Height = 350;
         }
 
-        //姘村姏鏋勪欢鏄庣粏闈㈡澘鐐瑰嚮浜嬩欢
-        private async void hydroParterListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
+
+        #endregion
+
+        #region INP瀵煎嚭
+
+        //瀵煎嚭姘村姏INP鏂囦欢
+        private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            var allParterList = _hydroInfo.GetAllParters();
-            _parter = allParterList.Find(x => x.ID == parter.ID);
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(new List<string>() { _parter.Code });
-            ShowProperty();
-            SetBimfaceLinkColor();
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var fileName = Yw.WinFrmUI.FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+            var result = netWork.ToInpString();
+            File.WriteAllText(fileName, result);
+            TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
         #endregion
@@ -496,17 +550,27 @@
                 return;
             }
             var pumps = _hydroInfo.Pumps;
-            var vmList = pumps.Select(x => new HStation.WinFrmUI.PhartRelation.Perform2dMultiViewModel()
+            var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
+            foreach (var x in pumps)
             {
-                Id = x.Code,
-                Name = x.Code,
-                SpeedRatio = x.SpeedRatio ?? 1,
-                PointsQH = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-                PointsQP = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQP)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-                PointsQE = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQE)?.CurveData?.Select(z => new PhartRelation.PerformPoint2dViewModel() { X = z.X, Y = z.Y }).ToList(),
-            }).ToList();
-            var dlg = new HStation.WinFrmUI.PhartRelation.PumpPerform2dMultiViewDlg();
-            dlg.SetBindingData(vmList, null, false, true);
+                var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
+                vm.Id = x.Code;
+                vm.Name = x.Code;
+                //vm.IsBp = ;
+                //vm.RatedSpeed = 590;
+                //vm.CurrentSpeed = 590;
+                //vm.CurrentHz = 50;
+                var PointsQH = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQH)?.CurveData?.Select(z => new Yw.Geometry.Point2d() { X = z.X, Y = z.Y }).ToList();
+                var PointsQP = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQP)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
+                var PointsQE = _hydroInfo.Curves?.Find(t => t.Code == x.CurveQE)?.CurveData?.Select(z => new Yw.Geometry.Point2d { X = z.X, Y = z.Y }).ToList();
+
+                vm.Qh = new Yw.Geometry.CubicSpline2d(PointsQH);
+                vm.Qe = new Yw.Geometry.CubicSpline2d(PointsQE);
+                vm.Qp = new Yw.Geometry.CubicSpline2d(PointsQP);
+                vmList.Add(vm);
+            }
+            var dlg = new HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
+            dlg.SetBindingData(vmList, null, true);
             dlg.ShowDialog();
         }
 
@@ -514,43 +578,104 @@
 
         #region 姘村姏璁$畻
 
+
+        //鑾峰彇璁$畻鎺т欢
+        private XhsProjectSimulationCalcuCtrl GetCalcuCtrl()
+        {
+            if (_calcuCtrl == null)
+            {
+                _calcuCtrl = new XhsProjectSimulationCalcuCtrl();
+                _calcuCtrl.Dock = DockStyle.Fill;
+                _calcuCtrl.CancelEvent += () =>
+                    {
+                        this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+                    };
+                _calcuCtrl.OkEvent += async () =>
+                    {
+                        if (_hydroInfo == null)
+                        {
+                            return;
+                        }
+                        var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+                        _calcuResult = netWork.Calcu();
+                        if (_calcuResult.Succeed)
+                        {
+                            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+                            ShowProperty();
+                            TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                            await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
+                        }
+                        else
+                        {
+                            _calcuCtrl.SetBindingData(_calcuResult.FailedList);
+                            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                            this.docPnlBottom.Text = "姘村姏璁$畻澶辫触鍘熷洜";
+                            this.docPnlBottom.Height = 350;
+                        }
+
+                    };
+            }
+            return _calcuCtrl;
+        }
+        private XhsProjectSimulationCalcuCtrl _calcuCtrl = null;//璁$畻鎺т欢
+
         //姘村姏璁$畻
-        private async void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
 
-            var dlg = new XhsProjectSimulationCalcuPrefixDlg();
-            dlg.ShowDialog();
-
-            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;
-            this.docPnlSearch.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);
+            this.controlContainerBottom.Controls.Clear();
+            var calcuCtrl = GetCalcuCtrl();
+            calcuCtrl.SetBindingData(_hydroInfo);
+            this.controlContainerBottom.Controls.Add(calcuCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "姘村姏璁$畻鍓嶆彁鏉′欢";
+            this.docPnlBottom.Height = 350;
         }
+
+
 
         #endregion
 
-        #region 鏌ヨ
+        #region 鏋勪欢鏌ヨ
+
+        //鑾峰彇鏌ヨ缁勪欢
+        private XhsProjectSimulationSearchCtrl GetSearchCtrl()
+        {
+            if (_searchCtrl == null)
+            {
+                _searchCtrl = new XhsProjectSimulationSearchCtrl();
+                _searchCtrl.Dock = DockStyle.Fill;
+                _searchCtrl.InitialData(() => _hydroInfo);
+                _searchCtrl.ApplySearchEvent += async (list) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var elementIds = new List<string>();
+                    if (list != null && list.Count > 0)
+                    {
+                        var first = list.First();
+                        var allParterList = _hydroInfo.GetAllParters();
+                        _parter = allParterList?.Find(x => x.Code == first.Code);
+                        list.ForEach(x => elementIds.Add(x.Code));
+                    }
+                    else
+                    {
+                        _parter = null;
+                    }
+                    await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
+                    ShowProperty();
+                    SetBimfaceLinkColor();
+                };
+            }
+            return _searchCtrl;
+        }
+        private XhsProjectSimulationSearchCtrl _searchCtrl = null;//鏌ヨ缁勪欢
 
         //鏌ヨ
         private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -559,43 +684,18 @@
             {
                 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;
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
 
-            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlSearch.Height = 350;
-        }
-
-        //搴旂敤鏌ヨ
-        private async void XhsProjectSimulationSearchCtrl1_ApplySearchEvent(List<Yw.Model.HydroParterInfo> obj)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var elementIds = new List<string>();
-            if (obj != null && obj.Count > 0)
-            {
-                var first = obj.First();
-                var allParterList = _hydroInfo.GetAllParters();
-                _parter = allParterList.Find(x => x.Code == first.Code);
-                obj.ForEach(x => elementIds.Add(x.Code));
-            }
-            else
-            {
-                _parter = null;
-            }
-            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
-            ShowProperty();
-            SetBimfaceLinkColor();
+            this.controlContainerBottom.Controls.Clear();
+            var searchCtrl = GetSearchCtrl();
+            this.controlContainerBottom.Controls.Add(searchCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "妯″瀷鏋勪欢鏌ヨ";
+            this.docPnlBottom.Height = 350;
         }
 
         #endregion
 
 
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3