From 4fa5e391fcb989f4687ba3398f84a5ab066d7285 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 20 十一月 2024 15:49: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 | 3528 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 1,640 insertions(+), 1,888 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 0a32a23..f1d7d30 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,12 +1,22 @@
 锘縢lobal using Yw.EPAnet;
+using DevExpress.CodeParser;
+using DevExpress.Diagram.Core.Native;
 using DevExpress.Mvvm.Native;
+using DevExpress.Office.Utils;
+using DevExpress.PivotGrid.QueryMode.TuplesTree;
+using DevExpress.Utils.Extensions;
 using DevExpress.Xpo.Helpers;
+using DevExpress.XtraBars.Ribbon;
 using DevExpress.XtraRichEdit.Layout;
 using DevExpress.XtraSpreadsheet.Commands;
 using HStation.WinFrmUI.PhartRelation;
+using NetTaste;
+using NPOI.SS.Formula.Functions;
 using System.Diagnostics;
 using System.Windows.Media;
 using System.Windows.Media.Media3D;
+using Yw.Hydro;
+using Yw.Model;
 using Yw.Pump;
 using Yw.Vmo;
 using Yw.WinFrmUI.Bimface;
@@ -29,9 +39,6 @@
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
 
-
-        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;//妫�鏌ョ粨鏋�
-        private Yw.EPAnet.CalcuResult _calcuResult = null;//璁$畻缁撴灉
 
 
         /// <summary>
@@ -77,11 +84,15 @@
             ShowBimfaceCtrl();
             ShowQ3dCtrl();
             ShowPropertyCtrl();
+        }
 
+        private void InitialUI()
+        {
+            InitialCurrentWorking();
         }
 
 
-        #region Bimface
+        #region BIM鎺т欢
 
         //bimface鎺т欢
         private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
@@ -93,14 +104,14 @@
             {
                 _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                await _bimfaceCtrl.InitialData(_project, _projectSite);
                 _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    ApplyGrading();
+                    InitialUI();
                 };
                 _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
@@ -108,7 +119,7 @@
                     {
                         return;
                     }
-                    _selectedVisual = obj;
+                    //_selectedVisual = obj;
                     ShowSelectedProperty();
                 };
             }
@@ -130,7 +141,7 @@
 
         #endregion
 
-        #region Q3d
+        #region Q3d鎺т欢
 
         //Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
@@ -167,6 +178,314 @@
 
         #endregion
 
