From b10f8e0a7cdd4fcfb92b011091ec39c1024eee33 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 11 十一月 2024 17:21:24 +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 | 2908 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 2,418 insertions(+), 490 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 79007e5..5f4424f 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,6 +1,14 @@
 锘縢lobal using Yw.EPAnet;
 using DevExpress.Mvvm.Native;
+using DevExpress.Xpo.Helpers;
+using DevExpress.XtraRichEdit.Layout;
+using DevExpress.XtraSpreadsheet.Commands;
 using HStation.WinFrmUI.PhartRelation;
+using System.Diagnostics;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+using Yw.Pump;
+using Yw.Vmo;
 using Yw.WinFrmUI.Bimface;
 using Yw.WinFrmUI.Hydro;
 
@@ -14,7 +22,6 @@
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
             RegistBulkSetEvents();
         }
 
@@ -22,9 +29,10 @@
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
 
-        private Yw.Model.HydroParterInfo _parter = null;
-        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;
-        private Yw.EPAnet.CalcuResult _calcuResult = null;
+
+        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;//妫�鏌ョ粨鏋�
+        private Yw.EPAnet.CalcuResult _calcuResult = null;//璁$畻缁撴灉
+
 
         /// <summary>
         /// 缁戝畾鏁版嵁
@@ -58,7 +66,7 @@
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
         /// </summary>
-        public override async void InitialDataSource()
+        public override void InitialDataSource()
         {
             base.InitialDataSource();
             if (_project == null)
@@ -66,17 +74,12 @@
                 return;
             }
             this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
-            var bimfaceCtrl = GetBimfaceCtrl();
-            this.tabPageBimface.Controls.Clear();
-            this.tabPageBimface.Controls.Add(bimfaceCtrl);
-            await bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
-            var q3dCtrl = GetQ3dCtrl();
-            this.tabPageQ3d.Controls.Clear();
-            this.tabPageQ3d.Controls.Add(q3dCtrl);
-            q3dCtrl.InitialData(() => _hydroInfo);
+            ShowBimfaceCtrl();
+            ShowQ3dCtrl();
             ShowPropertyCtrl();
 
         }
+
 
         #region Bimface
 
@@ -84,24 +87,20 @@
         private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
 
         //鑾峰彇 bimface 鎺т欢
-        private XhsProjectSimulationBimfaceCtrl GetBimfaceCtrl()
+        private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
         {
             if (_bimfaceCtrl == null)
             {
                 _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                _bimfaceCtrl.LoadCompletedEvent += async () =>
+                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var elementIds = new List<string>();
-                    var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.PumpStatus.Open).ToList();
-                    pumps?.ForEach(x => elementIds.Add(x.Code));
-                    var valves = _hydroInfo.Valves?.Where(x => x.LinkStatus == Yw.Hydro.ValveStatus.Open).ToList();
-                    valves?.ForEach(x => elementIds.Add(x.Code));
-                    await _bimfaceCtrl?.SetOpenComponentsColor(elementIds);
+                    ApplyGrading();
                 };
                 _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
@@ -109,108 +108,66 @@
                     {
                         return;
                     }
-                    _parter = obj;
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    _selectedVisual = obj;
+                    ShowSelectedProperty();
                 };
             }
             return _bimfaceCtrl;
         }
 
-
-
-        //璁剧疆Bimface杩炴帴棰滆壊
-        private async void SetBimfaceLinkColor()
+        //鏄剧ず bimface 鎺т欢
+        private async void ShowBimfaceCtrl()
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_parter != null)
-            {
-                if (_parter is Yw.Model.HydroLinkInfo link)
-                {
-                    await _bimfaceCtrl?.RestoreLinkComponentsColor();
+            var bimfaceCtrl = await GetBimfaceCtrl();
+            this.tabPageBimface.Controls.Clear();
+            this.tabPageBimface.Controls.Add(bimfaceCtrl);
+        }
 
-                    var allVisualList = _hydroInfo.GetAllVisuals();
-                    var allLinkList = _hydroInfo.GetAllLinks();
-                    var startParter = allVisualList?.Find(x => x.Code == link.StartCode);
-                    if (startParter != null)
-                    {
-                        var startElementIds = new List<string>();
-                        if (startParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
-                        {
-                            var startLinkList = allLinkList?.Where(x => x.StartCode == startParter.Code || x.EndCode == startParter.Code && x.Code != _parter.Code).ToList();
-                            if (startLinkList != null && startLinkList.Count > 0)
-                            {
-                                startElementIds.AddRange(startLinkList.Select(x => x.Code));
-                            }
-                        }
-                        else
-                        {
-                            startElementIds.Add(startParter.Code);
-                        }
-                        if (startElementIds.Count > 0)
-                        {
-                            await _bimfaceCtrl?.SetLinkStartComponentsColor(startElementIds);
-                        }
-                    }
-                    var endParter = allVisualList?.Find(x => x.Code == link.EndCode);
-                    if (endParter != null)
-                    {
-                        var endElementIds = new List<string>();
-                        if (endParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
-                        {
-                            var endLinkList = allLinkList?.Where(x => x.StartCode == endParter.Code || x.EndCode == endParter.Code && x.Code != _parter.Code).ToList();
-                            if (endLinkList != null && endLinkList.Count > 0)
-                            {
-                                endElementIds.AddRange(endLinkList.Select(x => x.Code));
-                            }
-                        }
-                        else
-                        {
-                            endElementIds.Add(endParter.Code);
-                        }
-                        if (endElementIds.Count > 0)
-                        {
-                            await _bimfaceCtrl?.SetLinkEndComponentsColor(endElementIds);
-                        }
-                    }
-                }
-            }
+        private void SelectBimfaceParter()
+        {
+
         }
 
         #endregion
 
         #region Q3d
 
-        //鑾峰彇Q3d鎺т欢
+        //Q3d 鎺т欢
+        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
+
+        //鑾峰彇 Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
         {
             if (_q3dCtrl == null)
             {
                 _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                 _q3dCtrl.Dock = DockStyle.Fill;
+                _q3dCtrl.InitialData(() => _hydroInfo);
                 _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
                 {
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
-                    ShowProperty();
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
+                    ShowSelectedProperty();
                 };
             }
             return _q3dCtrl;
         }
 
-        //Q3d鎺т欢
-        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
+        //鏄剧ず Q3d 鎺т欢
+        private void ShowQ3dCtrl()
+        {
+            var q3dCtrl = GetQ3dCtrl();
+            this.tabPageQ3d.Controls.Clear();
+            this.tabPageQ3d.Controls.Add(q3dCtrl);
+        }
 
-        #endregion Q3d
+        #endregion
 
-        #region 灞炴�ч潰鏉�
+        #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
         private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
@@ -222,7 +179,7 @@
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetAllCalcuResultList());
+                _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
                 _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
                 { //寮鸿皟杩炴帴缁勪欢
                     if (string.IsNullOrEmpty(code))
@@ -271,13 +228,72 @@
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
+
+                _propertyCtrl.ViewParterEvent += (parter) =>
+                {
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    _bimfaceCtrl?.ZoomToComponent(parter.Code);
+                };
+                _propertyCtrl.PropertyValueChangedEvent += (parter) =>
+                {
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    UpdateVisualListCtrl();
+                    AutoApplyGrading();
+                };
+                _propertyCtrl.MarkPropertyValueChangedEvent += (parter) =>
+                {
+                    //鏍囨敞灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+                };
+                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                {
+                    //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                };
+                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (parter) =>
+                {
+                    //娴佸悜灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
+                    UpdateFlowEffect(parter);
+                    //await _bimfaceCtrl?.UnloadFlowEffectById(parter.Code);
+                };
+
             }
             return _propertyCtrl;
         }
 
-        //鏄剧ず灞炴�ч潰鏉�
+        //灞炴�ф帶浠舵槸鍚﹀彲瑙�
+        private bool IsPropertyCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerRight.Controls.Count > 0)
+                    {
+                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず灞炴�ф帶浠�
         private void ShowPropertyCtrl()
         {
+            if (IsPropertyCtrlVisible)
+            {
+                return;
+            }
             var propertyCtrl = GetPropertyCtrl();
             this.controlContainerRight.Controls.Clear();
             this.controlContainerRight.Controls.Add(propertyCtrl);
@@ -286,70 +302,46 @@
             this.docPnlRight.Width = 300;
         }
 
-        //灞炴�ч潰鏉挎寜閽�
-        private void barBtnProperty_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏄剧ず閫夋嫨灞炴��
+        private void ShowSelectedProperty()
         {
-            ShowPropertyCtrl();
+            ShowSelectedProperty(_selectedVisual);
         }
 
-        //鏄剧ず灞炴��
-        private void ShowProperty()
+        //鏄剧ず閫夋嫨灞炴��
+        private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Hidden)
+            ShowPropertyCtrl();
+            _selectedVisual = visual;
+            if (_selectedVisual == null)
             {
-                ShowPropertyCtrl();
-            }
-
-            if (_parter == null)
-            {
-                _propertyCtrl?.SelectParter(null);
+                _propertyCtrl.SelectedObject = null;
                 return;
             }