+        #region 鍙鍒楄〃
+
+        //鎵�鏈夊彲瑙嗗瓧鍏�
+        private Dictionary<string, HydroVisualInfo> _allVisualDict = null;
+
+        //鑾峰彇鍙瀛楀吀
+        private Dictionary<string, HydroVisualInfo> GetVisualDict()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allVisualDict == null)
+            {
+                _allVisualDict = new Dictionary<string, HydroVisualInfo>();
+                var allVisualList = _hydroInfo.GetAllVisuals();
+                allVisualList?.ForEach(x => _allVisualDict.Add(x.Code, x));
+            }
+            return _allVisualDict;
+        }
+
+        //鑾峰彇鍙鍒楄〃
+        private List<HydroVisualInfo> GetVisualList()
+        {
+            var allVisualDict = GetVisualDict();
+            return allVisualDict?.Values.ToList();
+        }
+
+        //鑾峰彇鑺傜偣鍒楄〃
+        private List<HydroNodeInfo> GetNodeList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            return _hydroInfo.GetAllNodes();
+        }
+
+        //鑾峰彇绠℃鍒楄〃
+        private List<HydroLinkInfo> GetLinkList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            return _hydroInfo.GetAllLinks();
+        }
+
+        //鑾峰彇鍙鏋勪欢
+        private HydroVisualInfo GetVisual(string code)
+        {
+            var allVisualDict = GetVisualDict();
+            if (allVisualDict == null)
+            {
+                return default;
+            }
+            if (allVisualDict.ContainsKey(code))
+            {
+                return allVisualDict[code];
+            }
+            return default;
+        }
+
+        #endregion
+
+        #region 璁$畻缁撴灉
+
+        //璁$畻缁撴灉
+        private HydroCalcuResult _calcuResult = null;
+
+        //鑾峰彇璁$畻缁撴灉
+        private HydroCalcuResult GetCalcuResult(string calcuMode, bool needCalcuAgain = false)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (needCalcuAgain)
+            {
+                _calcuResult = _hydroInfo.Calcu(calcuMode);
+            }
+            if (_calcuResult == null)
+            {
+                _calcuResult = _hydroInfo.Calcu(calcuMode);
+            }
+            return _calcuResult;
+        }
+
+        //鑾峰彇鍙缁勪欢璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuVisualResult> GetCalcuVisualResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.GetVisualList();
+        }
+
+        //鑾峰彇鑺傜偣璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuNodeResult> GetCalcuNodeResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.NodeList;
+        }
+
+        //鑾峰彇绠℃璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuLinkResult> GetCalcuLinkResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.LinkList;
+        }
+
+        //鎵�鏈夊彲瑙佽绠楀瓧鍏�
+        private Dictionary<string, HydroCalcuVisualResult> _allCalcuVisualDict = null;
+
+        //鑾峰彇鍙璁$畻瀛楀吀
+        private Dictionary<string, HydroCalcuVisualResult> GetCalcuVisualDict(string calcuMode, bool needCalcuAgain = false)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            var allCalcuVisualResultList = GetCalcuVisualResultList(calcuMode, needCalcuAgain);
+            if (needCalcuAgain)
+            {
+                _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
+                allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
+            }
+            if (_allCalcuVisualDict == null)
+            {
+                _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
+                allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
+            }
+            return _allCalcuVisualDict;
+        }
+
+        //鑾峰彇鍙璁$畻缁撴灉
+        private HydroCalcuVisualResult GetCalcuVisualResult(string code, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
+        {
+            var allCalcuVisualDict = GetCalcuVisualDict(calcuMode, needCalcuAgain);
+            if (allCalcuVisualDict == null || allCalcuVisualDict.Count < 1)
+            {
+                return default;
+            }
+            if (allCalcuVisualDict.ContainsKey(code))
+            {
+                return allCalcuVisualDict[code];
+            }
+            return default;
+        }
+
+        //鑾峰彇鍙璁$畻缁撴灉
+        private HydroCalcuVisualResult GetCalcuVisualResult(Yw.Model.HydroVisualInfo visual, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
+        {
+            return GetCalcuVisualResult(visual?.Code, calcuMode, needCalcuAgain);
+        }
+
+        #endregion
+
+        #region 瑙嗗浘鍒楄〃
+
+        //鎵�鏈夊彲瑙佽鍥惧瓧鍏�
+        private Dictionary<string, HydroVisualViewModel> _allVisualViewModelDict = null;
+
+        //鑾峰彇鍙瑙嗗浘瀛楀吀
+        private Dictionary<string, HydroVisualViewModel> GetVisualViewModelDict()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allVisualViewModelDict == null)
+            {
+                _allVisualViewModelDict = new Dictionary<string, HydroVisualViewModel>();
+                var allVisualDict = GetVisualDict();
+                if (allVisualDict != null && allVisualDict.Count > 0)
+                {
+                    foreach (var visualKeyValue in allVisualDict)
+                    {
+                        var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(visualKeyValue.Value, _hydroInfo);
+                        var calcuVisualResult = GetCalcuVisualResult(visualKeyValue.Key);
+                        if (calcuVisualResult != null)
+                        {
+                            vm.UpdateCalcuProperty(calcuVisualResult);
+                        }
+                        _allVisualViewModelDict.Add(visualKeyValue.Key, vm);
+                    }
+                }
+            }
+            return _allVisualViewModelDict;
+        }
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            return allVisualViewModelDict?.Values.ToList();
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty()
+        {
+            var allVisualViewModelList = GetVisualViewModelList();
+            allVisualViewModelList?.ForEach(x => x.UpdateProperty());
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(string code)
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
+            {
+                if (allVisualViewModelDict.ContainsKey(code))
+                {
+                    allVisualViewModelDict[code].UpdateProperty();
+                }
+            }
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(List<string> codes)
+        {
+            codes?.ForEach(x => UpdateVisualViewModelProperty(x));
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(List<HydroVisualInfo> visualList)
+        {
+            visualList?.ForEach(x => UpdateVisualViewModelProperty(x.Code));
+        }
+
+        //鏇存柊鍙瑙嗗浘璁$畻灞炴��
+        private void UpdateVisualViewModelCalcuProperty()
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
+            {
+                foreach (var visualViewModelKeyValue in allVisualViewModelDict)
+                {
+                    var calcuVisualResult = GetCalcuVisualResult(visualViewModelKeyValue.Key);
+                    if (calcuVisualResult != null)
+                    {
+                        visualViewModelKeyValue.Value.UpdateCalcuProperty(calcuVisualResult);
+                    }
+                }
+            }
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(string code)
+        {
+            if (string.IsNullOrEmpty(code))
+            {
+                return default;
+            }
+            var allVisualViewModelList = GetVisualViewModelList();
+            return allVisualViewModelList?.Find(x => x.Code == code);
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
+        {
+            return GetVisualViewModel(visual?.Code);
+        }
+
+        #endregion
+
+        #region 閫夋嫨鏋勪欢
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _selectedVisual = null;
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo SelectedVisual
+        {
+            get { return _selectedVisual; }
+            set
+            {
+
+                _selectedVisual = value;
+                this.barBtnSetMonitor.Enabled = _selectedVisual != null;
+            }
+        }
+
+
+        #endregion
+
         #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
@@ -179,40 +498,42 @@
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
-                _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
-                { //寮鸿皟杩炴帴缁勪欢
-                    if (string.IsNullOrEmpty(code))
+                _propertyCtrl.HydroViewEvent += (visual) =>
+                {
+                    if (visual == null)
                     {
                         return;
                     }
-                    if (string.IsNullOrEmpty(linkCode))
-                    {
-                        return;
-                    }
+                    _bimfaceCtrl?.ZoomToComponent(visual.Code);
+                };
+                _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
+                { //寮鸿皟杩炴帴鑺傜偣
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var allVisualList = _hydroInfo.GetAllVisuals();
-                    if (allVisualList == null || allVisualList.Count < 1)
+                    if (link == null)
                     {
                         return;
                     }
-                    var linkParter = allVisualList.Find(x => x.Code == linkCode);
-                    if (linkParter == null)
+                    if (string.IsNullOrEmpty(linkNodeCode))
+                    {
+                        return;
+                    }
+                    var linkNode = GetVisual(linkNodeCode);
+                    if (linkNode == null)
                     {
                         return;
                     }
                     var blinkCodes = new List<string>();
-                    if (linkParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
+                    if (linkNode.GetType() == typeof(HydroJunctionInfo))
                     {
-                        var allLinkList = _hydroInfo.GetAllLinks();
+                        var allLinkList = GetLinkList();
                         if (allLinkList == null || allLinkList.Count < 1)
                         {
                             return;
                         }
-                        var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code || x.EndCode == linkParter.Code) && x.Code != code).ToList();
+                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
                         if (linkList == null || linkList.Count < 1)
                         {
                             return;
@@ -221,47 +542,39 @@
                     }
                     else
                     {
-                        blinkCodes.Add(linkCode);
+                        blinkCodes.Add(linkNodeCode);
                     }
 
+                    await _bimfaceCtrl?.ClearBlinkComponents();
                     await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
-
-                _propertyCtrl.ViewParterEvent += (parter) =>
+                _propertyCtrl.PropertyValueChangedEvent += (visual) =>
                 {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    _bimfaceCtrl?.ZoomToComponent(parter.Code);
-                };
-                _propertyCtrl.PropertyValueChangedEvent += (parter) =>
-                {
-                    if (parter == null)
+                    if (visual == null)
                     {
                         return;
                     }
                     UpdateVisualListCtrl();
-                    AutoApplyGrading();
+                    //ApplyGradingResultList(visual);
                 };
-                _propertyCtrl.MarkPropertyValueChangedEvent += (parter) =>
+                _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
                 {
                     //鏍囨敞灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+                    //UpdateMark(visual);
                 };
                 _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
                 {
                     //鍒嗙骇灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
                 };
-                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (parter) =>
+                _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
                 {
                     //娴佸悜灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    UpdateFlowEffect(parter);
-                    //await _bimfaceCtrl?.UnloadFlowEffectById(parter.Code);
+                    //UpdateFlowEffect(visual);
                 };
 
             }
@@ -339,9 +652,22 @@
             _propertyCtrl?.UpdateRows();
         }
 
+        //璁剧疆灞炴�ф帶浠�
+        private void SetPropertyCtrl(Yw.Model.HydroVisualInfo visual)
+        {
+            if (visual == null)
+            {
+
+            }
+        }
+
+        //鏇存柊灞炴�ф帶浠�
+        private void UpdatePropertyCtrl()
+        {
+            _propertyCtrl?.UpdateRows();
+        }
+
         #endregion
-
-
 
         #region 鑷姩鍖归厤
 
@@ -392,7 +718,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
+            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false));
             matchingListCtrl.SetBindingData(input);
             this.controlContainerBottom.Controls.Add(matchingListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -402,7 +728,7 @@
 
         #endregion
 
-        #region 鏈尮閰嶅垪琛�
+        #region 鏈尮鍒楄〃
 
         //鑾峰彇鏈尮閰嶅垪琛ㄦ帶浠�
         private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
@@ -494,8 +820,6 @@
 
         #endregion
 
-
-
         #region 淇濆瓨淇℃伅
 
         //淇濆瓨
@@ -526,30 +850,6 @@
         }
 
         #endregion
-
-
-
-        #region INP瀵煎嚭
-
-        //瀵煎嚭姘村姏INP鏂囦欢
-        private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var fileName = Yw.WinFrmUI.FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-            var result = netWork.ToInpString();
-            File.WriteAllText(fileName, result);
-            TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
-        }
-
-        #endregion INP瀵煎嚭
 
         #region 鎵归噺閰嶇疆
 
@@ -948,389 +1248,6 @@
 
         #endregion
 
-        #region 骞惰仈鍒嗘瀽
-
-        //骞惰仈鍒嗘瀽
-        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
-            {
-                return;
-            }
-            var allCalcuResultList = GetCalcuResultList();
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in _hydroInfo.Pumps)
-            {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
-                {
-                    var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    if (calcuResult != null)
-                    {
-                        if (calcuResult.CalcuFlow.HasValue)
-                        {
-                            vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
-                        }
-
-                        var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                        var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                        if (calcuResultStart != null && calcuResultEnd != null)
-                        {
-                            if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
-                            {
-                                vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            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();
-        }
-
-        #endregion
-
-        #region 姘村姏璁$畻
-
-
-        #region 鍓嶆彁鏉′欢
-
-
-        //鏄剧ず宸ュ喌璁$畻绐椾綋
-        private void ShowWorkingCalcuDlg()
-        {
-            var dlg = new SetHydroWorkingInfoDlg();
-            dlg.HydroViewEvent += async (parter) =>
-            {
-                _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;
-                }
-
-                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
-
-
-                await Task.Delay(5000);
-
-                var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-                _calcuResult = netWork.Calcu();
-
-                WaitFormHelper.HideWaitForm();
-                if (_calcuResult.Succeed)
-                {
-                    GetCalcuResultList(false);
-                    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;
-
-        //鑾峰彇璁$畻缁撴灉
-        //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
-        private List<HydroCalcuResult> GetCalcuResultList(bool isCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_calcuResult == null)
-            {
-                return default;
-            }
-            if (!_calcuResult.Succeed)
-            {
-                return default;
-            }
-            if (isCache)
-            {
-                return _allCalcuResultList;
-            }
-
-            _allCalcuResultList = new List<HydroCalcuResult>();
-
-            //鑺傜偣
-            var allNodeList = _hydroInfo.GetAllNodes();
-            if (allNodeList != null && allNodeList.Count > 0)
-            {
-                foreach (var node in allNodeList)
-                {
-                    var calcuNode = _calcuResult.NodeList?.Find(x => x.Id == node.Code);
-                    if (calcuNode != null)
-                    {
-                        var calcuResult = new HydroCalcuNodeResult()
-                        {
-                            Code = node.Code,
-                            CalcuPress = calcuNode.Press,
-                            CalcuHead = calcuNode.Head,
-                            CalcuDemand = calcuNode.Demand
-                        };
-                        _allCalcuResultList.Add(calcuResult);
-                    }
-                }
-            }
-
-            //绠℃
-            var allLinkList = _hydroInfo.GetAllLinks();
-            if (allLinkList != null && allLinkList.Count > 0)
-            {
-                foreach (var link in allLinkList)
-                {
-                    var calcuLink = _calcuResult.LinkList?.Find(x => x.Id == link.Code);
-                    if (calcuLink != null)
-                    {
-                        var calcuResult = new HydroCalcuLinkResult()
-                        {
-                            Code = link.Code,
-                            CalcuFlow = calcuLink.Flow,
-                            CalcuVelocity = calcuLink.Velocity,
-                            CalcuHeadLoss = calcuLink.Headloss
-                        };
-                        _allCalcuResultList.Add(calcuResult);
-                    }
-                }
-            }
-
-            //娴侀噺璁�
-            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)
-        {
-            //ShowCalcuPrefixDlg();
-            ShowWorkingCalcuDlg();
-        }
-
-        #endregion
-
         #region 鏋勪欢鏌ヨ
 
         //鏌ヨ缁勪欢
@@ -1434,505 +1351,106 @@
 
         #region 妯″瀷鏍囨敞
 
+        #region 鏍囨敞璁剧疆
+
         //鎵�鏈夋爣娉ㄨ缃垪琛�
         private List<HydroMarkSetViewModel> _allMarkSetList = null;
 
         //鑾峰彇鏍囨敞璁剧疆鍒楄〃
         private List<HydroMarkSetViewModel> GetMarkSetList()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_allMarkSetList == null)
             {
-                _allMarkSetList = new List<HydroMarkSetViewModel>();
-                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = 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)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = 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)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = 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)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = 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)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
+                _allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
             }
             return _allMarkSetList;
         }
+
+        #endregion
+
+        #region 鏍囨敞缁撴灉
 
         //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
         private List<HydroMarkResultViewModel> _allMarkResultList = null;
 
         //鑾峰彇鏍囨敞缁撴灉鍒楄〃
-        private List<HydroMarkResultViewModel> GetMarkResultList()
+        //UseCache 鏄惁浣跨敤缂撳瓨
+        private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
         {
             if (_hydroInfo == null)
             {
                 return default;
             }
-            _allMarkResultList = new List<HydroMarkResultViewModel>();
-            var allMarkSetList = GetMarkSetList();
-            foreach (var markSet in allMarkSetList)
+            if (!useCache)
             {
-                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;
-                }
+                var allSetList = GetMarkSetList();
+                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
+            }
+            if (_allMarkResultList == null)
+            {
+                var allSetList = GetMarkSetList();
+                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
             }
             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("鏍囨敞淇℃伅宸茶缃�");
-        }
+        #endregion
 
-        //娓呴櫎鏍囨敞缁撴灉鍒楄〃
-        private async Task ClearMarkResultList()
+        #region 鏍囨敞鏄剧ず
+
+        //鏍囨敞鏄惁鏄剧ず
+        private bool _isMarkVisible = false;
+
+        //鏇存柊鏍囨敞
+        private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
         {
-            if (_allMarkResultList == null || _allMarkResultList.Count < 1)
+            var allSetList = GetMarkSetList();
+            var result = HydroMarkHelper.GetResult(visual, allSetList);
+            if (result == null)
             {
-                TipFormHelper.ShowWarn("灏氭湭璁剧疆鏍囨敞淇℃伅");
                 return;
             }
-            _allMarkResultList = null;
-            await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
-            TipFormHelper.ShowSucceed("鏍囨敞淇℃伅宸叉竻闄�");
+            var allResultList = GetMarkResultList(true);
+            allResultList.Remove(x => x.Code == visual.Code);
+            allResultList.Add(result);
+            if (_isMarkVisible)
+            {
+                var leadLabel = new LogicMarkLeadLabel() { Id = result.Code, Text = result.Text, Distance = null };
+                await _bimfaceCtrl?.UpdateLogicMarkLeadLabel(leadLabel);
+            }
+        }
+
+        //鏇存柊鏍囨敞鍒楄〃
+        private void UpdateMarkList(List<Yw.Model.HydroVisualInfo> visuals)
+        {
+            if (visuals == null || visuals.Count < 1)
+            {
+                visuals.ForEach(x => UpdateMark(x));
+            }
+        }
+
+        //搴旂敤鏍囨敞鍒楄〃
+        //UseCache 鏄惁浣跨敤缂撳瓨
+        private async void ApplyMarkList(bool useCache = true)
+        {
+            if (_isMarkVisible)
+            {
+                var allResultList = GetMarkResultList(useCache);
+                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, null)).ToList();
+                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
+            }
+            else
+            {
+                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
+            }
         }
 
         //鏄剧ず鏍囨敞璁剧疆绐椾綋
-        private void ShowMarkSetDlg()
+        private void ShowSetMarkDlg()
         {
             if (_hydroInfo == null)
             {
@@ -1941,10 +1459,10 @@
             var allMarkSetList = GetMarkSetList();
             var dlg = new SetHydroMarkDlg();
             dlg.SetBindingData(allMarkSetList);
-            dlg.ReloadDataEvent += async (list) =>
+            dlg.ReloadDataEvent += (list) =>
             {
                 _allMarkSetList = list;
-                await ApplyMarkResultList();
+                ApplyMarkList(false);
             };
             dlg.ShowDialog();
         }
@@ -1952,14 +1470,17 @@
         //璁剧疆鏍囨敞
         private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowMarkSetDlg();
+            ShowSetMarkDlg();
         }
 
-        //娓呴櫎鏍囨敞
-        private async void barBtnClearMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏄惁鏄剧ず
+        private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            await ClearMarkResultList();
+            _isMarkVisible = this.barCkMark.Checked;
+            ApplyMarkList(true);
         }
+
+        #endregion
 
         #endregion
 
@@ -1967,10 +1488,10 @@
 
         #region 棰滆壊閰嶇疆
 
-        //鎵�鏈夊垎绾у垪琛�
+        //鎵�鏈夐鑹插垎绾ч厤缃垪琛�
         private List<HydroGradingVmo> _allGradingList = null;
 
-        //鑾峰彇鍒嗙骇鍒楄〃
+        //鑾峰彇棰滆壊鍒嗙骇閰嶇疆鍒楄〃
         private async Task<List<HydroGradingVmo>> GetGradingList()
         {
             if (_hydroInfo == null)
@@ -1979,36 +1500,13 @@
             }
             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);