+            _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
+        }
 
-            _propertyCtrl?.SelectParter(_parter.Code);
-            if (_calcuResult != null)
+        //鏇存柊閫夋嫨灞炴��
+        private void UpdateSelectedProperty()
+        {
+            if (!IsPropertyCtrlVisible)
             {
-                if (_calcuResult.Succeed)
-                {
-                    var allCalcuParterList = _calcuResult.GetParterList();
-                    var calcuParter = allCalcuParterList.Find(x => x.Id == _parter.Code);
-                    if (calcuParter != null)
-                    {
-                        IHydroCalcuResult calcuProperty = null;
-                        if (calcuParter is Yw.EPAnet.CalcuNode calcuNode)
-                        {
-                            var calcuNodeProperty = new Yw.WinFrmUI.HydroCalcuNodeResult();
-                            calcuNodeProperty.Code = _parter.Code;
-                            calcuNodeProperty.CalcuPress = calcuNode.Press;
-                            calcuNodeProperty.CalcuDemand = calcuNode.Demand;
-                            calcuNodeProperty.CalcuHead = calcuNode.Head;
-                            calcuProperty = calcuNodeProperty;
-                        }
-                        else if (calcuParter is Yw.EPAnet.CalcuLink calcuLink)
-                        {
-                            var calcuLinkProperty = new Yw.WinFrmUI.HydroCalcuLinkResult();
-                            calcuLinkProperty.Code = _parter.Code;
-                            calcuLinkProperty.CalcuHeadLoss = calcuLink.Headloss;
-                            calcuLinkProperty.CalcuFlow = calcuLink.Flow;
-                            calcuLinkProperty.CalcuVelocity = calcuLink.Velocity;
-                            calcuProperty = calcuLinkProperty;
-                        }
-
-                        if (calcuProperty != null)
-                        {
-                            _propertyCtrl?.UpdateCalcuProperty(calcuProperty);
-                        }
-                    }
-                }
+                return;
             }
-
+            if (_selectedVisual == null)
+            {
+                return;
+            }
+            _propertyCtrl?.UpdateRows();
         }
 
         #endregion
+
+
 
         #region 鑷姩鍖归厤
 
@@ -366,16 +358,15 @@
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == code);
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == code);
                     var elementIds = new List<string>();
-                    if (_parter != null)
+                    if (_selectedVisual != null)
                     {
-                        elementIds.Add(_parter.Code);
+                        elementIds.Add(_selectedVisual.Code);
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    ShowSelectedProperty();
                 };
                 _matchingListCtrl.ApplyMatchingEvent += (output) =>
                 {
@@ -401,7 +392,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetAllCalcuResultList());
+            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
             matchingListCtrl.SetBindingData(input);
             this.controlContainerBottom.Controls.Add(matchingListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -409,7 +400,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion 鑷姩鍖归厤
+        #endregion
 
         #region 鏈尮閰嶅垪琛�
 
@@ -430,19 +421,18 @@
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == parter.Code);
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
                     var elementIds = new List<string>() { parter.Code };
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    ShowSelectedProperty();
                 };
                 _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
                 {
                     var codes = parters?.Select(x => x.Code).Distinct().ToList();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _parter = null;
-                    ShowProperty();
+                    _selectedVisual = null;
+                    ShowSelectedProperty();
                 };
             }
             return _unMatchingListCtrl;
@@ -466,12 +456,15 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion 鏈尮閰嶅垪琛�
+        #endregion
 
         #region 涓�閿樉闅�
 
+        //鏄鹃殣缂栫爜鍒楄〃
+        private List<string> _fastShowHiddenCodeList = null;
+
         //涓�閿樉闅�
-        private async Task FastShowHidden()
+        private async void FastShowHidden()
         {
             if (_hydroInfo == null)
             {
@@ -493,86 +486,15 @@
             }
         }
 
-        //鏄鹃殣缂栫爜鍒楄〃
-        private List<string> _fastShowHiddenCodeList = null;
-
         //瑙﹀彂涓�閿樉闅�
-        private async void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            await FastShowHidden();
+            FastShowHidden();
         }
 
         #endregion
 
-        #region 姘村姏鏍¢獙
 
-        //鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl _checkCtrl = null;
-
-        //鑾峰彇鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl GetCheckCtrl()
-        {
-            if (_checkCtrl == null)
-            {
-                _checkCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
-                _checkCtrl.Dock = DockStyle.Fill;
-                _checkCtrl.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 _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
-                };
-            }
-            return _checkCtrl;
-        }
-
-        //鏄剧ず鏍¢獙鎺т欢
-        private void ShowCheckCtrl()
-        {
-            if (_checkResult == null)
-            {
-                return;
-            }
-            var checkCtrl = GetCheckCtrl();
-            checkCtrl.SetBindingData(_checkResult);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(checkCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏍¢獙缁撴灉";
-            this.docPnlBottom.Height = 350;
-
-        }
-
-        //姘村姏楠岃瘉
-        private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            _checkResult = _hydroInfo.Check();
-            ShowCheckCtrl();
-        }
-
-        #endregion 姘村姏鏍¢獙
 
         #region 淇濆瓨淇℃伅
 
@@ -583,7 +505,17 @@
             {
                 return;
             }
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+
+
             var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
+
+            //鑰楁椂宸ㄥぇ鐨勪唬鐮�  
+
+            sw.Stop();
+            TimeSpan ts2 = sw.Elapsed;
+            Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
             if (id < 1)
             {
                 TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
@@ -593,59 +525,9 @@
             TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
         }
 
-        #endregion 淇濆瓨姘村姏淇℃伅
+        #endregion
 
-        #region 鏋勪欢鏄庣粏
 
-        //鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;
-
-        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
-        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 _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _parter.Code });
-                    ShowProperty();
-                    SetBimfaceLinkColor();
-                };
-            }
-            return _parterListCtrl;
-        }
-
-        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowParterListCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var parterListCtrl = GetParterListCtrl();
-            parterListCtrl.SetBindingData(_hydroInfo, GetAllCalcuResultList());
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(parterListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
-            this.docPnlBottom.Height = 350;
-        }
-
-        //鏋勪欢鏄庣粏
-        private void barBtnHydroParterList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowParterListCtrl();
-        }
-
-        #endregion 鏋勪欢鏄庣粏
 
         #region INP瀵煎嚭
 
@@ -677,54 +559,183 @@
             //姘村簱
             this.barBtnSetReservoirList.ItemClick += delegate
             {
-                var dlg = new HydroReservoirBulkSetListDlg();
-                dlg.ShowDialog();
+                //var dlg = new HydroReservoirBulkSetListDlg();
+                //dlg.ShowDialog();
             };
             //姘存睜
             this.barBtnSetTankList.ItemClick += delegate
             {
-                var dlg = new HydroTankBulkSetListDlg();
-                dlg.ShowDialog();
+                //var dlg = new HydroTankBulkSetListDlg();
+                //dlg.ShowDialog();
             };
             //姘寸
             this.barBtnSetWaterboxList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroWaterboxListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //杩炴帴鑺傜偣