-                        });
-                    }
-                }
+                _allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
             }
             return _allGradingList;
         }
 
-        //鏄剧ず閰嶇疆棰滆壊鍒嗙骇绐椾綋
-        private async void ShowSetGradingDlg()
+        //鏄剧ず棰滆壊鍒嗙骇绐椾綋
+        private async void ShowGradingDlg()
         {
             if (_hydroInfo == null)
             {
@@ -2020,10 +1518,12 @@
             dlg.ReloadDataEvent += (list) =>
             {
                 _allGradingList = list;
+                ApplyGradingResultList(false);
             };
             dlg.ApplyDataEvent += (catalog, propName) =>
             {
-                ApplyGrading(catalog, propName);
+                UpdateGradingApplyList(catalog, propName);
+                ApplyGradingResultList(false);
             };
             dlg.ShowDialog();
         }
@@ -2031,7 +1531,7 @@
         //閰嶇疆棰滆壊鍒嗙骇
         private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSetGradingDlg();
+            ShowGradingDlg();
         }
 
         #endregion
@@ -2044,818 +1544,35 @@
         //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
         private List<HydroGradingApplyViewModel> GetGradingApplyList()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_allGradingApplyList == null)
             {
-                _allGradingApplyList = new List<HydroGradingApplyViewModel>();
-
-                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
-                        PropName = Yw.Hydro.ParterProp.LinkStatus
-                    });
-                }
-                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
-                        PropName = Yw.Hydro.ParterProp.LinkStatus
-                    });
-                }
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
-                        PropName = Yw.Hydro.ParterProp.CalcuFlow
-                    });
-                }
+                _allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
             }
             return _allGradingApplyList;
         }
 
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList()
+        //鏇存柊棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private void UpdateGradingApplyList(string catalog, string propName)
         {
-            if (_hydroInfo == null)
-            {
-                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;
+                return;
             }
-
-            //鎵�鏈夎绠楃粨鏋滃垪琛�
-            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)
-                {
-                    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)
-            {
-                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)
+            var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
+            if (apply == 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();
+            apply.PropName = propName;
         }
 
-        //搴旂敤棰滆壊鍒嗙骇
-        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 ShowApplyGradingDlg()
+        //鏄剧ず棰滆壊鍒嗙骇搴旂敤绐椾綋
+        private void ShowGradingApplyDlg()
         {
             if (_hydroInfo == null)
             {
@@ -2871,7 +1588,7 @@
             dlg.ReloadDataEvent += (obj) =>
             {
                 _allGradingApplyList = obj;
-                ApplyGrading();
+                ApplyGradingResultList(false);
             };
             dlg.ShowDialog();
         }
@@ -2879,13 +1596,122 @@
         //搴旂敤棰滆壊鍒嗙骇
         private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowApplyGradingDlg();
+            ShowGradingApplyDlg();
         }
 
-        //鍙栨秷搴旂敤鍒嗙骇
-        private void batBtnCancelGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        #endregion
+
+        #region 搴旂敤缁撴灉
+
+        //鎵�鏈夐鑹插垎绾х粨鏋滃垪琛�
+        private List<HydroGradingResultViewModel> _allGradingResultList = null;
+
+        //鑾峰彇棰滆壊鍒嗙骇缁撴灉鍒楄〃
+        //UseCache鏄惁浣跨敤缂撳瓨
+        private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
         {
-            CancelApplyGrading();
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            var allGradingList = await GetGradingList();
+            var allGradingApplyList = GetGradingApplyList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            if (!useCache)
+            {
+                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
+            }
+            if (_allGradingResultList == null)
+            {
+                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
+            }
+            return _allGradingResultList;
+        }
+
+        #endregion
+
+        #region 缁撴灉灞曠ず
+
+        //棰滆壊鍒嗙骇鏄惁鏄剧ず
+        private bool _isGradingVisible = false;
+
+        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
+        //UseCache鏄惁浣跨敤缂撳瓨
+        private async void ApplyGradingResultList(bool useCache = true)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allGradingResultList = await GetGradingResultList(useCache);
+            if (allGradingResultList == null || allGradingResultList.Count < 1)
+            {
+                return;
+            }
+            if (_isGradingVisible)
+            {
+                var groupList = allGradingResultList.GroupBy(x => x.Color).ToList();
+                groupList.ForEach(async x => await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1));
+            }
+            else
+            {
+                var codes = allGradingResultList.Select(x => x.Code).Distinct().ToList();
+                await _bimfaceCtrl?.RestoreComponentsColor(codes);
+            }
+        }
+
+        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
+        private async void ApplyGradingResultList(Yw.Model.HydroVisualInfo visual)
+        {
+            if (visual == null)
+            {
+                return;
+            }
+            var allGradingList = await GetGradingList();
+            var allGradingApplyList = GetGradingApplyList();
+            var allGradingResultList = await GetGradingResultList(true);
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
+            if (oldResult != null)
+            {
+                allGradingResultList.Remove(oldResult);
+            }
+            var newResult = HydroGradingHelper.GetResult(visual, allGradingList, allGradingApplyList, allCalcuResultList);
+            if (newResult != null)
+            {
+                allGradingResultList.Add(newResult);
+            }
+            if (_isGradingVisible)
+            {
+                if (newResult == null)
+                {
+                    if (oldResult != null)
+                    {
+                        await _bimfaceCtrl?.RestoreComponentsColor(oldResult.Code);
+                    }
+                }
+                else
+                {
+                    await _bimfaceCtrl?.OverrideComponentsColor(newResult.Code, newResult.Color, 1);
+                }
+            }
+        }
+
+        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
+        private void ApplyGradingResultList(List<Yw.Model.HydroVisualInfo> visualList)
+        {
+            if (visualList == null || visualList.Count < 1)
+            {
+                return;
+            }
+            visualList.ForEach(x => ApplyGradingResultList(x));
+        }
+
+        //棰滆壊鍒嗙骇灞曠ず
+        private void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _isGradingVisible = this.barCkGrading.Checked;
+            ApplyGradingResultList(true);
         }
 
         #endregion
@@ -2926,20 +1752,23 @@
 
         #region 姘存祦鍔ㄧ敾
 
-        //鎵�鏈夋祦鍚戝垪琛�
-        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> _allFlowEffectList = null;
+        //姘存祦鍔ㄧ敾鏄惁鍙
+        private bool _isFlowEffectVisible = false;
+
+        //鎵�鏈夋按娴佸姩鐢诲垪琛�
+        private List<LogicFlowEffect> _allFlowEffectList = null;
 
         //鑾峰彇娴佸悜鍒楄〃