+            this.barBtnSetJunctionList.ItemClick += delegate
+            {
+                //var dlg = new HydroJunctionBulkSetListDlg();
+                //dlg.ShowDialog();
+            };
+            //闂峰ご
+            this.barBtnSetBluntheadList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroBluntheadListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //寮ご
+            this.barBtnSetElbowsList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroElbowListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //涓夐��
+            this.barBtnSetThreelinkList.ItemClick += delegate
             {
                 if (_hydroInfo == null)
                 {
                     return;
                 }
-                var dlg = new HydroWaterboxBulkSetListDlg();
+                var dlg = new SetHydroThreelinkListDlg();
                 dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //杩炴帴鑺傜偣
-            this.barBtnSetJunctionList.ItemClick += delegate
-            {
-                var dlg = new HydroJunctionBulkSetListDlg();
-                dlg.ShowDialog();
-            };
-            //闂峰ご
-            this.barBtnSetBluntheadList.ItemClick += delegate
-            {
-                var dlg = new HydroBluntheadBulkSetListDlg();
-                dlg.ShowDialog();
-            };
-            //寮ご
-            this.barBtnSetElbowsList.ItemClick += delegate
-            {
-                var dlg = new HydroElbowBulkSetListDlg();
-                dlg.ShowDialog();
-            };
-            //涓夐��
-            this.barBtnSetThreelinkList.ItemClick += delegate
-            {
-                var dlg = new HydroThreelinkBulkSetListDlg();
                 dlg.ShowDialog();
             };
             //鍥涢��
             this.barBtnSetFourlinkList.ItemClick += delegate
             {
-
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroFourlinkListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //姘磋〃
+            this.barBtnSetMeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroMeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //娴侀噺璁�
+            this.barBtnSetFlowmeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroFlowmeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //鍘嬪姏琛�
+            this.barBtnSetPressmeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPressmeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //绠¢亾
+            this.barBtnSetPipeList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPipeListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //姘存车
+            this.barBtnSetPumpList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPumpListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //闃�闂�
+            this.barBtnSetValveList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroValveListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
             };
         }
 
@@ -950,7 +961,7 @@
             {
                 return;
             }
-            var allCalcuResultList = GetAllCalcuResultList();
+            var allCalcuResultList = GetCalcuResultList();
             var vmList = new List<XhsSinglePumpViewModel>();
             foreach (var pump in _hydroInfo.Pumps)
             {
@@ -1009,8 +1020,22 @@
 
             }
 
-            var dlg = new PumpParallelChartDlg();
+            var dlg = new PumpParallelAnalyDlg();
             dlg.SetBindingData(vmList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                list?.ForEach(x =>
+                {
+                    var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
+                    if (pump != null)
+                    {
+                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+                        pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
+                    }
+                });
+                ShowSelectedProperty();
+                return true;
+            };
             dlg.ShowDialog();
         }
 
@@ -1018,63 +1043,124 @@
 
         #region 姘村姏璁$畻
 
-        //璁$畻鎺т欢
-        private SetHydroCalcuPrefixCtrl _calcuCtrl = null;
 
-        //鑾峰彇璁$畻鎺т欢
-        private SetHydroCalcuPrefixCtrl GetCalcuCtrl()
+        #region 宸ュ喌
+
+
+        //鏄剧ず宸ュ喌璁$畻绐椾綋
+        private void ShowWorkingCalcuDlg()
         {
-            if (_calcuCtrl == null)
+            var dlg = new SetHydroWorkingInfoDlg();
+            dlg.HydroViewEvent += async (parter) =>
             {
-                _calcuCtrl = new SetHydroCalcuPrefixCtrl();
-                _calcuCtrl.Dock = DockStyle.Fill;
-                _calcuCtrl.InitialData(() => _hydroInfo);
-                _calcuCtrl.HydroViewEvent += async (parter) =>
-                {//姘村姏鏌ョ湅浜嬩欢
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { parter.Code });
-                };
-                _calcuCtrl.HydroCalcuEvent += async () =>
-                {//姘村姏璁$畻浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
+                _selectedVisual = parter as Yw.Model.HydroVisualInfo;
+                if (_selectedVisual != null)
+                {
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
+                }
+                ShowSelectedProperty();
+            };
+            dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                _hydroInfo.UpdateWorkingInfo(workingInfo);
+                //鏍¢獙
+                _checkResult = _hydroInfo.Check();
+                if (!_checkResult.Succeed)
+                {
+                    ShowCheckCtrl();
+                    TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    return;
+                }
 
-                    //鏍¢獙
-                    _checkResult = _hydroInfo.Check();
-                    if (!_checkResult.Succeed)
-                    {
-                        ShowCheckCtrl();
-                        TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
-                        return;
-                    }
+                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
 
-                    var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-                    _calcuResult = netWork.Calcu();
-                    if (_calcuResult.Succeed)
-                    {
-                        this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-                        await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
-                        TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    }
-                    else
-                    {
-                        _calcuCtrl.SetFailedList(_calcuResult.FailedList);
-                        this.docPnlRight.Text = "澶辫触鍘熷洜";
-                        this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                        TipFormHelper.ShowError("璁$畻澶辫触");
-                    }
-                };
-            }
-            return _calcuCtrl;
+
+                await Task.Delay(5000);
+
+                var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+                _calcuResult = netWork.CalcuMinorLoss();
+
+                WaitFormHelper.HideWaitForm();
+                if (_calcuResult.Succeed)
+                {
+                    GetCalcuResultList(false);
+                    UpdateVisualViewModelCalcuProperty();
+                    UpdateVisualListCtrl();
+                    UpdateSelectedProperty();
+                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
+                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+                }
+                else
+                {
+                    ShowCalcuFailedCtrl();
+                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                }
+                AutoApplyGrading();
+                UpdateVisualListCtrl();
+                ShowSelectedProperty();
+            };
+            dlg.SetBindingData(_hydroInfo);
+            dlg.ShowDialog();
         }
 
+        #endregion
+
+        #region 璁$畻澶辫触
+
+        //璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
+
+        //鑾峰彇璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
+        {
+            if (_calcuFailedCtrl == null)
+            {
+                _calcuFailedCtrl = new HydroCalcuFailedCtrl();
+                _calcuFailedCtrl.Dock = DockStyle.Fill;
+            }
+            return _calcuFailedCtrl;
+        }
+
+        //鏄剧ず璁$畻澶辫触鎺т欢
+        private void ShowCalcuFailedCtrl()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (_calcuResult == null)
+            {
+                return;
+            }
+            if (_calcuResult.Succeed)
+            {
+                return;
+            }
+            var calcuFailedCtrl = GetCalcuFailedCtrl();
+            calcuFailedCtrl.SetBindingData(_calcuResult.FailedList);
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
+            this.docPnlBottom.Height = 350;
+        }
+
+        #endregion
+
+        #region 璁$畻缁撴灉
+
+        //鎵�鏈夎绠楃粨鏋滃垪琛�
+        private List<HydroCalcuResult> _allCalcuResultList = null;
+
         //鑾峰彇璁$畻缁撴灉