-        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> GetFlowEffectList()
+        private List<LogicFlowEffect> GetFlowEffectList()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_allFlowEffectList == null)
             {
-                if (_hydroInfo == null)
-                {
-                    return default;
-                }
                 _allFlowEffectList = new List<LogicFlowEffect>();
-                var allCalcuResultList = GetCalcuResultList();
+                var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
                 if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
                 {
                     foreach (var parter in _hydroInfo.Pipes)
@@ -2989,12 +1818,10 @@
             return _allFlowEffectList;
         }
 
-        /// <summary>
-        /// 鍔犺浇姘存祦鍔ㄧ敾
-        /// </summary>
+        //鍔犺浇姘存祦鍔ㄧ敾
         private async void LoadFlowEffect()
         {
-            if (_allFlowEffectList != null)
+            if (_hydroInfo == null)
             {
                 return;
             }
@@ -3002,30 +1829,38 @@
             await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
         }
 
-        //鍗歌浇娴佸悜
+        //鍗歌浇姘存祦鍔ㄧ敾
         private async void UnloadFlowEffect()
         {
-            if (_allFlowEffectList == null)
+            if (_hydroInfo == null)
             {
                 return;
             }
-            _allFlowEffectList = null;
             await _bimfaceCtrl?.UnloadFlowEffect();
         }
 
-        //鏇存柊姘存祦鍔ㄧ敾
-        private async void UpdateFlowEffect(Yw.Model.HydroParterInfo parter)
+        //璁剧疆姘村姏鍔ㄧ敾
+        private void SetFlowEffect()
         {
-            if (_allFlowEffectList == null)
+            if (_isFlowEffectVisible)
+            {
+                LoadFlowEffect();
+            }
+            else
+            {
+                UnloadFlowEffect();
+            }
+        }
+
+        //鏇存柊姘存祦鍔ㄧ敾
+        private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
+        {
+            if (_hydroInfo == null)
             {
                 return;
             }
-            var visual = parter as Yw.Model.HydroVisualInfo;
-            if (visual == null)
-            {
-                return;
-            }
-            var flowEffect = _allFlowEffectList.Find(x => x.Id == parter.Code);
+            var allFlowEffectList = GetFlowEffectList();
+            var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
             if (flowEffect == null)
             {
                 return;
@@ -3056,7 +1891,7 @@
                 flowEffect.SpeedY = -0.1;
             }
 
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
             if (calcuResult != null)
             {
@@ -3065,100 +1900,22 @@
                     flowEffect.SpeedX = -flowEffect.SpeedX;
                 }
             }
-            await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
+            if (_isFlowEffectVisible)
+            {
+                await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
+            }
         }
 
-        //鍔犺浇娴佸悜
-        private void barBtnLoadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //姘存祦鍔ㄧ敾鏄惁鍙
+        private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            LoadFlowEffect();
-        }
-
-        //鍗歌浇娴佸悜
-        private void barBtnUnloadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            UnloadFlowEffect();
+            _isFlowEffectVisible = this.barCkFlowEffect.Checked;
+            SetFlowEffect();
         }
 
         #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 鏋勪欢鏄庣粏
+        #region 鏋勪欢鎺т欢
 
         //鏋勪欢鏄庣粏鎺т欢
         private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
@@ -3177,8 +1934,9 @@
                 };
                 _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
                 {
+                    UpdateMarkList(visualList);
                     UpdateSelectedProperty();
-                    AutoApplyGrading();
+                    ApplyGradingResultList();
                 };
             }
             return _visualListCtrl;