-        private List<IHydroCalcuResult> GetAllCalcuResultList()
+        //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
+        private List<HydroCalcuResult> GetCalcuResultList(bool isCache = true)
         {
             if (_hydroInfo == null)
             {
@@ -1088,73 +1174,162 @@
             {
                 return default;
             }
-            var list = new List<IHydroCalcuResult>();
+            if (isCache)
+            {
+                return _allCalcuResultList;
+            }
 
+            _allCalcuResultList = new List<HydroCalcuResult>();
+
+            //鑺傜偣
             var allNodeList = _hydroInfo.GetAllNodes();
             if (allNodeList != null && allNodeList.Count > 0)
             {
-                var allCalcuNodeList = _calcuResult.NodeList;
-                if (allCalcuNodeList != null && allCalcuNodeList.Count > 0)
+                foreach (var node in allNodeList)
                 {
-                    foreach (var node in allNodeList)
+                    var calcuNode = _calcuResult.NodeList?.Find(x => x.Id == node.Code);
+                    if (calcuNode != null)
                     {
-                        var calcuNode = allCalcuNodeList.Find(x => x.Id == node.Code);
-                        if (calcuNode != null)
+                        var calcuResult = new HydroCalcuNodeResult()
                         {
-                            var calcuResult = new HydroCalcuNodeResult()
-                            {
-                                Code = node.Code,
-                                CalcuPress = calcuNode.Press,
-                                CalcuHead = calcuNode.Head,
-                                CalcuDemand = calcuNode.Demand
-                            };
-                            list.Add(calcuResult);
-                        }
+                            Code = node.Code,
+                            CalcuPress = calcuNode.Press,
+                            CalcuHead = calcuNode.Head,
+                            CalcuDemand = calcuNode.Demand
+                        };
+                        _allCalcuResultList.Add(calcuResult);
                     }
                 }
             }
 
-            var allListList = _hydroInfo.GetAllLinks();
-            if (allListList != null && allListList.Count > 0)
+            //绠℃
+            var allLinkList = _hydroInfo.GetAllLinks();
+            if (allLinkList != null && allLinkList.Count > 0)
             {
-                var allCalcuLinkList = _calcuResult.LinkList;
-                if (allCalcuLinkList != null && allCalcuLinkList.Count > 0)
+                foreach (var link in allLinkList)
                 {
-                    foreach (var link in allListList)
+                    var calcuLink = _calcuResult.LinkList?.Find(x => x.Id == link.Code);
+                    if (calcuLink != null)
                     {
-                        var calcuLink = allCalcuLinkList.Find(x => x.Id == link.Code);
-                        if (calcuLink != null)
+                        var calcuResult = new HydroCalcuLinkResult()
                         {
-                            var calcuResult = new HydroCalcuLinkResult()
-                            {
-                                Code = link.Code,
-                                CalcuFlow = calcuLink.Flow,
-                                CalcuVelocity = calcuLink.Velocity,
-                                CalcuHeadLoss = calcuLink.Headloss
-                            };
-                            list.Add(calcuResult);
-                        }
+                            Code = link.Code,
+                            CalcuFlow = calcuLink.Flow,
+                            CalcuVelocity = calcuLink.Velocity,
+                            CalcuHeadLoss = calcuLink.Headloss
+                        };
+                        _allCalcuResultList.Add(calcuResult);
                     }
                 }
             }
 
-            return list;
+            //娴侀噺璁�
+            var allFlowmeterList = _hydroInfo.Flowmeters;
+            if (allFlowmeterList != null && allFlowmeterList.Count > 0)
+            {
+                foreach (var flowmeter in allFlowmeterList)
+                {
+                    var calcuFlowmeterResult = _allCalcuResultList.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
+                    if (calcuFlowmeterResult != null)
+                    {
+                        var calcuFlowmeterNewResult = new HydroCalcuFlowmeterResult(calcuFlowmeterResult);
+                        var calcuFlowmeterLinkResultList = new List<HydroCalcuLinkResult>();
+                        var flowmeterLinkList = allLinkList?.Where(x => x.StartCode == flowmeter.Code || x.EndCode == flowmeter.Code).ToList();
+                        if (flowmeterLinkList != null && flowmeterLinkList.Count > 0)
+                        {
+                            foreach (var flowmeterLink in flowmeterLinkList)
+                            {
+                                var calcuFlowmeterLinkResult = _allCalcuResultList.Find(x => x.Code == flowmeterLink.Code) as HydroCalcuLinkResult;
+                                if (calcuFlowmeterLinkResult != null)
+                                {
+                                    calcuFlowmeterLinkResultList.Add(calcuFlowmeterLinkResult);
+                                }
+                            }
+                        }
+                        if (calcuFlowmeterLinkResultList.Exists(x => x.CalcuFlow.HasValue))
+                        {
+                            calcuFlowmeterNewResult.CalcuQ = calcuFlowmeterLinkResultList.Where(x => x.CalcuFlow.HasValue).Average(x => x.CalcuFlow.Value);
+                        }
+                        _allCalcuResultList.Remove(calcuFlowmeterResult);
+                        _allCalcuResultList.Add(calcuFlowmeterNewResult);
+                    }
+                }
+            }
+
+            //鍘嬪姏琛�
+            var allPressmeterList = _hydroInfo.Pressmeters;
+            if (allPressmeterList != null && allPressmeterList.Count > 0)
+            {
+                foreach (var pressmeter in allPressmeterList)
+                {
+                    var calcuPressmeterResult = _allCalcuResultList.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
+                    if (calcuPressmeterResult != null)
+                    {
+                        var calcuPressmeterNewResult = new HydroCalcuPressmeterResult(calcuPressmeterResult);
+                        calcuPressmeterNewResult.CalcuPr = calcuPressmeterResult.CalcuPress;
+                        _allCalcuResultList.Remove(calcuPressmeterResult);
+                        _allCalcuResultList.Add(calcuPressmeterNewResult);
+                    }
+                }
+            }
+
+            //姘存车
+            var allPumpList = _hydroInfo.Pumps;
+            if (allPumpList != null && allPumpList.Count > 0)
+            {
+                foreach (var pump in allPumpList)
+                {
+                    var calcuPumpResult = _allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+                    if (calcuPumpResult != null)
+                    {
+                        var calcuPumpNewResult = new HydroCalcuPumpResult(calcuPumpResult);
+                        calcuPumpNewResult.CalcuQ = calcuPumpResult.CalcuFlow;
+                        if (calcuPumpNewResult.CalcuQ.HasValue)
+                        {
+                            var calcuNodeStartResult = _allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+                            var calcuNodeEndResult = _allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+                            if (calcuNodeStartResult != null && calcuNodeEndResult != null)
+                            {
+                                if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
+                                {
+                                    calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
+                                }
+                                if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
+                                {
+                                    var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
+                                    if (curveqp != null)
+                                    {
+                                        if (curveqp.CurveData != null && curveqp.CurveData.Count > 3)
+                                        {
+                                            var point2dList = curveqp.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
+                                            var point2dSimularList = point2dList.GetQPPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
+                                            var pumpCurveQp = new Yw.Pump.CurveQP(eFeatType.Cubic, point2dSimularList);
+                                            calcuPumpNewResult.CalcuP = pumpCurveQp.FeatCurve.GetPointY(calcuPumpNewResult.CalcuQ.Value);
+                                        }
+                                    }
+                                }
+                                if (calcuPumpNewResult.CalcuH.HasValue && calcuPumpNewResult.CalcuP.HasValue)
+                                {
+                                    calcuPumpNewResult.CalcuE = Yw.Pump.CalculationHelper.CalcuE(calcuPumpNewResult.CalcuQ.Value, calcuPumpNewResult.CalcuH.Value, calcuPumpNewResult.CalcuP.Value);
+                                }
+                            }
+                        }
+                        _allCalcuResultList.Remove(calcuPumpResult);
+                        _allCalcuResultList.Add(calcuPumpNewResult);
+                    }
+                }
+            }
+
+            return _allCalcuResultList;
         }
+
+        #endregion
 
         //姘村姏璁$畻
         private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var calcuPrefixCtrl = GetCalcuCtrl();
-            calcuPrefixCtrl.SetBindingData();
-            this.controlContainerRight.Controls.Clear();
-            this.controlContainerRight.Controls.Add(calcuPrefixCtrl);
-            this.docPnlRight.Text = "鍓嶆彁鏉′欢";
-            this.docPnlRight.Width = SetHydroCalcuPrefixCtrl.ControlMinWidth;
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            //ShowCalcuPrefixDlg();
+            ShowWorkingCalcuDlg();
         }
 
         #endregion
@@ -1162,50 +1337,69 @@
         #region 鏋勪欢鏌ヨ
 
         //鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl _searchCtrl = null;
+        private HydroVisualSearchListCtrl _searchCtrl = null;
 
         //鑾峰彇鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl GetSearchCtrl()
+        private HydroVisualSearchListCtrl GetSearchCtrl()
         {
             if (_searchCtrl == null)
             {
-                _searchCtrl = new XhsProjectSimulationSearchCtrl();
+                _searchCtrl = new HydroVisualSearchListCtrl();
                 _searchCtrl.Dock = DockStyle.Fill;
-                _searchCtrl.InitialData(() => _hydroInfo);
-                _searchCtrl.ApplySearchEvent += async (list) =>
+                var allVisualViewModelList = GetVisualViewModelList();
+                _searchCtrl.InitialData(allVisualViewModelList);
+                _searchCtrl.HydroClickInfoEvent += async (visual) =>
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
+                    ShowSelectedProperty(visual);
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                };
+                _searchCtrl.HydroSearchInfoEvent += async (list) =>
+                {
                     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);
+                        _selectedVisual = list.First();
                         list.ForEach(x => elementIds.Add(x.Code));
                     }
                     else
                     {
-                        _parter = null;
+                        _selectedVisual = null;
                     }
+                    ShowSelectedProperty();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
                 };
             }
             return _searchCtrl;
         }
 
-        //鏄剧ず鏌ヨ鎺т欢
-        private void ShowSearchCtrl()
+        //鏌ヨ鎺т欢鏄惁鍙
+        private bool IsSearchCtrlVisible
         {
-            if (_hydroInfo == null)
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroVisualSearchListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず鏌ヨ鎺т欢
+        private void ShowSearchCtrl(string content)
+        {
+            if (IsSearchCtrlVisible)
             {
                 return;
             }
             var searchCtrl = GetSearchCtrl();
+            searchCtrl.SetBindingData(content);
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(searchCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -1213,123 +1407,646 @@
             this.docPnlBottom.Height = 350;
         }
 
+        //鏄剧ず鏌ヨ绐椾綋
+        private void ShowSearchDlg()
+        {
+            if (IsSearchCtrlVisible)
+            {
+                return;
+            }
+            var dlg = new InputHydroVisualSearchListDlg();
+            dlg.SearchEvent += (content) =>
+            {
+                if (string.IsNullOrEmpty(content))
+                {
+                    return;
+                }
+                ShowSearchCtrl(content);
+            };
+            dlg.SetBindingData();
+            dlg.ShowDialog();
+        }
+
         //鏌ヨ
         private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSearchCtrl();
+            ShowSearchDlg();
         }
 
         #endregion
 
         #region 妯″瀷鏍囨敞
 
-        //鎵�鏈夋爣娉ㄥ垪琛�
-        private List<HydroMarkSetViewModel> _allMarkList = null;
+        //鎵�鏈夋爣娉ㄨ缃垪琛�
+        private List<HydroMarkSetViewModel> _allMarkSetList = null;
 
-        //鏄剧ず鏍囨敞绐椾綋
-        private async void ShowMarkDlg()
+        //鑾峰彇鏍囨敞璁剧疆鍒楄〃
+        private List<HydroMarkSetViewModel> GetMarkSetList()
         {
-            if (_hydroInfo == null)
+            if (_allMarkSetList == null)
             {
-                return;
-            }
-            if (_allMarkList == null)
-            {
-                _allMarkList = new List<HydroMarkSetViewModel>();
+                _allMarkSetList = new List<HydroMarkSetViewModel>();
                 if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
                 {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
+                    _allMarkSetList.Add(new HydroMarkSetViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Waterbox,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Waterbox),
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox),
                         MarkType = (int)eWaterboxMarkType.None
                     });
                 }
                 if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
                 {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
+                    _allMarkSetList.Add(new HydroMarkSetViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pump),
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
                         MarkType = (int)eWaterboxMarkType.None
                     });
                 }
                 if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
                 {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
+                    _allMarkSetList.Add(new HydroMarkSetViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Valve),
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
                         MarkType = (int)eWaterboxMarkType.None
                     });
                 }
                 if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
                 {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
+                    _allMarkSetList.Add(new HydroMarkSetViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pipe),
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
                         MarkType = (int)eWaterboxMarkType.None
                     });
                 }
                 if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
                 {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
+                    _allMarkSetList.Add(new HydroMarkSetViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Nozzle),
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle),
                         MarkType = (int)eWaterboxMarkType.None
                     });
                 }
             }
-            var dlg = new SetHydroMarkDlg();
-            dlg.InitialData(() => _hydroInfo);
-            dlg.SetBindingData(_allMarkList);
-            dlg.ReloadDataEvent += async (allResultList) =>
+            return _allMarkSetList;
+        }
+
+        //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
+        private List<HydroMarkResultViewModel> _allMarkResultList = null;
+
+        //鑾峰彇鏍囨敞缁撴灉鍒楄〃
+        private List<HydroMarkResultViewModel> GetMarkResultList()
+        {
+            if (_hydroInfo == null)
             {
-                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text)).ToList();
-                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
-            };
-            if (dlg.ShowDialog() != DialogResult.OK)
-            {
-                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
+                return default;
             }