@@ -3218,7 +1976,7 @@
             var visualListCtrl = GetVisualListCtrl();
             var allVisualViewModelList = GetVisualViewModelList();
             visualListCtrl.SetBindingData(allVisualViewModelList);
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             if (allCalcuResultList == null || allCalcuResultList.Count < 1)
             {
                 visualListCtrl.SetNormalView();
@@ -3252,17 +2010,280 @@
 
         #endregion
 
-        #region 姘村姏鏍¢獙
+        #region 鐩戞祴鍒楄〃
 
-        //鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl _checkCtrl = null;
+        //鎵�鏈夌洃娴嬪垪琛�
+        private List<HydroMonitorVmo> _allMonitorList = null;
 
-        //鑾峰彇鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl GetCheckCtrl()
+        //鑾峰彇鐩戞祴鍒楄〃
+        private async Task<List<HydroMonitorVmo>> GetMonitorList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allMonitorList == null)
+            {
+                _allMonitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByModelID(_hydroInfo.ID);
+                if (_allMonitorList == null)
+                {
+                    _allMonitorList = new List<HydroMonitorVmo>();
+                }
+            }
+            return _allMonitorList;
+        }
+
+        //鏇存柊鐩戞祴鍒楄〃
+        private async void UpdateMonitorList(string code)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allMonitorList = await GetMonitorList();
+            allMonitorList.RemoveAll(x => x.Relation == code);
+            var monitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByRelation(_hydroInfo.ID, code);
+            if (monitorList != null && monitorList.Count > 0)
+            {
+                allMonitorList.AddRange(monitorList);
+            }
+            UpdateMonitorValueList(code, monitorList);
+            SetLogicMonitorList();
+        }
+
+        //璁剧疆閫夋嫨鏋勪欢鐩戞祴鐐瑰垪琛�
+        private async void SetSelectVisualMonitorList()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (_selectedVisual == null)
+            {
+                return;
+            }
+            var allMonitorList = await GetMonitorList();
+            var dlg = new SetHydroVisualMonitorDlg();
+            dlg.SetBindingData(_hydroInfo, _selectedVisual, allMonitorList);
+            dlg.ReloadDataEvent += async (hydroInfo, visual, list) =>
+            {
+                if (hydroInfo == null)
+                {
+                    return;
+                }
+                if (visual == null)
+                {
+                    return;
+                }
+                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(hydroInfo.ID, visual.Code, list);
+                if (!bol)
+                {
+                    TipFormHelper.ShowError("璁剧疆澶辫触");
+                    return;
+                }
+                TipFormHelper.ShowSucceed("璁剧疆鎴愬姛");
+                UpdateMonitorList(visual.Code);
+            };
+            dlg.ShowDialog();
+        }
+
+        //璁剧疆鐩戞祴鐐�
+        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            SetSelectVisualMonitorList();
+        }
+
+        #endregion
+
+        #region 鐩戞祴鍒楄〃
+
+
+
+        #region 鐩戞祴鍊煎垪琛�
+
+        //鎵�鏈夌洃娴嬪�煎垪琛�
+        private List<HydroVisualMonitorValueViewModel> _allMonitorValueList = null;
+
+        //鑾峰彇鐩戞祴鍊煎垪琛�
+        private async Task<List<HydroVisualMonitorValueViewModel>> GetMonitorValueList()
+        {
+            if (_allMonitorValueList == null)
+            {
+                _allMonitorValueList = new List<HydroVisualMonitorValueViewModel>();
+                var allMonitorList = await GetMonitorList();
+                var allVisualViewModelList = GetVisualViewModelList();
+                allMonitorList.ForEach(x =>
+                {
+                    var visual = allVisualViewModelList.Find(t => t.Code == x.Relation);
+                    if (visual != null)
+                    {
+                        var vm = new HydroVisualMonitorValueViewModel(visual.Vmo, x);
+                        _allMonitorValueList.Add(vm);
+                    }
+                });
+            }
+            return _allMonitorValueList;
+        }
+
+        //鏇存柊鐩戞祴鍊煎垪琛�
+        private async void UpdateMonitorValueList(string code, List<HydroMonitorVmo> monitorList)
+        {
+            if (string.IsNullOrEmpty(code))
+            {
+                return;
+            }
+            var visual = GetVisualViewModel(code)?.Vmo;
+            if (visual == null)
+            {
+                return;
+            }
+            var allMonitorValueList = await GetMonitorValueList();
+            var monitorValueList = allMonitorValueList.Where(x => x.Vmo.Relation == code).ToList();
+            monitorValueList?.ForEach(x =>
+            {
+                var result = monitorList?.Exists(t => t.Relation == x.Vmo.Relation && t.PropName == x.Vmo.PropName);
+                if (!(result.HasValue && result.Value))
+                {
+                    allMonitorValueList.Remove(x);
+                }
+            });
+            monitorList?.ForEach(x =>
+            {
+                var result = monitorValueList?.Exists(t => t.Vmo.Relation == x.Relation && t.Vmo.PropName == x.PropName);
+                if (!(result.HasValue && result.Value))
+                {
+                    var vm = new HydroVisualMonitorValueViewModel(visual, x);
+                    allMonitorValueList.Add(vm);
+                }
+            });
+        }
+
+        #endregion
+
+        #region 鐩戞祴鍊煎垪琛ㄦ帶浠�
+
+        //鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroVisualMonitorValueListCtrl _monitorValueListCtrl = null;
+
+        //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroVisualMonitorValueListCtrl GetMonitorValueListCtrl()
+        {
+            if (_monitorValueListCtrl == null)
+            {
+                _monitorValueListCtrl = new HydroVisualMonitorValueListCtrl();
+                _monitorValueListCtrl.Dock = DockStyle.Fill;
+                _monitorValueListCtrl.HydroViewEvent += (code) =>
+                {
+                    _bimfaceCtrl?.ZoomToComponent(code);
+                };
+            }
+            return _monitorValueListCtrl;
+        }
+
+        //鏄剧ず鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private async void ShowMonitorValueListCtrl()
+        {
+            var monitorValueListCtrl = GetMonitorValueListCtrl();
+            var allMonitorValueList = await GetMonitorValueList();
+            monitorValueListCtrl.SetBindingData(allMonitorValueList);
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鐩戞祴鍊�";
+            this.docPnlBottom.Height = 350;
+        }
+
+        //璁剧疆鐩戞祴鍊�
+        private void barBtnSetMonitorValue_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowMonitorValueListCtrl();
+        }
+
+        #endregion
+
+        #region 鐩戞祴鍒楄〃鏄剧ず
+
+        //鐩戞祴鏄惁鏄剧ず
+        private bool _isMonitorVisible = false;
+
+        //鑾峰彇涓氬姟鐩戞祴鍒楄〃
+        private async Task<List<LogicMonitor>> GetLogicMonitorList()
+        {
+            var allMonitorList = await GetMonitorList();
+            var allLogicMonitorList = allMonitorList.Select(x =>
+            {
+                var logicMonitor = new LogicMonitor();
+                logicMonitor.Id = x.Relation;
+                logicMonitor.PropName = x.PropName;
+                logicMonitor.Description = x.Description;
+                return logicMonitor;
+            }).ToList();
+            return allLogicMonitorList;
+        }
+
+        //璁剧疆涓氬姟鐩戞祴鍒楄〃
+        private async void SetLogicMonitorList()
+        {
+            if (_isMonitorVisible)
+            {
+                var allLogicMonitorList = await GetLogicMonitorList();
+                await _bimfaceCtrl?.SetLogicMonitors(allLogicMonitorList);
+            }
+            else
+            {
+                await _bimfaceCtrl?.ClearLogicMonitors();
+            }
+        }
+
+        //鏄剧ず鐘舵�佹敼鍙�
+        private void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _isMonitorVisible = this.barCkMonitor.Checked;
+            SetLogicMonitorList();
+        }
+
+
+        #endregion
+
+        #endregion
+
+        #region 妫�鏌ョ粨鏋�
+
+        //妫�鏌ョ粨鏋滅紦瀛�
+        private HydroCheckResult _checkResult = null;
+
+        //鑾峰彇妫�鏌ョ粨鏋�
+        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
+        private HydroCheckResult GetCheckResult(bool needCheckAgain = false)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (needCheckAgain)
+            {
+                _checkResult = _hydroInfo.Check();
+            }
+            if (_checkResult == null)
+            {
+                _checkResult = _hydroInfo.Check();
+            }
+            return _checkResult;
+        }
+
+        #endregion
+
+        #region 妫�鏌ユ帶浠�
+
+        //妫�鏌ユ帶浠�
+        private HydroCheckResultCtrl _checkCtrl = null;
+
+        //鑾峰彇妫�鏌ユ帶浠�
+        private HydroCheckResultCtrl GetCheckCtrl()
         {
             if (_checkCtrl == null)
             {
-                _checkCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
+                _checkCtrl = new HydroCheckResultCtrl();
                 _checkCtrl.Dock = DockStyle.Fill;
                 _checkCtrl.HydroClickEvent += async (code) =>
                 {
@@ -3273,15 +2294,15 @@
                     var elementIds = new List<string>();
                     if (string.IsNullOrEmpty(code))
                     {
-                        _selectedVisual = null;
+                        this.SelectedVisual = null;
                     }
                     else
                     {
-                        var allParterList = _hydroInfo.GetAllVisuals();
-                        _selectedVisual = allParterList?.Find(x => x.Code == code);
-                        if (_selectedVisual != null)
+                        var allVisualViewModelList = GetVisualViewModelList();
+                        this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
+                        if (this.SelectedVisual != null)
                         {
-                            elementIds.Add(_selectedVisual.Code);
+                            elementIds.Add(this.SelectedVisual.Code);
                         }
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
@@ -3292,35 +2313,766 @@
         }
 
         //鏄剧ず妫�鏌ユ帶浠�
-        private void ShowCheckCtrl()
+        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
+        private void ShowCheckCtrl(bool needCheckAgain = false)
         {
-            if (_checkResult == null)
+            var checkResult = GetCheckResult(needCheckAgain);
+            if (checkResult == null)
             {
                 return;
             }
             var checkCtrl = GetCheckCtrl();
-            checkCtrl.SetBindingData(_checkResult);
+            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)
+        //妫�鏌�
+        private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowCheckCtrl(true);
+        }
+
+        #endregion
+
+        #region 璁$畻澶辫触
+
+        //璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
+
+        //鑾峰彇璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
+        {
+            if (_calcuFailedCtrl == null)
+            {
+                _calcuFailedCtrl = new HydroCalcuFailedCtrl();
+                _calcuFailedCtrl.Dock = DockStyle.Fill;
+            }
+            return _calcuFailedCtrl;
+        }
+
+        //鏄剧ず璁$畻澶辫触鎺т欢
+        private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            _checkResult = _hydroInfo.Check();
-            ShowCheckCtrl();
+            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;
+        }
+
+        //鏄剧ず璁$畻澶辫触鎺т欢
+        private void ShowCalcuFailedCtrl()
+        {
+            ShowCalcuFailedCtrl(_calcuResult);
         }
 
         #endregion
 
+        #region 绠$綉淇
+
+        //淇绠$綉
+        private void Repair()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var checkResult = GetCheckResult(true);
+            if (checkResult == null)
+            {
+                return;
+            }
+            if (!checkResult.Succeed)
+            {
+                ShowCheckCtrl(false);
+                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
+                return;
+            }
+            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
+            if (calcuResult == null)
+            {
+                return;
+            }
+            if (!calcuResult.Succeed)
+            {
+                ShowCalcuFailedCtrl(calcuResult);
+                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
+                return;
+            }
+            var allLinks = _hydroInfo.GetAllLinks();
+            if (allLinks != null && allLinks.Count < 1)
+            {
+                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
+                return;
+            }
+            int count = 0;
+            foreach (var link in allLinks)
+            {
+                var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
+                if (calcuLink == null)
+                {
+                    continue;
+                }
+                if (!calcuLink.CalcuFlow.HasValue)
+                {
+                    continue;
+                }
+                if (calcuLink.CalcuFlow.Value < 0)
+                {
+                    var tempCode = link.StartCode;
+                    link.StartCode = link.EndCode;
+                    link.EndCode = tempCode;
+                    count++;
+                }
+            }
+            UpdateVisualViewModelProperty();
+            UpdateVisualListCtrl();
+            UpdateSelectedProperty();
+            TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
+        }
+
+        //绠$綉淇
+        private void barBtnRepair_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            Repair();
+        }
+
+        #endregion
+
+        #region 瀵煎嚭INP
+
+        //瀵煎嚭INP鏂囦欢
+        private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var fileName = FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+            var result = netWork.ToInpString();
+            File.WriteAllText(fileName, result);
+            TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
+        }
+
+        #endregion
+
+        #region 骞惰仈鍒嗘瀽
+
+        //骞惰仈鍒嗘瀽
+        private void ParallelAnalysis()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var pumps = _hydroInfo.Pumps;
+            if (pumps == null || pumps.Count < 1)
+            {
+                XtraMessageBox.Show("鏃犳按娉典俊鎭�");
+                return;
+            }
+            var vmList = new List<XhsSinglePumpViewModel>();
+            foreach (var pump in pumps)
+            {
+                if (!pump.RatedN.HasValue)
+                {
+                    continue;
+                }
+                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
+                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
+                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
+                if (qh == null)
+                {
+                    continue;
+                }
+
+                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+
+                var vm = new XhsSinglePumpViewModel();
+                vmList.Add(vm);
+                vm.ID = pump.ID;
+                vm.Name = pump.Name;
+                vm.Code = pump.Code;
+                vm.IsBp = true;
+                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
+                vm.RatedHz = pump.RatedHz;
+                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
+                vm.RatedSpeed = pump.RatedN.Value;
+                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
+                vm.CurveQH = qhPtList;
+                vm.CurveQE = qePtList;
+                vm.CurveQP = qpPtList;
+
+            }
+
+            var dlg = new PumpParallelAnalyDlg();
+            dlg.SetBindingData(vmList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                list?.ForEach(x =>
+                {
+                    var pump = pumps.Find(t => t.Code == x.Code);
+                    if (pump != null)
+                    {
+                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+                        pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
+                    }
+                });
+                var codes = list?.Select(x => x.Code).ToList();
+                UpdateVisualViewModelProperty(codes);
+                ShowSelectedProperty();
+                UpdateVisualListCtrl();
+                return true;
+            };
+            dlg.ShowDialog();
+        }
+
+        //骞惰仈鍒嗘瀽
+        private void barBtnParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ParallelAnalysis();
+        }
+
+        #endregion
+
+        #region 宸ュ喌璁$畻
+
+        //鎵�鏈夊伐鍐靛垪琛�
+        private List<HydroWorkingVmo> _allWorkingList = null;
+
+        //鑾峰彇宸ュ喌鍒楄〃
+        private async Task<List<HydroWorkingVmo>> GetWorkingList()
+        {
+            if (_allWorkingList == null)
+            {
+                _allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(_hydroInfo.ID);
+                if (_allWorkingList == null)
+                {
+                    _allWorkingList = new List<HydroWorkingVmo>();
+                }
+            }
+            return _allWorkingList;
+        }
+
+        //鎵�鏈夊伐鍐靛厓缁勫垪琛�
+        private List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>> _allWorkingTupleList = null;
+
+        //鑾峰彇宸ュ喌鍏冪粍鍒楄〃
+        private async Task<List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>> GetWorkingTupleList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allWorkingTupleList == null)
+            {
+                _allWorkingTupleList = new List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>();
+                var allWorkingList = await GetWorkingList();
+                if (allWorkingList.Count > 0)
+                {
+                    allWorkingList.ForEach(x =>
+                    {
+                        var checkResult = _hydroInfo.Check();
+                        HydroCalcuResult calcuResult = null;
+                        if (checkResult != null && checkResult.Succeed)
+                        {
+                            calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+                        }
+                        _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(x, checkResult, calcuResult));
+                    });
+                }
+            }
+            return _allWorkingTupleList;
+        }
+
+        //娣诲姞宸ュ喌鍏冪粍
+        private async void AppendWorkingTuple(HydroWorkingVmo working, HydroCheckResult check, HydroCalcuResult calcu)
+        {
+            var allWorkingTupleList = await GetWorkingTupleList();
+            allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(working, check, calcu));
+        }
+
+        //绉婚櫎宸ュ喌鍏冪粍
+        private async void RemoveWorkingTuple(HydroWorkingVmo working)
+        {
+            var allWorkingTupleList = await GetWorkingTupleList();
+            if (allWorkingTupleList.Count > 0)
+            {
+                allWorkingTupleList.RemoveAll(x => x.Item1.ID == working.ID);
+            }
+        }
+
+        //鏄剧ず宸ュ喌璁$畻绐椾綋
+        private void ShowWorkingCalcuDlg()
+        {
+            var dlg = new SetHydroWorkingDlg();
+            dlg.HydroViewEvent += async (visual) =>
+            {
+                _selectedVisual = visual;
+                if (_selectedVisual != null)
+                {
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
+                }
+                ShowSelectedProperty();
+            };
+            dlg.HydroCalcuEvent += async (working) =>
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var allWorkingList = await GetWorkingList();
+                var vmo = new HydroWorkingVmo();
+                vmo.ModelID = _hydroInfo.ID;
+                vmo.Name = working.Name;
+                vmo.WorkingInfo = JsonHelper.Object2Json(working.WorkingInfo);
+                vmo.MonitorInfo = JsonHelper.Object2Json(working.MonitorInfo);
+                vmo.SortCode = allWorkingList.Count < 1 ? 1 : allWorkingList.Max(x => x.SortCode) + 1;
+                vmo.Description = working.Description;
+                vmo.ID = await BLLFactory<Yw.BLL.HydroWorking>.Instance.Insert(vmo);
+                if (vmo.ID < 1)
+                {
+                    TipFormHelper.ShowError("鍒涘缓宸ュ喌澶辫触锛岃绠楀彇娑堬紒");
+                    return;
+                }
+                allWorkingList.Add(vmo);
+
+                _hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
+                //鏍¢獙
+                _checkResult = _hydroInfo.Check();
+                if (!_checkResult.Succeed)
+                {
+                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, null));
+                    ShowCheckCtrl();
+                    TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    return;
+                }
+
+                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
+
+
+                //await Task.Delay(5000);
+                _calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+
+
+                WaitFormHelper.HideWaitForm();
+                if (_calcuResult.Succeed)
+                {
+                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, _calcuResult));
+                    UpdateVisualViewModelProperty();
+                    UpdateVisualViewModelCalcuProperty();
+                    UpdateVisualListCtrl();
+                    UpdateSelectedProperty();
+                    //await _bimfaceCtrl?.SetLogicCalcuCustomLabelsCalcuResult(_calcuResult);
+                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+                }
+                else
+                {
+                    ShowCalcuFailedCtrl();
+                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                }
+                ApplyGradingResultList(false);
+                UpdateVisualListCtrl();
+                ShowSelectedProperty();
+            };
+            dlg.SetBindingData(_hydroInfo, _allWorkingList, _allMonitorValueList);
+            dlg.ShowDialog();
+        }
+
+        //姘村姏璁$畻
+        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowWorkingCalcuDlg();
+        }
+
+        #endregion
+
+        #region 璁$畻鏍囩
+
+        //璁$畻鏍囩鏄惁鏄剧ず
+        private bool _isCalcuLabelsVisible = false;
+
+        //鎵�鏈夎绠楁爣绛�
+        private List<LogicCalcuCustomLabel> _allCalcuLabels = null;
+
+        //鑾峰彇璁$畻鏍囩
+        private List<LogicCalcuCustomLabel> GetCalcuLabels()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
+            {
+                return default;
+            }
+            var list = new List<LogicCalcuCustomLabel>();
+
+            _hydroInfo.Pumps?.ForEach(x =>
+            {
+                var hz = Math.Round(x.RatedHz * x.SpeedRatio);
+                var calcuPumpResult = GetCalcuVisualResult(x.Code) as HydroCalcuLinkResult;
+                if (calcuPumpResult != null)
+                {
+                    var calcuPumpStartResult = GetCalcuVisualResult(x.StartCode) as HydroCalcuNodeResult;
+                    var calcuPumpEndResult = GetCalcuVisualResult(x.EndCode) as HydroCalcuNodeResult;
+                    var pumpCustomLabel = new LogicCalcuCustomLabel();
+                    pumpCustomLabel.Id = x.Code;
+                    pumpCustomLabel.Distance = 20000;
+                    pumpCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
+                    {
+                        new LogicCalcuCustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(x.LinkStatus),Unit=string.Empty},
+                        new LogicCalcuCustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
+                        new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPumpResult.CalcuFlow.Value,1).ToString(),Unit="m鲁/h"},
+                        new LogicCalcuCustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStartResult.CalcuHead.Value,4).ToString(),Unit="m"},
+                        new LogicCalcuCustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEndResult.CalcuHead.Value,4).ToString(),Unit="m"},
+                    };
+                    list.Add(pumpCustomLabel);
+                }
+            });
+
+            _hydroInfo.GetAllEmitters()?.ForEach(x =>
+            {
+                var calcuEmitter = GetCalcuVisualResult(x.Code) as HydroCalcuNodeResult;
+                var emitterCustomLabel = new LogicCalcuCustomLabel();
+                emitterCustomLabel.Id = x.Code;
+                emitterCustomLabel.Distance = 30000;
+                emitterCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
+                    {
+                        new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.CalcuDemand.Value,1).ToString(),Unit="m鲁/h"},
+                        new LogicCalcuCustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.CalcuDemand.Value,4).ToString(),Unit="m"}
+                    };
+                list.Add(emitterCustomLabel);
+            });
+            return list;
+        }
+
+        //璁剧疆璁$畻鏍囩
+        private void SetCalcuLabels()
+        {
+            if (_isCalcuLabelsVisible)
+            {
+                var allCalcuLabels = GetCalcuLabels();
+                _bimfaceCtrl?.SetLogicCalcuCustomLabels(allCalcuLabels);
+            }
+            else
+            {
+                _bimfaceCtrl?.ClearLogicCalcuCustomLabels();
+            }
+        }
+
+        //璁剧疆璁$畻鏍囩鏄惁鏄剧ず
+        private void barCkCalcuLabels_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _isCalcuLabelsVisible = this.barCkCalcuLabels.Checked;
+        }
+
+        #endregion
+
+        #region 褰撳墠宸ュ喌
+
+        //褰撳墠宸ュ喌
+        private Yw.Vmo.HydroWorkingVmo _currentWorking = null;
+
+        //鍒濆鍖栧綋鍓嶅伐鍐�
+        private async void InitialCurrentWorking()
+        {
+            var allWorkingList = await GetWorkingList();
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Clear();
+            if (allWorkingList != null && allWorkingList.Count > 0)
+            {
+                allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
+                this.barEditCurrentWorking.EditValue = allWorkingList.Last();
+            }
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+        }
+
+        //澧炲姞褰撳墠宸ュ喌
+        private void AppendCurrentWorking(HydroWorkingVmo working)
+        {
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+            this.barEditCurrentWorking.EditValue = working;
+        }
+
+        //璁剧疆褰撳墠宸ュ喌
+        private async void SetCurrentWorking(HydroWorkingVmo working)
+        {
+            if (working == null)
+            {
+                return;
+            }
+            this.barEditCurrentWorking.EditValue = working;
+            _currentWorking = working;
+            var allWorkingTupleList = await GetWorkingTupleList();
+            var tuple = allWorkingTupleList?.Find(x => x.Item1.ID == working.ID);
+            if (tuple == null)
+            {
+                return;
+            }
+            _checkResult = tuple.Item2;
+            _calcuResult = tuple.Item3;
+        }
+
+        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
+        private void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
+        {
+            var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
+            SetCurrentWorking(working);
+        }
+
+        #endregion
+
+        #region 宸ュ喌鎺т欢
+
+        //宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl _workingCtrl = null;
+
+        //鑾峰彇宸ュ喌鎺т欢
+        private async Task<HydroWorkingTreeCtrl> GetWorkingCtrl()
+        {
+            if (_workingCtrl == null)
+            {
+                _workingCtrl = new HydroWorkingTreeCtrl();
+                _workingCtrl.Dock = DockStyle.Fill;
+                var allWorkingList = await GetWorkingList();
+                _workingCtrl.SetBindingData(allWorkingList);
+                _workingCtrl.FocusedChangedEvent += (vmo) =>
+                {
+
+                };
+            }
+            return _workingCtrl;
+        }
+
+        //宸ュ喌鎺т欢鏄惁鍙
+        private bool IsWorkingCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerRight.Controls.Count > 0)
+                    {
+                        if (this.controlContainerRight.Controls[0] is HydroWorkingTreeCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず宸ュ喌鎺т欢
+        private async void ShowWorkingCtrl()
+        {
+            if (IsWorkingCtrlVisible)
+            {
+                return;
+            }
+            var workingCtrl = await GetWorkingCtrl();
+            this.controlContainerRight.Controls.Clear();
+            this.controlContainerRight.Controls.Add(workingCtrl);
+            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlRight.Text = "宸ュ喌";
+            this.docPnlRight.Width = 300;
+        }
+
+        //闅愯棌宸ュ喌鎺т欢
+        private void HideWorkingCtrl()
+        {
+            if (IsWorkingCtrlVisible)
+            {
+                this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            }
+        }
+
+        //鏇存柊宸ュ喌鎺т欢
+        private async void UpdateWorkingCtrl()
+        {
+            var workingCtrl = await GetWorkingCtrl();
+            var allWorkingList = await GetWorkingList();
+            workingCtrl.SetBindingData(allWorkingList);
+        }
+
+        //宸ュ喌鍒楄〃鐐瑰嚮
+        private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowWorkingCtrl();
+        }
+
+        #endregion
+
+        #region 宸ュ喌璇勪及
+
+
+        private void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
+
+        #endregion
+
+        #region 宸ュ喌骞惰仈
+
+        //骞惰仈鍒嗘瀽
+        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
+            {
+                return;
+            }
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            var vmList = new List<XhsSinglePumpViewModel>();
+            foreach (var pump in _hydroInfo.Pumps)
+            {
+                if (!pump.RatedN.HasValue)
+                {
+                    continue;
+                }
+                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
+                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
+                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
+                if (qh == null)
+                {
+                    continue;
+                }
+
+                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+
+                var vm = new XhsSinglePumpViewModel();
+                vmList.Add(vm);
+                vm.ID = pump.ID;
+                vm.Name = pump.Name;
+                vm.Code = pump.Code;
+                vm.IsBp = true;
+                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
+                vm.RatedHz = pump.RatedHz;
+                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
+                vm.RatedSpeed = pump.RatedN.Value;
+                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
+                vm.CurveQH = qhPtList;
+                vm.CurveQE = qePtList;
+                vm.CurveQP = qpPtList;
+
+                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
+                {
+                    var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+                    if (calcuResult != null)
+                    {
+                        if (calcuResult.CalcuFlow.HasValue)
+                        {
+                            vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
+                        }
+
+                        var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+                        var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+                        if (calcuResultStart != null && calcuResultEnd != null)
+                        {
+                            if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
+                            {
+                                vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
+                            }
+                        }
+                    }
+                }
+
+            }
+
+            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();
+        }
+
+        #endregion
+
+        #region 宸ュ喌鑳芥晥
+
+        private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
+
+        #endregion
+
+        #region 鎹熷け鏇茬嚎
+
+        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
+
+        #endregion
+
+        #region 鎹熷け姣斾緥
+
+        private void barBtnWorkingLossScale_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
+
+        #endregion
+
+        #region 缁煎悎鍒嗘瀽
+        private void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
+        #endregion
+
+
 
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3