+            _allMarkResultList = new List<HydroMarkResultViewModel>();
+            var allMarkSetList = GetMarkSetList();
+            foreach (var markSet in allMarkSetList)
+            {
+                switch (markSet.Code)
+                {
+                    case Yw.Hydro.ParterCatalog.Waterbox:
+                        {
+                            if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
+                            {
+                                switch ((eWaterboxMarkType)markSet.MarkType)
+                                {
+                                    case eWaterboxMarkType.None:
+                                        {
+
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.PoolElev:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"姹犲簳鏍囬珮:{Math.Round(t.PoolElev, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.InitLevel:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鍒濆姘翠綅:{Math.Round(t.InitLevel, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.MinLevel:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鏈�灏忔按浣�:{Math.Round(t.MinLevel, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.MaxLevel:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鏈�楂樻按浣�:{Math.Round(t.MaxLevel, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.DN:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鐩村緞:{Math.Round(t.DN, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eWaterboxMarkType.MinVol:
+                                        {
+                                            _hydroInfo.Waterboxs.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鏈�灏忓绉�:{Math.Round(t.MinVol, 1)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ParterCatalog.Pump:
+                        {
+                            if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
+                            {
+                                switch ((ePumpMarkType)markSet.MarkType)
+                                {
+                                    case ePumpMarkType.None:
+                                        {
+
+                                        }
+                                        break;
+                                    case ePumpMarkType.PumpStatus:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"寮�鏈虹姸鎬�:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.RatedP:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"棰濆畾鍔熺巼:{t.RatedP}kW"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.RatedQ:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"棰濆畾娴侀噺:{t.RatedQ}m鲁/h"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.RatedH:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"棰濆畾鎵▼:{t.RatedH}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.RatedN:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"棰濆畾杞��:{t.RatedN}r/min"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.RatedHz:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"棰濆畾棰戠巼:{t.RatedHz}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.CurrentN:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                if (t.RatedN.HasValue)
+                                                {
+                                                    _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                    {
+                                                        Code = t.Code,
+                                                        Text = $"璁惧畾杞��:{Math.Round(t.RatedN.Value * t.SpeedRatio, 1)}r/min"
+                                                    });
+                                                }
+                                            });
+                                        }
+                                        break;
+                                    case ePumpMarkType.CurrentHz:
+                                        {
+                                            _hydroInfo.Pumps.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"璁惧畾棰戠巼:{Math.Round(t.RatedHz * t.SpeedRatio, 1)}hz"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ParterCatalog.Valve:
+                        {
+                            if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
+                            {
+                                switch ((eValveMarkType)markSet.MarkType)
+                                {
+                                    case eValveMarkType.None:
+                                        {
+
+                                        }
+                                        break;
+                                    case eValveMarkType.ValveStatus:
+                                        {
+                                            _hydroInfo.Valves.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"闃�闂ㄧ姸鎬�:{HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eValveMarkType.ValveType:
+                                        {
+                                            _hydroInfo.Valves.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"闃�闂ㄧ被鍨�:{HydroValveTypeHelper.GetTypeName(t.ValveType)}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eValveMarkType.Diameter:
+                                        {
+                                            _hydroInfo.Valves.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鐩村緞:{t.Diameter}mm"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eValveMarkType.MinorLoss:
+                                        {
+                                            _hydroInfo.Valves.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"灞�闃荤郴鏁�:{t.MinorLoss}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ParterCatalog.Pipe:
+                        {
+                            if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                            {
+                                switch ((ePipeMarkType)markSet.MarkType)
+                                {
+                                    case ePipeMarkType.None:
+                                        {
+
+                                        }
+                                        break;
+                                    case ePipeMarkType.PipeStatus:
+                                        {
+                                            _hydroInfo.Pipes.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鐘舵��:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePipeMarkType.Diameter:
+                                        {
+                                            _hydroInfo.Pipes.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鐩村緞:{t.Diameter}mm"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePipeMarkType.Length:
+                                        {
+                                            _hydroInfo.Pipes.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"闀垮害:{t.Length}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePipeMarkType.Roughness:
+                                        {
+                                            _hydroInfo.Pipes.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"绮楃硻绯绘暟:{t.Roughness}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case ePipeMarkType.MinorLoss:
+                                        {
+                                            _hydroInfo.Pipes.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"灞�闃荤郴鏁�:{t.MinorLoss}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ParterCatalog.Nozzle:
+                        {
+                            if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
+                            {
+                                switch ((eNozzleMarkType)markSet.MarkType)
+                                {
+                                    case eNozzleMarkType.None:
+                                        {
+
+                                        }
+                                        break;
+                                    case eNozzleMarkType.Elev:
+                                        {
+                                            _hydroInfo.Nozzles.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鏍囬珮:{Math.Round(t.Elev, 4)}m"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eNozzleMarkType.Demand:
+                                        {
+                                            _hydroInfo.Nozzles.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"闇�姘撮噺:{t.Demand}m鲁/h"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    case eNozzleMarkType.Coefficient:
+                                        {
+                                            _hydroInfo.Nozzles.ForEach(t =>
+                                            {
+                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
+                                                {
+                                                    Code = t.Code,
+                                                    Text = $"鍠峰皠绯绘暟:{t.Coefficient}"
+                                                });
+                                            });
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                        break;
+                    default: break;
+                }
+            }
+            return _allMarkResultList;
+        }
+
+        //搴旂敤鏍囨敞缁撴灉鍒楄〃
+        private async Task ApplyMarkResultList()
+        {
+            var allMarkResultList = GetMarkResultList();
+            var leadLabels = allMarkResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, 100000)).ToList();
+            await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
+            TipFormHelper.ShowSucceed("鏍囨敞淇℃伅宸茶缃�");
+        }
+
+        //娓呴櫎鏍囨敞缁撴灉鍒楄〃
+        private async Task ClearMarkResultList()
+        {
+            if (_allMarkResultList == null || _allMarkResultList.Count < 1)
+            {
+                TipFormHelper.ShowWarn("灏氭湭璁剧疆鏍囨敞淇℃伅");
+                return;
+            }
+            _allMarkResultList = null;
+            await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
+            TipFormHelper.ShowSucceed("鏍囨敞淇℃伅宸叉竻闄�");
+        }
+
+        //鏄剧ず鏍囨敞璁剧疆绐椾綋
+        private void ShowMarkSetDlg()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allMarkSetList = GetMarkSetList();
+            var dlg = new SetHydroMarkDlg();
+            dlg.SetBindingData(allMarkSetList);
+            dlg.ReloadDataEvent += async (list) =>
+            {
+                _allMarkSetList = list;
+                await ApplyMarkResultList();
+            };
+            dlg.ShowDialog();
         }
 
         //璁剧疆鏍囨敞
         private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowMarkDlg();
+            ShowMarkSetDlg();
+        }
+
+        //娓呴櫎鏍囨敞
+        private async void barBtnClearMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            await ClearMarkResultList();
         }
 
         #endregion
 
         #region 棰滆壊鍒嗙骇
 
-        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-        //棰滆壊鍒嗙骇缂栫爜鍒楄〃
-        private List<string> _allGradingCodeList = null;
+        #region 棰滆壊閰嶇疆
 
-        //璁剧疆棰滆壊鍒嗙骇
-        private void SetGrading()
+        //鎵�鏈夊垎绾у垪琛�
+        private List<HydroGradingVmo> _allGradingList = null;
+
+        //鑾峰彇鍒嗙骇鍒楄〃
+        private async Task<List<HydroGradingVmo>> GetGradingList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allGradingList == null)
+            {
+                _allGradingList = await BLLFactory<Yw.BLL.HydroGrading>.Instance.GetByModelID(_hydroInfo.ID);
+                if (_allGradingList == null || _allGradingList.Count < 1)
+                {
+                    var config = Yw.Settings.HydroParasHelper.Hydro.Grading;
+                    if (config != null && config.Items != null && config.Items.Count > 0)
+                    {
+                        _allGradingList = new List<HydroGradingVmo>();
+                        config.Items.ForEach(x =>
+                        {
+                            var vmo = new HydroGradingVmo()
+                            {
+                                ModelID = _hydroInfo.ID,
+                                Catalog = x.Catalog,
+                                PropName = x.PropName,
+                                SetValue = x.SetValue,
+                                MinValue = x.MinValue,
+                                MaxValue = x.MaxValue,
+                                Color = x.Color,
+                                SortCode = config.Items.IndexOf(x)
+                            };
+                            _allGradingList.Add(vmo);
+                        });
+                    }
+                }
+            }
+            return _allGradingList;
+        }
+
+        //鏄剧ず閰嶇疆棰滆壊鍒嗙骇绐椾綋
+        private async void ShowSetGradingDlg()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var dlg = new SetHydroGradingModelDlg();
-            dlg.SetBindingData(_hydroInfo.ID);
+            var allGradingList = await GetGradingList();
+            var dlg = new SetHydroGradingTreeDlg();
+            dlg.SetBindingData(_hydroInfo, allGradingList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                _allGradingList = list;
+            };
+            dlg.ApplyDataEvent += (catalog, propName) =>
+            {
+                ApplyGrading(catalog, propName);
+            };
             dlg.ShowDialog();
         }
 
-        //搴旂敤棰滆壊鍒嗙骇
-        private async void ApplyGrading()
+        //閰嶇疆棰滆壊鍒嗙骇
+        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
+            ShowSetGradingDlg();
+        }
+
+        #endregion
+
+        #region 搴旂敤鍒嗙骇
+
+        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
+
+        //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private List<HydroGradingApplyViewModel> GetGradingApplyList()
+        {
             if (_allGradingApplyList == null)
             {
                 _allGradingApplyList = new List<HydroGradingApplyViewModel>();
@@ -1339,8 +2056,8 @@
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pump),
-                        PropName = string.Empty
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
+                        PropName = Yw.Hydro.ParterProp.LinkStatus
                     });
                 }
                 if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
@@ -1348,8 +2065,8 @@
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Valve),
-                        PropName = string.Empty
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
+                        PropName = Yw.Hydro.ParterProp.LinkStatus
                     });
                 }
                 if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
@@ -1357,44 +2074,1255 @@
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
                     {
                         Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pipe),
-                        PropName = string.Empty
+                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
+                        PropName = Yw.Hydro.ParterProp.CalcuFlow
                     });
                 }
             }
-            var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(() => _hydroInfo, _allGradingApplyList, GetAllCalcuResultList());
-            dlg.ReloadDataEvent += (obj) =>
+            return _allGradingApplyList;
+        }
+
+        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
+        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList()
+        {
+            if (_hydroInfo == null)
             {
-                _allGradingCodeList = obj?.Select(x => x.Code).Distinct().ToList();
-                var objGroupList = obj?.GroupBy(x => x.Color).ToList();
-                objGroupList.ForEach(async x =>
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у垪琛�
+            var allGradingList = await GetGradingList();
+            if (allGradingList == null || allGradingList.Count < 1)
+            {
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у簲鐢ㄥ垪琛�
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return default;
+            }
+
+            //鎵�鏈夎绠楃粨鏋滃垪琛�
+            var allCalcuResultList = GetCalcuResultList();
+
+            //鎵�鏈夊簲鐢ㄧ粨鏋滃垪琛�
+            var allGradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+            allGradingApplyList.ForEach(x =>
+            {
+                var allCatalogGradingList = allGradingList.Where(t => t.Catalog == x.Code).ToList();
+                if (allCatalogGradingList != null || allCatalogGradingList.Count > 0)
                 {
-                    await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
-                });
-            };
-            if (dlg.ShowDialog() != DialogResult.OK)
+                    switch (x.Code)
+                    {
+                        case Yw.Hydro.ParterCatalog.Pump:
+                            {
+                                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
+                                {
+                                    foreach (var pump in _hydroInfo.Pumps)
+                                    {
+                                        switch (x.PropName)
+                                        {
+                                            case Yw.Hydro.ParterProp.LinkStatus:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var grading = gradingList.Meet(pump.LinkStatus);
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            allGradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuFlow:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuFlow.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pump.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuVelocity:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pump.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pump.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            default: break;
+                                        }
+                                    }
+                                }
+                            }
+                            break;
+                        case Yw.Hydro.ParterCatalog.Valve:
+                            {
+                                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
+                                {
+                                    foreach (var valve in _hydroInfo.Valves)
+                                    {
+                                        switch (x.PropName)
+                                        {
+                                            case Yw.Hydro.ParterProp.LinkStatus:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var grading = gradingList.Meet(valve.LinkStatus);
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            allGradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuFlow:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuFlow.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = valve.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuVelocity:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = valve.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = valve.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            default: break;
+                                        }
+                                    }
+                                }
+                            }
+                            break;
+                        case Yw.Hydro.ParterCatalog.Pipe:
+                            {
+                                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                                {
+                                    foreach (var pipe in _hydroInfo.Pipes)
+                                    {
+                                        switch (x.PropName)
+                                        {
+                                            case Yw.Hydro.ParterProp.CalcuFlow:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuFlow.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pipe.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuVelocity:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pipe.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                                {
+                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                                    if (gradingList != null && gradingList.Count > 0)
+                                                    {
+                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                        {
+                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                            {
+                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                                if (grading != null)
+                                                                {
+                                                                    var result = new HydroGradingApplyResultViewModel()
+                                                                    {
+                                                                        Code = pipe.Code,
+                                                                        Color = grading.Color
+                                                                    };
+                                                                    allGradingApplyResultList.Add(result);
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                break;
+                                            default: break;
+                                        }
+                                    }
+                                }
+                            }
+                            break;
+                        default: break;
+                    }
+                }
+            });
+
+            return allGradingApplyResultList;
+        }
+
+        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
+        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList(string catalog, string propName)
+        {
+            if (_hydroInfo == null)
             {
-                await _bimfaceCtrl?.RestoreComponentsColor(_allGradingCodeList);
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у垪琛�
+            var allGradingList = await GetGradingList();
+            if (allGradingList == null || allGradingList.Count < 1)
+            {
+                return default;
+            }
+            var currentGradingList = allGradingList.Where(x => x.Catalog == catalog).ToList();
+            if (currentGradingList.Count < 1)
+            {
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у簲鐢ㄥ垪琛�
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return default;
+            }
+
+            //褰撳墠鍒嗙骇搴旂敤
+            var gradingApply = allGradingApplyList.Find(x => x.Code == catalog);
+            if (gradingApply == null)
+            {
+                return default;
+            }
+            gradingApply.PropName = propName;
+
+            //鎵�鏈夎绠楃粨鏋�
+            var allCalcuResultList = GetCalcuResultList();
+
+            //搴旂敤缁撴灉鍒楄〃
+            var gradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+
+            switch (catalog)
+            {
+                case Yw.Hydro.ParterCatalog.Pump:
+                    {
+                        if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
+                        {
+                            foreach (var pump in _hydroInfo.Pumps)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.LinkStatus:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var grading = gradingList.Meet(pump.LinkStatus);
+                                                if (grading != null)
+                                                {
+                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    {
+                                                        Code = pump.Code,
+                                                        Color = grading.Color
+                                                    };
+                                                    gradingApplyResultList.Add(result);
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Valve:
+                    {
+                        if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
+                        {
+                            foreach (var valve in _hydroInfo.Valves)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.LinkStatus:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var grading = gradingList.Meet(valve.LinkStatus);
+                                                if (grading != null)
+                                                {
+                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    {
+                                                        Code = valve.Code,
+                                                        Color = grading.Color
+                                                    };
+                                                    gradingApplyResultList.Add(result);
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Pipe:
+                    {
+                        if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                        {
+                            foreach (var pipe in _hydroInfo.Pipes)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                default: break;
+            }
+
+            return gradingApplyResultList;
+        }
+
+        //棰滆壊鍒嗙骇鏄惁搴旂敤浜�
+        private bool _isGradingApply = false;
+        //棰滆壊鍒嗙骇搴旂敤缂栫爜鍒楄〃
+        private List<string> _allGradingApplyCodeList = null;
+
+        //搴旂敤棰滆壊鍒嗙骇
+        private async void ApplyGrading()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _isGradingApply = true;
+            var allGradingApplyResultList = await GetGradingApplyResultList();
+            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
+            {
+                CancelApplyGrading();
+                return;
+            }
+            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
+            objGroupList.ForEach(async x =>
+            {
+                await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
+            });
+            _allGradingApplyCodeList = allGradingApplyResultList.Select(x => x.Code).Distinct().ToList();
+        }
+
+        //搴旂敤棰滆壊鍒嗙骇
+        private async void ApplyGrading(string catalog, string propName)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _isGradingApply = true;
+            var allGradingApplyResultList = await GetGradingApplyResultList(catalog, propName);
+            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
+            {
+                return;
+            }
+            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
+            objGroupList.ForEach(async x =>
+            {
+                await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
+            });
+            var codeList = allGradingApplyResultList.Select(x => x.Code);
+            if (_allGradingApplyCodeList == null)
+            {
+                _allGradingApplyCodeList = new List<string>();
+            }
+            _allGradingApplyCodeList.AddRange(codeList);
+            _allGradingApplyCodeList = _allGradingApplyCodeList.Distinct().ToList();
+        }
+
+        //鑷姩搴旂敤棰滆壊鍒嗙骇
+        private void AutoApplyGrading()
+        {
+            if (!_isGradingApply)
+            {
+                return;
+            }
+            ApplyGrading();
+        }
+
+        //鍙栨秷搴旂敤棰滆壊鍒嗙骇
+        private async void CancelApplyGrading()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _isGradingApply = false;
+            if (_allGradingApplyCodeList != null && _allGradingApplyCodeList.Count > 0)
+            {
+                await _bimfaceCtrl?.RestoreComponentsColor(_allGradingApplyCodeList);
             }
         }
 
-        //璁剧疆
-        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏄剧ず搴旂敤棰滆壊鍒嗙骇绐椾綋
+        private void ShowApplyGradingDlg()
         {
-            SetGrading();
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return;
+            }
+            var dlg = new ApplyHydroGradingDlg();
+            dlg.SetBindingData(allGradingApplyList);
+            dlg.ReloadDataEvent += (obj) =>
+            {
+                _allGradingApplyList = obj;
+                ApplyGrading();
+            };
+            dlg.ShowDialog();
         }
 
-        //搴旂敤
+        //搴旂敤棰滆壊鍒嗙骇
         private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ApplyGrading();
+            ShowApplyGradingDlg();
+        }
+
+        //鍙栨秷搴旂敤鍒嗙骇
+        private void batBtnCancelGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            CancelApplyGrading();
         }
 
         #endregion
 
+        #endregion
+
+        #region 浜哄伐鍒锋柊
+
+        //鍒锋柊
+        private async void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
+            {
+                if (_project == null)
+                {
+                    return;
+                }
+                if (_projectSite == null)
+                {
+                    return;
+                }
+                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
+                sw.Stop();
+                TimeSpan ts2 = sw.Elapsed;
+                Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
+                _selectedVisual = null;
+                await _bimfaceCtrl?.ZoomAndSelectComponents(null);
+                ShowSelectedProperty();
+                TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+            }
+        }
+
+        #endregion
+
+        #region 姘存祦鍔ㄧ敾
+
+        //鎵�鏈夋祦鍚戝垪琛�
+        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> _allFlowEffectList = null;
+
+        //鑾峰彇娴佸悜鍒楄〃
+        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> GetFlowEffectList()
+        {
+            if (_allFlowEffectList == null)
+            {
+                if (_hydroInfo == null)
+                {
+                    return default;
+                }
+                _allFlowEffectList = new List<LogicFlowEffect>();
+                var allCalcuResultList = GetCalcuResultList();
+                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                {
+                    foreach (var parter in _hydroInfo.Pipes)
+                    {
+                        var flowEffect = new LogicFlowEffect();
+                        _allFlowEffectList.Add(flowEffect);
+                        flowEffect.Id = parter.Code;
+                        flowEffect.Rotation = 90;
+                        flowEffect.SpeedX = 0.1;
+                        if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
+                        {
+                            flowEffect.SpeedX = 0;
+                        }
+                        else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
+                        {
+                            flowEffect.SpeedX = 0.1;
+                        }
+                        else
+                        {
+                            flowEffect.SpeedX = -0.1;
+                        }
+
+                        if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
+                        {
+                            flowEffect.SpeedY = 0;
+                        }
+                        else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
+                        {
+                            flowEffect.SpeedY = 0.1;
+                        }
+                        else
+                        {
+                            flowEffect.SpeedY = -0.1;
+                        }
+
+                        var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
+                        if (calcuResult != null)
+                        {
+                            if (calcuResult.CalcuVelocity < 0)
+                            {
+                                flowEffect.SpeedX = -flowEffect.SpeedX;
+                            }
+                        }
+                    }
+                }
+            }
+            return _allFlowEffectList;
+        }
+
+        /// <summary>
+        /// 鍔犺浇姘存祦鍔ㄧ敾
+        /// </summary>
+        private async void LoadFlowEffect()
+        {
+            if (_allFlowEffectList != null)
+            {
+                return;
+            }
+            var allFlowEffectList = GetFlowEffectList();
+            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
+        }
+
+        //鍗歌浇娴佸悜
+        private async void UnloadFlowEffect()
+        {
+            if (_allFlowEffectList == null)
+            {
+                return;
+            }
+            _allFlowEffectList = null;
+            await _bimfaceCtrl?.UnloadFlowEffect();
+        }
+
+        //鏇存柊姘存祦鍔ㄧ敾
+        private async void UpdateFlowEffect(Yw.Model.HydroParterInfo parter)
+        {
+            if (_allFlowEffectList == null)
+            {
+                return;
+            }
+            var visual = parter as Yw.Model.HydroVisualInfo;
+            if (visual == null)
+            {
+                return;
+            }
+            var flowEffect = _allFlowEffectList.Find(x => x.Id == parter.Code);
+            if (flowEffect == null)
+            {
+                return;
+            }
+            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedX = 0;
+            }
+            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedX = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedX = -0.1;
+            }
+
+            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedY = 0;
+            }
+            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedY = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedY = -0.1;
+            }
+
+            var allCalcuResultList = GetCalcuResultList();
+            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
+            if (calcuResult != null)
+            {
+                if (calcuResult.CalcuVelocity < 0)
+                {
+                    flowEffect.SpeedX = -flowEffect.SpeedX;
+                }
+            }
+            await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
+        }
+
+        //鍔犺浇娴佸悜
+        private void barBtnLoadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            LoadFlowEffect();
+        }
+
+        //鍗歌浇娴佸悜
+        private void barBtnUnloadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            UnloadFlowEffect();
+        }
+
+        #endregion
+
+        #region 鍙瑙嗗浘
+
+        //鎵�鏈夊彲瑙佽鍥惧垪琛�
+        private List<HydroVisualViewModel> _allVisualViewModelList = null;
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allVisualViewModelList == null)
+            {
+                _allVisualViewModelList = new List<HydroVisualViewModel>();
+                var allVisualList = _hydroInfo.GetAllVisuals();
+                if (allVisualList != null && allVisualList.Count > 0)
+                {
+                    var allCalcuResultList = GetCalcuResultList();
+                    allVisualList.ForEach(x =>
+                    {
+                        var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(x, _hydroInfo);
+                        var calcuResult = allCalcuResultList?.Find(x => x.Code == x.Code);
+                        if (calcuResult != null)
+                        {
+                            vm.UpdateCalcuProperty(calcuResult);
+                        }
+                        _allVisualViewModelList.Add(vm);
+                    });
+                }
+            }
+            return _allVisualViewModelList;
+        }
+
+        //鏇存柊鍙瑙嗗浘璁$畻灞炴��
+        private void UpdateVisualViewModelCalcuProperty()
+        {
+            var allVisualViewModelList = GetVisualViewModelList();
+            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
+            {
+                var allCalcuResultList = GetCalcuResultList();
+                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
+                {
+                    allVisualViewModelList.ForEach(x =>
+                    {
+                        var calcuResult = allCalcuResultList.Find(t => t.Code == x.Code);
+                        if (calcuResult != null)
+                        {
+                            x.UpdateCalcuProperty(calcuResult);
+                        }
+                    });
+                }
+            }
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
+        {
+            if (visual == null)
+            {
+                return default;
+            }
+            var allVisualViewModelList = GetVisualViewModelList();
+            return allVisualViewModelList?.Find(x => x.Code == visual.Code);
+        }
+
+        #endregion
+
+        #region 閫夋嫨鏋勪欢
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _selectedVisual = null;
 
 
+        #endregion
+
+        #region 鏋勪欢鏄庣粏
+
+        //鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+
+        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+        {
+            if (_visualListCtrl == null)
+            {
+                _visualListCtrl = new HydroVisualListCtrl();
+                _visualListCtrl.Dock = DockStyle.Fill;
+                _visualListCtrl.HydroClickInfoEvent += async (visual) =>
+                {
+                    ShowSelectedProperty(visual);
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
+                };
+                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+                {
+                    UpdateSelectedProperty();
+                    AutoApplyGrading();
+                };
+            }
+            return _visualListCtrl;
+        }
+
+        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
+        private bool IsVisualListCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
+        private void ShowVisualListCtrl()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (IsVisualListCtrlVisible)
+            {
+                return;
+            }
+
+            var visualListCtrl = GetVisualListCtrl();
+            var allVisualViewModelList = GetVisualViewModelList();
+            visualListCtrl.SetBindingData(allVisualViewModelList);
+            var allCalcuResultList = GetCalcuResultList();
+            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
+            {
+                visualListCtrl.SetNormalView();
+            }
+            else
+            {
+                visualListCtrl.SetCalcuView();
+            }
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(visualListCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+            this.docPnlBottom.Height = 350;
+        }
+
+        //鏇存柊鏋勪欢鏄庣粏鎺т欢
+        private void UpdateVisualListCtrl()
+        {
+            if (!IsVisualListCtrlVisible)
+            {
+                return;
+            }
+            _visualListCtrl?.UpdateBindingData();
+        }
+
+        //鏋勪欢鏄庣粏
+        private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowVisualListCtrl();
+        }
+
+        #endregion
+
+        #region 姘村姏鏍¢獙
+
+        //鏍¢獙鎺т欢
+        private XhsProjectSimulationHydroCheckResultCtrl _checkCtrl = null;
+
+        //鑾峰彇鏍¢獙鎺т欢
+        private XhsProjectSimulationHydroCheckResultCtrl GetCheckCtrl()
+        {
+            if (_checkCtrl == null)
+            {
+                _checkCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
+                _checkCtrl.Dock = DockStyle.Fill;
+                _checkCtrl.HydroClickEvent += async (code) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var elementIds = new List<string>();
+                    if (string.IsNullOrEmpty(code))
+                    {
+                        _selectedVisual = null;
+                    }
+                    else
+                    {
+                        var allParterList = _hydroInfo.GetAllVisuals();
+                        _selectedVisual = allParterList?.Find(x => x.Code == code);
+                        if (_selectedVisual != null)
+                        {
+                            elementIds.Add(_selectedVisual.Code);
+                        }
+                    }
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
+                    ShowSelectedProperty();
+                };
+            }
+            return _checkCtrl;
+        }
+
+        //鏄剧ず妫�鏌ユ帶浠�
+        private void ShowCheckCtrl()
+        {
+            if (_checkResult == null)
+            {
+                return;
+            }
+            var checkCtrl = GetCheckCtrl();
+            checkCtrl.SetBindingData(_checkResult);
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(checkCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
+            this.docPnlBottom.Height = 350;
+
+        }
+
+        //姘村姏妫�鏌�
+        private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _checkResult = _hydroInfo.Check();
+            ShowCheckCtrl();
+        }
+
+        #endregion
 
 
     }

--
Gitblit v1.9.3