From 285f0b8e2ca80fd538c29d3ce831ff34c941532d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 20 十一月 2024 10:26:58 +0800
Subject: [PATCH] 修复突然出现命名空间引用缺失的问题

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 3168 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 2,496 insertions(+), 672 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 3fee2f9..1037523 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,5 +1,21 @@
 锘縢lobal using Yw.EPAnet;
+using DevExpress.CodeParser;
 using DevExpress.Mvvm.Native;
+using DevExpress.Office.Utils;
+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 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;
 using Yw.WinFrmUI.Hydro;
 
@@ -13,16 +29,14 @@
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            RegistBulkSetEvents();
         }
 
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
 
-        private Yw.Model.HydroParterInfo _parter = null;
-        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;
-        private Yw.EPAnet.CalcuResult _calcuResult = null;
+
 
         /// <summary>
         /// 缁戝畾鏁版嵁
@@ -56,7 +70,7 @@
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
         /// </summary>
-        public override async void InitialDataSource()
+        public override void InitialDataSource()
         {
             base.InitialDataSource();
             if (_project == null)
@@ -64,39 +78,32 @@
                 return;
             }
             this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
-            var bimfaceCtrl = GetBimfaceCtrl();
-            this.tabPageBimface.Controls.Clear();
-            this.tabPageBimface.Controls.Add(bimfaceCtrl);
-            await bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
-            var q3dCtrl = GetQ3dCtrl();
-            this.tabPageQ3d.Controls.Clear();
-            this.tabPageQ3d.Controls.Add(q3dCtrl);
-            q3dCtrl.InitialData(() => _hydroInfo);
+            ShowBimfaceCtrl();
+            ShowQ3dCtrl();
             ShowPropertyCtrl();
 
         }
 
+
         #region Bimface
 
+        //bimface鎺т欢
+        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
+
         //鑾峰彇 bimface 鎺т欢
-        private XhsProjectSimulationBimfaceCtrl GetBimfaceCtrl()
+        private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
         {
             if (_bimfaceCtrl == null)
             {
                 _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                _bimfaceCtrl.LoadCompletedEvent += async () =>
+                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var elementIds = new List<string>();
-                    var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.PumpStatus.Open).ToList();
-                    pumps?.ForEach(x => elementIds.Add(x.Code));
-                    var valves = _hydroInfo.Valves?.Where(x => x.LinkStatus == Yw.Hydro.ValveStatus.Open).ToList();
-                    valves?.ForEach(x => elementIds.Add(x.Code));
-                    await _bimfaceCtrl?.SetOpenComponentsColor(elementIds);
                 };
                 _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
@@ -104,109 +111,374 @@
                     {
                         return;
                     }
-                    _parter = obj;
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    _selectedVisual = obj;
+                    ShowSelectedProperty();
                 };
             }
             return _bimfaceCtrl;
         }
 
-        //bimface鎺т欢
-        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
-
-        //璁剧疆Bimface杩炴帴棰滆壊
-        private async void SetBimfaceLinkColor()
+        //鏄剧ず bimface 鎺т欢
+        private async void ShowBimfaceCtrl()
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_parter != null)
-            {
-                if (_parter is Yw.Model.HydroLinkInfo link)
-                {
-                    await _bimfaceCtrl?.RestoreLinkComponentsColor();
+            var bimfaceCtrl = await GetBimfaceCtrl();
+            this.tabPageBimface.Controls.Clear();
+            this.tabPageBimface.Controls.Add(bimfaceCtrl);
+        }
 
-                    var allVisualList = _hydroInfo.GetAllVisuals();
-                    var allLinkList = _hydroInfo.GetAllLinks();
-                    var startParter = allVisualList?.Find(x => x.Code == link.StartCode);
-                    if (startParter != null)
-                    {
-                        var startElementIds = new List<string>();
-                        if (startParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
-                        {
-                            var startLinkList = allLinkList?.Where(x => x.StartCode == startParter.Code || x.EndCode == startParter.Code && x.Code != _parter.Code).ToList();
-                            if (startLinkList != null && startLinkList.Count > 0)
-                            {
-                                startElementIds.AddRange(startLinkList.Select(x => x.Code));
-                            }
-                        }
-                        else
-                        {
-                            startElementIds.Add(startParter.Code);
-                        }
-                        if (startElementIds.Count > 0)
-                        {
-                            await _bimfaceCtrl?.SetLinkStartComponentsColor(startElementIds);
-                        }
-                    }
-                    var endParter = allVisualList?.Find(x => x.Code == link.EndCode);
-                    if (endParter != null)
-                    {
-                        var endElementIds = new List<string>();
-                        if (endParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
-                        {
-                            var endLinkList = allLinkList?.Where(x => x.StartCode == endParter.Code || x.EndCode == endParter.Code && x.Code != _parter.Code).ToList();
-                            if (endLinkList != null && endLinkList.Count > 0)
-                            {
-                                endElementIds.AddRange(endLinkList.Select(x => x.Code));
-                            }
-                        }
-                        else
-                        {
-                            endElementIds.Add(endParter.Code);
-                        }
-                        if (endElementIds.Count > 0)
-                        {
-                            await _bimfaceCtrl?.SetLinkEndComponentsColor(endElementIds);
-                        }
-                    }
-                }
-            }
+        private void SelectBimfaceParter()
+        {
+
         }
 
         #endregion
 
         #region Q3d
 
-        //鑾峰彇Q3d鎺т欢
+        //Q3d 鎺т欢
+        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
+
+        //鑾峰彇 Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
         {
             if (_q3dCtrl == null)
             {
                 _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                 _q3dCtrl.Dock = DockStyle.Fill;
+                _q3dCtrl.InitialData(() => _hydroInfo);
                 _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
                 {
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
-                    ShowProperty();
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
+                    ShowSelectedProperty();
                 };
             }
             return _q3dCtrl;
         }
 
-        //Q3d鎺т欢
-        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
+        //鏄剧ず Q3d 鎺т欢
+        private void ShowQ3dCtrl()
+        {
+            var q3dCtrl = GetQ3dCtrl();
+            this.tabPageQ3d.Controls.Clear();
+            this.tabPageQ3d.Controls.Add(q3dCtrl);
+        }
 
-        #endregion Q3d
+        #endregion
 
-        #region 灞炴�ч潰鏉�
+        #region 鍙鍒楄〃
+
+        //鎵�鏈夊彲瑙嗗瓧鍏�
+        private 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 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
         private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
@@ -218,40 +490,42 @@
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetAllCalcuResult());
-                _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;
@@ -260,20 +534,71 @@
                     }
                     else
                     {
-                        blinkCodes.Add(linkCode);
+                        blinkCodes.Add(linkNodeCode);
                     }
 
+                    await _bimfaceCtrl?.ClearBlinkComponents();
                     await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
+                _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+                {
+                    if (visual == null)
+                    {
+                        return;
+                    }
+                    UpdateVisualListCtrl();
+                    //ApplyGradingResultList(visual);
+                };
+                _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+                {
+                    //鏍囨敞灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+                    //UpdateMark(visual);
+                };
+                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                {
+                    //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                };
+                _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
+                {
+                    //娴佸悜灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
+                    //UpdateFlowEffect(visual);
+                };
+
             }
             return _propertyCtrl;
         }
 
-        //鏄剧ず灞炴�ч潰鏉�
+        //灞炴�ф帶浠舵槸鍚﹀彲瑙�
+        private bool IsPropertyCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerRight.Controls.Count > 0)
+                    {
+                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず灞炴�ф帶浠�
         private void ShowPropertyCtrl()
         {
+            if (IsPropertyCtrlVisible)
+            {
+                return;
+            }
             var propertyCtrl = GetPropertyCtrl();
             this.controlContainerRight.Controls.Clear();
             this.controlContainerRight.Controls.Add(propertyCtrl);
@@ -282,67 +607,56 @@
             this.docPnlRight.Width = 300;
         }
 
-        //灞炴�ч潰鏉挎寜閽�
-        private void barBtnProperty_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏄剧ず閫夋嫨灞炴��
+        private void ShowSelectedProperty()
         {
-            ShowPropertyCtrl();
+            ShowSelectedProperty(_selectedVisual);
         }
 
-        //鏄剧ず灞炴��
-        private void ShowProperty()
+        //鏄剧ず閫夋嫨灞炴��
+        private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Hidden)
+            ShowPropertyCtrl();
+            _selectedVisual = visual;
+            if (_selectedVisual == null)
             {
-                ShowPropertyCtrl();
-            }
-
-            if (_parter == null)
-            {
-                _propertyCtrl?.SelectParter(null);
+                _propertyCtrl.SelectedObject = null;
                 return;
             }
+            _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
+        }
 
-            _propertyCtrl?.SelectParter(_parter.Code);
-            if (_calcuResult != null)
+        //鏇存柊閫夋嫨灞炴��
+        private void UpdateSelectedProperty()
+        {
+            if (!IsPropertyCtrlVisible)
             {
-                if (_calcuResult.Succeed)
-                {
-                    var allCalcuParterList = _calcuResult.GetParterList();
-                    var calcuParter = allCalcuParterList.Find(x => x.Id == _parter.Code);
-                    if (calcuParter != null)
-                    {
-                        IHydroCalcuResult calcuProperty = null;
-                        if (calcuParter is Yw.EPAnet.CalcuNode calcuNode)
-                        {
-                            var calcuNodeProperty = new Yw.WinFrmUI.HydroCalcuNodeResult();
-                            calcuNodeProperty.Code = _parter.Code;
-                            calcuNodeProperty.CalcuPress = calcuNode.Press;
-                            calcuNodeProperty.CalcuDemand = calcuNode.Demand;
-                            calcuNodeProperty.CalcuHead = calcuNode.Head;
-                            calcuProperty = calcuNodeProperty;
-                        }
-                        else if (calcuParter is Yw.EPAnet.CalcuLink calcuLink)
-                        {
-                            var calcuLinkProperty = new Yw.WinFrmUI.HydroCalcuLinkResult();
-                            calcuLinkProperty.Code = _parter.Code;
-                            calcuLinkProperty.CalcuHeadLoss = calcuLink.Headloss;
-                            calcuLinkProperty.CalcuFlow = calcuLink.Flow;
-                            calcuLinkProperty.CalcuVelocity = calcuLink.Velocity;
-                            calcuProperty = calcuLinkProperty;
-                        }
-
-                        if (calcuProperty != null)
-                        {
-                            _propertyCtrl?.UpdateCalcuProperty(calcuProperty);
-                        }
-                    }
-                }
+                return;
             }
+            if (_selectedVisual == null)
+            {
+                return;
+            }
+            _propertyCtrl?.UpdateRows();
+        }
 
+        //璁剧疆灞炴�ф帶浠�
+        private void SetPropertyCtrl(Yw.Model.HydroVisualInfo visual)
+        {
+            if (visual == null)
+            {
+
+            }
+        }
+
+        //鏇存柊灞炴�ф帶浠�
+        private void UpdatePropertyCtrl()
+        {
+            _propertyCtrl?.UpdateRows();
         }
 
         #endregion
@@ -362,16 +676,15 @@
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == code);
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == code);
                     var elementIds = new List<string>();
-                    if (_parter != null)
+                    if (_selectedVisual != null)
                     {
-                        elementIds.Add(_parter.Code);
+                        elementIds.Add(_selectedVisual.Code);
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    ShowSelectedProperty();
                 };
                 _matchingListCtrl.ApplyMatchingEvent += (output) =>
                 {
@@ -397,7 +710,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetAllCalcuResult());
+            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;
@@ -405,7 +718,7 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion 鑷姩鍖归厤
+        #endregion
 
         #region 鏈尮閰嶅垪琛�
 
@@ -426,19 +739,18 @@
                     {
                         return;
                     }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == parter.Code);
+                    var allParterList = _hydroInfo.GetAllVisuals();
+                    _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
                     var elementIds = new List<string>() { parter.Code };
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
+                    ShowSelectedProperty();
                 };
                 _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
                 {
                     var codes = parters?.Select(x => x.Code).Distinct().ToList();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _parter = null;
-                    ShowProperty();
+                    _selectedVisual = null;
+                    ShowSelectedProperty();
                 };
             }
             return _unMatchingListCtrl;
@@ -462,12 +774,15 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion 鏈尮閰嶅垪琛�
+        #endregion
 
         #region 涓�閿樉闅�
 
+        //鏄鹃殣缂栫爜鍒楄〃
+        private List<string> _fastShowHiddenCodeList = null;
+
         //涓�閿樉闅�
-        private async Task FastShowHidden()
+        private async void FastShowHidden()
         {
             if (_hydroInfo == null)
             {
@@ -489,86 +804,13 @@
             }
         }
 
-        //鏄鹃殣缂栫爜鍒楄〃
-        private List<string> _fastShowHiddenCodeList = null;
-
         //瑙﹀彂涓�閿樉闅�
-        private async void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            await FastShowHidden();
+            FastShowHidden();
         }
 
         #endregion
-
-        #region 姘村姏鏍¢獙
-
-        //鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl _checkCtrl = null;
-
-        //鑾峰彇鏍¢獙鎺т欢
-        private XhsProjectSimulationHydroCheckResultCtrl GetCheckCtrl()
-        {
-            if (_checkCtrl == null)
-            {
-                _checkCtrl = new XhsProjectSimulationHydroCheckResultCtrl();
-                _checkCtrl.Dock = DockStyle.Fill;
-                _checkCtrl.HydroClickEvent += async (code) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var elementIds = new List<string>();
-                    if (string.IsNullOrEmpty(code))
-                    {
-                        _parter = null;
-                    }
-                    else
-                    {
-                        var allParterList = _hydroInfo.GetAllParters();
-                        _parter = allParterList?.Find(x => x.Code == code);
-                        if (_parter != null)
-                        {
-                            elementIds.Add(_parter.Code);
-                        }
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
-                };
-            }
-            return _checkCtrl;
-        }
-
-        //鏄剧ず鏍¢獙鎺т欢
-        private void ShowCheckCtrl()
-        {
-            if (_checkResult == null)
-            {
-                return;
-            }
-            var checkCtrl = GetCheckCtrl();
-            checkCtrl.SetBindingData(_checkResult);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(checkCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏍¢獙缁撴灉";
-            this.docPnlBottom.Height = 350;
-
-        }
-
-        //姘村姏楠岃瘉
-        private void barBtnHydroCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            _checkResult = _hydroInfo.Check();
-            ShowCheckCtrl();
-        }
-
-        #endregion 姘村姏鏍¢獙
 
         #region 淇濆瓨淇℃伅
 
@@ -579,7 +821,17 @@
             {
                 return;
             }
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+
+
             var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
+
+            //鑰楁椂宸ㄥぇ鐨勪唬鐮�  
+
+            sw.Stop();
+            TimeSpan ts2 = sw.Elapsed;
+            Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
             if (id < 1)
             {
                 TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
@@ -589,70 +841,1720 @@
             TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
         }
 
-        #endregion 淇濆瓨姘村姏淇℃伅
+        #endregion
 
-        #region 鏋勪欢鏄庣粏
+        #region 鎵归噺閰嶇疆
 
-        //鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroParterListCtrl _parterListCtrl = null;
-
-        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroParterListCtrl GetParterListCtrl()
+        //娉ㄥ唽鎵归噺閰嶇疆浜嬩欢
+        private void RegistBulkSetEvents()
         {
-            if (_parterListCtrl == null)
+            //姘村簱
+            this.barBtnSetReservoirList.ItemClick += delegate
             {
-                _parterListCtrl = new HydroParterListCtrl();
-                _parterListCtrl.Dock = DockStyle.Fill;
-                _parterListCtrl.HydroClickEvent += async (parter) =>
+                //var dlg = new HydroReservoirBulkSetListDlg();
+                //dlg.ShowDialog();
+            };
+            //姘存睜
+            this.barBtnSetTankList.ItemClick += delegate
+            {
+                //var dlg = new HydroTankBulkSetListDlg();
+                //dlg.ShowDialog();
+            };
+            //姘寸
+            this.barBtnSetWaterboxList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroWaterboxListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //杩炴帴鑺傜偣
+            this.barBtnSetJunctionList.ItemClick += delegate
+            {
+                //var dlg = new HydroJunctionBulkSetListDlg();
+                //dlg.ShowDialog();
+            };
+            //闂峰ご
+            this.barBtnSetBluntheadList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroBluntheadListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //寮ご
+            this.barBtnSetElbowsList.ItemClick += delegate
+            {
+                //if (_hydroInfo == null)
+                //{
+                //    return;
+                //}
+                //var dlg = new SetHydroElbowListDlg();
+                //dlg.SetBindingData(_hydroInfo);
+                //dlg.HydroClickEvent += async (obj) =>
+                //{
+                //    if (obj == null)
+                //    {
+                //        return;
+                //    }
+                //    _selectedParter = obj;
+                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                //    ShowProperty();
+                //};
+                //dlg.HydroChangedEvent += (obj) =>
+                //{
+
+                //};
+                //dlg.ShowDialog();
+            };
+            //涓夐��
+            this.barBtnSetThreelinkList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == parter.Code);
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _parter.Code });
-                    ShowProperty();
-                    SetBimfaceLinkColor();
-                };
-            }
-            return _parterListCtrl;
+                    return;
+                }
+                var dlg = new SetHydroThreelinkListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //鍥涢��
+            this.barBtnSetFourlinkList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroFourlinkListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //姘磋〃
+            this.barBtnSetMeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroMeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //娴侀噺璁�
+            this.barBtnSetFlowmeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroFlowmeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //鍘嬪姏琛�
+            this.barBtnSetPressmeterList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPressmeterListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //绠¢亾
+            this.barBtnSetPipeList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPipeListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //姘存车
+            this.barBtnSetPumpList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroPumpListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //闃�闂�
+            this.barBtnSetValveList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new SetHydroValveListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
         }
 
-        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowParterListCtrl()
+
+        //鏄剧ずRadialMenu
+        private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            this.rmSet.ShowPopup(MousePosition, true);
+        }
+
+        //寮瑰嚭鍓�
+        private void rmSet_BeforePopup(object sender, CancelEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                e.Cancel = true;
+                return;
+            }
+            //姘村簱
+            if (_hydroInfo.Reservoirs == null || _hydroInfo.Reservoirs.Count < 1)
+            {
+                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘存睜
+            if (_hydroInfo.Tanks == null || _hydroInfo.Tanks.Count < 1)
+            {
+                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘寸
+            if (_hydroInfo.Waterboxs == null || _hydroInfo.Waterboxs.Count < 1)
+            {
+                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //杩炴帴鑺傜偣
+            if (_hydroInfo.Junctions == null || _hydroInfo.Junctions.Count < 1)
+            {
+                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍠峰槾
+            if (_hydroInfo.Nozzles == null || _hydroInfo.Nozzles.Count < 1)
+            {
+                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //娑堢伀鏍�
+            if (_hydroInfo.Hydrants == null || _hydroInfo.Hydrants.Count < 1)
+            {
+                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //闂峰ご
+            if (_hydroInfo.Bluntheads == null || _hydroInfo.Bluntheads.Count < 1)
+            {
+                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //寮ご
+            if (_hydroInfo.Elbows == null || _hydroInfo.Elbows.Count < 1)
+            {
+                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //涓夐��
+            if (_hydroInfo.Threelinks == null || _hydroInfo.Threelinks.Count < 1)
+            {
+                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍥涢��
+            if (_hydroInfo.Fourlinks == null || _hydroInfo.Fourlinks.Count < 1)
+            {
+                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘磋〃
+            if (_hydroInfo.Meters == null || _hydroInfo.Meters.Count < 1)
+            {
+                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //娴侀噺璁�
+            if (_hydroInfo.Flowmeters == null || _hydroInfo.Flowmeters.Count < 1)
+            {
+                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍘嬪姏琛�
+            if (_hydroInfo.Pressmeters == null || _hydroInfo.Pressmeters.Count < 1)
+            {
+                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //绠¢亾
+            if (_hydroInfo.Pipes == null || _hydroInfo.Pipes.Count < 1)
+            {
+                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //杩囨浮浠�
+            if (_hydroInfo.Translations == null || _hydroInfo.Translations.Count < 1)
+            {
+                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鎹㈢儹鍣�
+            if (_hydroInfo.Exchangers == null || _hydroInfo.Exchangers.Count < 1)
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //绌哄帇鏈�
+            if (_hydroInfo.Compressors == null || _hydroInfo.Compressors.Count < 1)
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘存车
+            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
+            {
+                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //闃�闂�
+            if (_hydroInfo.Valves == null || _hydroInfo.Valves.Count < 1)
+            {
+                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+        }
+
+        #endregion
+
+        #region 骞惰仈鍒嗘瀽
+
+        //骞惰仈鍒嗘瀽
+        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var parterListCtrl = GetParterListCtrl();
-            parterListCtrl.SetBindingData(_hydroInfo, GetAllCalcuResult());
+            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 HydroVisualSearchListCtrl _searchCtrl = null;
+
+        //鑾峰彇鏌ヨ缁勪欢
+        private HydroVisualSearchListCtrl GetSearchCtrl()
+        {
+            if (_searchCtrl == null)
+            {
+                _searchCtrl = new HydroVisualSearchListCtrl();
+                _searchCtrl.Dock = DockStyle.Fill;
+                var allVisualViewModelList = GetVisualViewModelList();
+                _searchCtrl.InitialData(allVisualViewModelList);
+                _searchCtrl.HydroClickInfoEvent += async (visual) =>
+                {
+                    ShowSelectedProperty(visual);
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                };
+                _searchCtrl.HydroSearchInfoEvent += async (list) =>
+                {
+                    var elementIds = new List<string>();
+                    if (list != null && list.Count > 0)
+                    {
+                        _selectedVisual = list.First();
+                        list.ForEach(x => elementIds.Add(x.Code));
+                    }
+                    else
+                    {
+                        _selectedVisual = null;
+                    }
+                    ShowSelectedProperty();
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
+                };
+            }
+            return _searchCtrl;
+        }
+
+        //鏌ヨ鎺т欢鏄惁鍙
+        private bool IsSearchCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroVisualSearchListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず鏌ヨ鎺т欢
+        private void ShowSearchCtrl(string content)
+        {
+            if (IsSearchCtrlVisible)
+            {
+                return;
+            }
+            var searchCtrl = GetSearchCtrl();
+            searchCtrl.SetBindingData(content);
             this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(parterListCtrl);
+            this.controlContainerBottom.Controls.Add(searchCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "鏋勪欢鏌ヨ";
+            this.docPnlBottom.Height = 350;
+        }
+
+        //鏄剧ず鏌ヨ绐椾綋
+        private void ShowSearchDlg()
+        {
+            if (IsSearchCtrlVisible)
+            {
+                return;
+            }
+            var dlg = new InputHydroVisualSearchListDlg();
+            dlg.SearchEvent += (content) =>
+            {
+                if (string.IsNullOrEmpty(content))
+                {
+                    return;
+                }
+                ShowSearchCtrl(content);
+            };
+            dlg.SetBindingData();
+            dlg.ShowDialog();
+        }
+
+        //鏌ヨ
+        private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowSearchDlg();
+        }
+
+        #endregion
+
+        #region 妯″瀷鏍囨敞
+
+        #region 鏍囨敞璁剧疆
+
+        //鎵�鏈夋爣娉ㄨ缃垪琛�
+        private List<HydroMarkSetViewModel> _allMarkSetList = null;
+
+        //鑾峰彇鏍囨敞璁剧疆鍒楄〃
+        private List<HydroMarkSetViewModel> GetMarkSetList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allMarkSetList == null)
+            {
+                _allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
+            }
+            return _allMarkSetList;
+        }
+
+        #endregion
+
+        #region 鏍囨敞缁撴灉
+
+        //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
+        private List<HydroMarkResultViewModel> _allMarkResultList = null;
+
+        //鑾峰彇鏍囨敞缁撴灉鍒楄〃
+        //UseCache 鏄惁浣跨敤缂撳瓨
+        private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (!useCache)
+            {
+                var allSetList = GetMarkSetList();
+                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
+            }
+            if (_allMarkResultList == null)
+            {
+                var allSetList = GetMarkSetList();
+                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
+            }
+            return _allMarkResultList;
+        }
+
+        #endregion
+
+        #region 鏍囨敞鏄剧ず
+
+        //鏍囨敞鏄惁鏄剧ず
+        private bool _isMarkVisible = false;
+
+        //鏇存柊鏍囨敞
+        private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
+        {
+            var allSetList = GetMarkSetList();
+            var result = HydroMarkHelper.GetResult(visual, allSetList);
+            if (result == null)
+            {
+                return;
+            }
+            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 ShowSetMarkDlg()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allMarkSetList = GetMarkSetList();
+            var dlg = new SetHydroMarkDlg();
+            dlg.SetBindingData(allMarkSetList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                _allMarkSetList = list;
+                ApplyMarkList(false);
+            };
+            dlg.ShowDialog();
+        }
+
+        //璁剧疆鏍囨敞
+        private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowSetMarkDlg();
+        }
+
+        //鏄惁鏄剧ず
+        private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _isMarkVisible = this.barCkMark.Checked;
+            ApplyMarkList(true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region 棰滆壊鍒嗙骇
+
+        #region 棰滆壊閰嶇疆
+
+        //鎵�鏈夐鑹插垎绾ч厤缃垪琛�
+        private List<HydroGradingVmo> _allGradingList = null;
+
+        //鑾峰彇棰滆壊鍒嗙骇閰嶇疆鍒楄〃
+        private async Task<List<HydroGradingVmo>> GetGradingList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allGradingList == null)
+            {
+                _allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
+            }
+            return _allGradingList;
+        }
+
+        //鏄剧ず棰滆壊鍒嗙骇绐椾綋
+        private async void ShowGradingDlg()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allGradingList = await GetGradingList();
+            var dlg = new SetHydroGradingTreeDlg();
+            dlg.SetBindingData(_hydroInfo, allGradingList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                _allGradingList = list;
+                ApplyGradingResultList(false);
+            };
+            dlg.ApplyDataEvent += (catalog, propName) =>
+            {
+                UpdateGradingApplyList(catalog, propName);
+                ApplyGradingResultList(false);
+            };
+            dlg.ShowDialog();
+        }
+
+        //閰嶇疆棰滆壊鍒嗙骇
+        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowGradingDlg();
+        }
+
+        #endregion
+
+        #region 搴旂敤鍒嗙骇
+
+        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
+
+        //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private List<HydroGradingApplyViewModel> GetGradingApplyList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allGradingApplyList == null)
+            {
+                _allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
+            }
+            return _allGradingApplyList;
+        }
+
+        //鏇存柊棰滆壊鍒嗙骇搴旂敤鍒楄〃
+        private void UpdateGradingApplyList(string catalog, string propName)
+        {
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return;
+            }
+            var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
+            if (apply == null)
+            {
+                return;
+            }
+            apply.PropName = propName;
+        }
+
+        //鏄剧ず棰滆壊鍒嗙骇搴旂敤绐椾綋
+        private void ShowGradingApplyDlg()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return;
+            }
+            var dlg = new ApplyHydroGradingDlg();
+            dlg.SetBindingData(allGradingApplyList);
+            dlg.ReloadDataEvent += (obj) =>
+            {
+                _allGradingApplyList = obj;
+                ApplyGradingResultList(false);
+            };
+            dlg.ShowDialog();
+        }
+
+        //搴旂敤棰滆壊鍒嗙骇
+        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowGradingApplyDlg();
+        }
+
+        #endregion
+
+        #region 搴旂敤缁撴灉
+
+        //鎵�鏈夐鑹插垎绾х粨鏋滃垪琛�
+        private List<HydroGradingResultViewModel> _allGradingResultList = null;
+
+        //鑾峰彇棰滆壊鍒嗙骇缁撴灉鍒楄〃
+        //UseCache鏄惁浣跨敤缂撳瓨
+        private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
+        {
+            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
+
+        #endregion
+
+        #region 浜哄伐鍒锋柊
+
+        //鍒锋柊
+        private async void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
+            {
+                if (_project == null)
+                {
+                    return;
+                }
+                if (_projectSite == null)
+                {
+                    return;
+                }
+                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
+                sw.Stop();
+                TimeSpan ts2 = sw.Elapsed;
+                Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
+                _selectedVisual = null;
+                await _bimfaceCtrl?.ZoomAndSelectComponents(null);
+                ShowSelectedProperty();
+                TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+            }
+        }
+
+        #endregion
+
+        #region 姘存祦鍔ㄧ敾
+
+        //姘存祦鍔ㄧ敾鏄惁鍙
+        private bool _isFlowEffectVisible = false;
+
+        //鎵�鏈夋按娴佸姩鐢诲垪琛�
+        private List<LogicFlowEffect> _allFlowEffectList = null;
+
+        //鑾峰彇娴佸悜鍒楄〃
+        private List<LogicFlowEffect> GetFlowEffectList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allFlowEffectList == null)
+            {
+                _allFlowEffectList = new List<LogicFlowEffect>();
+                var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                {
+                    foreach (var parter in _hydroInfo.Pipes)
+                    {
+                        var flowEffect = new LogicFlowEffect();
+                        _allFlowEffectList.Add(flowEffect);
+                        flowEffect.Id = parter.Code;
+                        flowEffect.Rotation = 90;
+                        flowEffect.SpeedX = 0.1;
+                        if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
+                        {
+                            flowEffect.SpeedX = 0;
+                        }
+                        else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
+                        {
+                            flowEffect.SpeedX = 0.1;
+                        }
+                        else
+                        {
+                            flowEffect.SpeedX = -0.1;
+                        }
+
+                        if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
+                        {
+                            flowEffect.SpeedY = 0;
+                        }
+                        else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
+                        {
+                            flowEffect.SpeedY = 0.1;
+                        }
+                        else
+                        {
+                            flowEffect.SpeedY = -0.1;
+                        }
+
+                        var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
+                        if (calcuResult != null)
+                        {
+                            if (calcuResult.CalcuVelocity < 0)
+                            {
+                                flowEffect.SpeedX = -flowEffect.SpeedX;
+                            }
+                        }
+                    }
+                }
+            }
+            return _allFlowEffectList;
+        }
+
+        //鍔犺浇姘存祦鍔ㄧ敾
+        private async void LoadFlowEffect()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allFlowEffectList = GetFlowEffectList();
+            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
+        }
+
+        //鍗歌浇姘存祦鍔ㄧ敾
+        private async void UnloadFlowEffect()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            await _bimfaceCtrl?.UnloadFlowEffect();
+        }
+
+        //璁剧疆姘村姏鍔ㄧ敾
+        private void SetFlowEffect()
+        {
+            if (_isFlowEffectVisible)
+            {
+                LoadFlowEffect();
+            }
+            else
+            {
+                UnloadFlowEffect();
+            }
+        }
+
+        //鏇存柊姘存祦鍔ㄧ敾
+        private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allFlowEffectList = GetFlowEffectList();
+            var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
+            if (flowEffect == null)
+            {
+                return;
+            }
+            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedX = 0;
+            }
+            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedX = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedX = -0.1;
+            }
+
+            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedY = 0;
+            }
+            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedY = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedY = -0.1;
+            }
+
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
+            if (calcuResult != null)
+            {
+                if (calcuResult.CalcuVelocity < 0)
+                {
+                    flowEffect.SpeedX = -flowEffect.SpeedX;
+                }
+            }
+            if (_isFlowEffectVisible)
+            {
+                await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
+            }
+        }
+
+        //姘存祦鍔ㄧ敾鏄惁鍙
+        private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _isFlowEffectVisible = this.barCkFlowEffect.Checked;
+            SetFlowEffect();
+        }
+
+        #endregion
+
+        #region 鏋勪欢鏄庣粏鎺т欢
+
+        //鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+
+        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+        {
+            if (_visualListCtrl == null)
+            {
+                _visualListCtrl = new HydroVisualListCtrl();
+                _visualListCtrl.Dock = DockStyle.Fill;
+                _visualListCtrl.HydroClickInfoEvent += async (visual) =>
+                {
+                    ShowSelectedProperty(visual);
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
+                };
+                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+                {
+                    UpdateMarkList(visualList);
+                    UpdateSelectedProperty();
+                    ApplyGradingResultList();
+                };
+            }
+            return _visualListCtrl;
+        }
+
+        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
+        private bool IsVisualListCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
+        private void ShowVisualListCtrl()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (IsVisualListCtrlVisible)
+            {
+                return;
+            }
+
+            var visualListCtrl = GetVisualListCtrl();
+            var allVisualViewModelList = GetVisualViewModelList();
+            visualListCtrl.SetBindingData(allVisualViewModelList);
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
+            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
+            {
+                visualListCtrl.SetNormalView();
+            }
+            else
+            {
+                visualListCtrl.SetCalcuView();
+            }
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(visualListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
             this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
             this.docPnlBottom.Height = 350;
         }
 
-        //鏋勪欢鏄庣粏
-        private void barBtnHydroParterList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏇存柊鏋勪欢鏄庣粏鎺т欢
+        private void UpdateVisualListCtrl()
         {
-            ShowParterListCtrl();
+            if (!IsVisualListCtrlVisible)
+            {
+                return;
+            }
+            _visualListCtrl?.UpdateBindingData();
         }
 
-        #endregion 鏋勪欢鏄庣粏
+        //鏋勪欢鏄庣粏
+        private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowVisualListCtrl();
+        }
 
-        #region INP瀵煎嚭
+        #endregion
 
-        //瀵煎嚭姘村姏INP鏂囦欢
-        private void barBtnHydroExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        #region 鐩戞祴鍒楄〃
+
+        #region 娴嬬偣鍒楄〃
+
+        //鎵�鏈夌洃娴嬬偣鍒楄〃
+        private List<HydroMonitorVmo> _allMonitorList = null;
+
+        //鑾峰彇鐩戞祴鐐瑰垪琛�
+        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 fileName = Yw.WinFrmUI.FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
+            if (string.IsNullOrEmpty(code))
+            {
+                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 鐩戞祴鍊煎垪琛�
+
+        //鎵�鏈夌洃娴嬪�煎垪琛�
+        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 HydroCheckResultCtrl();
+                _checkCtrl.Dock = DockStyle.Fill;
+                _checkCtrl.HydroClickEvent += async (code) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    var elementIds = new List<string>();
+                    if (string.IsNullOrEmpty(code))
+                    {
+                        this.SelectedVisual = null;
+                    }
+                    else
+                    {
+                        var allVisualViewModelList = GetVisualViewModelList();
+                        this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
+                        if (this.SelectedVisual != null)
+                        {
+                            elementIds.Add(this.SelectedVisual.Code);
+                        }
+                    }
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
+                    ShowSelectedProperty();
+                };
+            }
+            return _checkCtrl;
+        }
+
+        //鏄剧ず妫�鏌ユ帶浠�
+        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
+        private void ShowCheckCtrl(bool needCheckAgain = false)
+        {
+            var checkResult = GetCheckResult(needCheckAgain);
+            if (checkResult == null)
+            {
+                return;
+            }
+            var checkCtrl = GetCheckCtrl();
+            checkCtrl.SetBindingData(checkResult);
+            this.controlContainerBottom.Controls.Clear();
+            this.controlContainerBottom.Controls.Add(checkCtrl);
+            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
+            this.docPnlBottom.Height = 350;
+        }
+
+        //妫�鏌�
+        private void 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;
+            }
+            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;
@@ -663,468 +2565,390 @@
             TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
-        #endregion INP瀵煎嚭
+        #endregion
 
-        #region 閰嶇疆
+        #region 骞惰仈鍒嗘瀽
 
-        //鏄剧ずRadialMenu
-        private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            this.rmSet.ShowPopup(MousePosition, true);
-        }
-
-        #endregion 閰嶇疆
-
-        #region 鎬ц兘鏇茬嚎
-
-        //鎬ц兘鏇茬嚎
-        private void barBtnFeatCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //骞惰仈鍒嗘瀽
+        private void ParallelAnalysis()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            //if (_calcuResult == null)
-            //{
-            //    return;
-            //}
-            //if (!_calcuResult.Succeed)
-            //{
-            //    return;
-            //}
-            var pumps = _hydroInfo.Pumps?.Where(x => x.LinkStatus == Yw.Hydro.LinkStatus.Open).ToList();
-
-            var curve_list = _hydroInfo.Curves;
-            if (curve_list == null || !curve_list.Any())
+            var pumps = _hydroInfo.Pumps;
+            if (pumps == null || pumps.Count < 1)
             {
+                XtraMessageBox.Show("鏃犳按娉典俊鎭�");
                 return;
             }
-            var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
-            foreach (var x in pumps)
+            var vmList = new List<XhsSinglePumpViewModel>();
+            foreach (var pump in pumps)
             {
-                if (!x.RatedN.HasValue)
+                if (!pump.RatedN.HasValue)
                 {
                     continue;
                 }
-                var qh = curve_list.Find(t => t.Code == x.CurveQH)?.CurveData;
-                var qe = curve_list.Find(t => t.Code == x.CurveQE)?.CurveData;
-                var qp = curve_list.Find(t => t.Code == x.CurveQP)?.CurveData;
-
+                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 rated_speed = x.RatedN.Value;
-                var speed_ratio = x.SpeedRatio;
+                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 qh_pt_list = qh.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                var qe_pt_list = qe?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                var qp_pt_list = qp?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-
-                var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
-                vm.Id = x.Code;
-                vm.Name = x.Name;
-                //vm.IsBp = ;
-                vm.RatedSpeed = rated_speed;
-                vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio);
-                vm.CurrentHz = Math.Round(vm.CurrentSpeed / vm.RatedSpeed * 50, 1);
-
-                vm.Qh = new Yw.Geometry.CubicSpline2d(qh_pt_list);
-                vm.Qe = new Yw.Geometry.CubicSpline2d(qe_pt_list);
-                vm.Qp = new Yw.Geometry.CubicSpline2d(qp_pt_list);
+                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 HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
-            dlg.SetBindingData(vmList, null, true);
+            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 姘村姏璁$畻
+        #region 宸ュ喌璁$畻
 
-        //璁$畻鎺т欢
-        private SetHydroCalcuPrefixCtrl _calcuCtrl = null;
+        //鎵�鏈夊伐鍐靛厓缁勫垪琛�
+        private List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>> _allWorkingTupleList = new List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>();
 
-        //鑾峰彇璁$畻鎺т欢
-        private SetHydroCalcuPrefixCtrl GetCalcuCtrl()
+        //鏄剧ず宸ュ喌璁$畻绐椾綋
+        private void ShowWorkingCalcuDlg()
         {
-            if (_calcuCtrl == null)
+            var dlg = new SetHydroWorkingDlg();
+            dlg.HydroViewEvent += async (visual) =>
             {
-                _calcuCtrl = new SetHydroCalcuPrefixCtrl();
-                _calcuCtrl.Dock = DockStyle.Fill;
-                _calcuCtrl.InitialData(() => _hydroInfo);
-                _calcuCtrl.HydroViewEvent += async (parter) =>
-                {//姘村姏鏌ョ湅浜嬩欢
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { parter.Code });
-                };
-                _calcuCtrl.HydroCalcuEvent += async () =>
-                {//姘村姏璁$畻浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-
-                    //鏍¢獙
-                    _checkResult = _hydroInfo.Check();
-                    if (!_checkResult.Succeed)
-                    {
-                        ShowCheckCtrl();
-                        TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
-                        return;
-                    }
-
-                    var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-                    _calcuResult = netWork.Calcu();
-                    if (_calcuResult.Succeed)
-                    {
-                        this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-                        await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
-                        TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    }
-                    else
-                    {
-                        _calcuCtrl.SetFailedList(_calcuResult.FailedList);
-                        this.docPnlRight.Text = "澶辫触鍘熷洜";
-                        this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                        TipFormHelper.ShowError("璁$畻澶辫触");
-                    }
-                };
-            }
-            return _calcuCtrl;
-        }
-
-        //鑾峰彇璁$畻缁撴灉
-        private List<IHydroCalcuResult> GetAllCalcuResult()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_calcuResult == null)
-            {
-                return default;
-            }
-            if (!_calcuResult.Succeed)
-            {
-                return default;
-            }
-            var list = new List<IHydroCalcuResult>();
-
-            var allNodeList = _hydroInfo.GetAllNodes();
-            if (allNodeList != null && allNodeList.Count > 0)
-            {
-                var allCalcuNodeList = _calcuResult.NodeList;
-                if (allCalcuNodeList != null && allCalcuNodeList.Count > 0)
+                _selectedVisual = visual;
+                if (_selectedVisual != null)
                 {
-                    foreach (var node in allNodeList)
-                    {
-                        var calcuNode = allCalcuNodeList.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
-                            };
-                            list.Add(calcuResult);
-                        }
-                    }
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
                 }
-            }
-
-            var allListList = _hydroInfo.GetAllLinks();
-            if (allListList != null && allListList.Count > 0)
+                ShowSelectedProperty();
+            };
+            dlg.HydroCalcuEvent += async (working) =>
             {
-                var allCalcuLinkList = _calcuResult.LinkList;
-                if (allCalcuLinkList != null && allCalcuLinkList.Count > 0)
+                if (_hydroInfo == null)
                 {
-                    foreach (var link in allListList)
-                    {
-                        var calcuLink = allCalcuLinkList.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
-                            };
-                            list.Add(calcuResult);
-                        }
-                    }
+                    return;
                 }
-            }
+                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);
 
-            return list;
+                _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)
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var calcuPrefixCtrl = GetCalcuCtrl();
-            calcuPrefixCtrl.SetBindingData();
-            this.controlContainerRight.Controls.Clear();
-            this.controlContainerRight.Controls.Add(calcuPrefixCtrl);
-            this.docPnlRight.Text = "鍓嶆彁鏉′欢";
-            this.docPnlRight.Width = SetHydroCalcuPrefixCtrl.ControlMinWidth;
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            ShowWorkingCalcuDlg();
         }
 
         #endregion
 
-        #region 鏋勪欢鏌ヨ
+        #region 褰撳墠宸ュ喌
 
-        //鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl _searchCtrl = null;
+        //褰撳墠宸ュ喌
+        private Yw.Vmo.HydroWorkingVmo _currentWorking = null;
 
-        //鑾峰彇鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl GetSearchCtrl()
+        //鍒濆鍖栧綋鍓嶅伐鍐�
+        private void InitialCurrentWorking(List<HydroWorkingVmo> allWorkingList)
         {
-            if (_searchCtrl == null)
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Clear();
+            if (allWorkingList != null && allWorkingList.Count > 0)
             {
-                _searchCtrl = new XhsProjectSimulationSearchCtrl();
-                _searchCtrl.Dock = DockStyle.Fill;
-                _searchCtrl.InitialData(() => _hydroInfo);
-                _searchCtrl.ApplySearchEvent += async (list) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var elementIds = new List<string>();
-                    if (list != null && list.Count > 0)
-                    {
-                        var first = list.First();
-                        var allParterList = _hydroInfo.GetAllParters();
-                        _parter = allParterList?.Find(x => x.Code == first.Code);
-                        list.ForEach(x => elementIds.Add(x.Code));
-                    }
-                    else
-                    {
-                        _parter = null;
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowProperty();
-                    SetBimfaceLinkColor();
-                };
+                allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
+                this.barEditCurrentWorking.EditValue = allWorkingList.Last();
             }
-            return _searchCtrl;
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
         }
 
-        //鏄剧ず鏌ヨ鎺т欢
-        private void ShowSearchCtrl()
+        //澧炲姞褰撳墠宸ュ喌
+        private void AppendCurrentWorking(HydroWorkingVmo working)
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var searchCtrl = GetSearchCtrl();
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(searchCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏋勪欢鏌ヨ";
-            this.docPnlBottom.Height = 350;
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+            this.barEditCurrentWorking.EditValue = working;
         }
 
-        //鏌ヨ
-        private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璁剧疆褰撳墠宸ュ喌
+        private void SetCurrentWorking(HydroWorkingVmo working)
         {
-            ShowSearchCtrl();
+            _currentWorking = working;
+        }
+
+        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
+        private void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
+        {
+            var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
+            SetCurrentWorking(working);
+        }
+
+
+        #endregion
+
+        #region 宸ュ喌鍒楄〃
+
+        //鎵�鏈夊伐鍐靛垪琛�
+        private List<HydroWorkingVmo> _allWorkingList = null;
+
+        //鍒濆鍖栧伐鍐靛垪琛�
+        private async void InitialWorkingList()
+        {
+            _allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(_hydroInfo.ID);
+            if (_allWorkingList == null)
+            {
+                _allWorkingList = new List<HydroWorkingVmo>();
+            }
+        }
+
+
+
+        ////鑾峰彇灞炴�ф帶浠�
+        //private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+        //{
+        //    if (_propertyCtrl == null)
+        //    {
+        //        _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
+        //        _propertyCtrl.Dock = DockStyle.Fill;
+        //        _propertyCtrl.HydroViewEvent += (visual) =>
+        //        {
+        //            if (visual == null)
+        //            {
+        //                return;
+        //            }
+        //            _bimfaceCtrl?.ZoomToComponent(visual.Code);
+        //        };
+        //        _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
+        //        { //寮鸿皟杩炴帴鑺傜偣
+        //            if (_hydroInfo == null)
+        //            {
+        //                return;
+        //            }
+        //            if (link == null)
+        //            {
+        //                return;
+        //            }
+        //            if (string.IsNullOrEmpty(linkNodeCode))
+        //            {
+        //                return;
+        //            }
+        //            var linkNode = GetVisual(linkNodeCode);
+        //            if (linkNode == null)
+        //            {
+        //                return;
+        //            }
+        //            var blinkCodes = new List<string>();
+        //            if (linkNode.GetType() == typeof(HydroJunctionInfo))
+        //            {
+        //                var allLinkList = GetLinkList();
+        //                if (allLinkList == null || allLinkList.Count < 1)
+        //                {
+        //                    return;
+        //                }
+        //                var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
+        //                if (linkList == null || linkList.Count < 1)
+        //                {
+        //                    return;
+        //                }
+        //                blinkCodes.AddRange(linkList.Select(x => x.Code));
+        //            }
+        //            else
+        //            {
+        //                blinkCodes.Add(linkNodeCode);
+        //            }
+
+        //            await _bimfaceCtrl?.ClearBlinkComponents();
+        //            await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
+        //            await Task.Delay(5000);
+        //            await _bimfaceCtrl?.ClearBlinkComponents();
+        //        };
+        //        _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+        //        {
+        //            if (visual == null)
+        //            {
+        //                return;
+        //            }
+        //            UpdateVisualListCtrl();
+        //            //ApplyGradingResultList(visual);
+        //        };
+        //        _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+        //        {
+        //            //鏍囨敞灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+        //            //UpdateMark(visual);
+        //        };
+        //        _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+        //        {
+        //            //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+        //        };
+        //        _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
+        //        {
+        //            //娴佸悜灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
+        //            //UpdateFlowEffect(visual);
+        //        };
+
+        //    }
+        //    return _propertyCtrl;
+        //}
+
+        ////灞炴�ф帶浠舵槸鍚﹀彲瑙�
+        //private bool IsPropertyCtrlVisible
+        //{
+        //    get
+        //    {
+        //        if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+        //        {
+        //            if (this.controlContainerRight.Controls.Count > 0)
+        //            {
+        //                if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+        //                {
+        //                    return true;
+        //                }
+        //            }
+        //        }
+        //        return false;
+        //    }
+        //}
+
+        ////鏄剧ず灞炴�ф帶浠�
+        //private void ShowPropertyCtrl()
+        //{
+        //    if (IsPropertyCtrlVisible)
+        //    {
+        //        return;
+        //    }
+        //    var propertyCtrl = GetPropertyCtrl();
+        //    this.controlContainerRight.Controls.Clear();
+        //    this.controlContainerRight.Controls.Add(propertyCtrl);
+        //    this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+        //    this.docPnlRight.Text = "灞炴��";
+        //    this.docPnlRight.Width = 300;
+        //}
+
+        private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+
         }
 
         #endregion
 
-        #region 妯″瀷鏍囨敞
+        #region 宸ュ喌鎺т欢
 
-        //鎵�鏈夋爣娉ㄥ垪琛�
-        private List<HydroMarkSetViewModel> _allMarkList = null;
+        //宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl _workingCtrl = null;
 
-        //鏄剧ず鏍囨敞绐椾綋
-        private async void ShowMarkDlg()
+        //鑾峰彇宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl GetWorkingCtrl()
         {
-            if (_hydroInfo == null)
+            if (_workingCtrl == null)
             {
-                return;
+                _workingCtrl = new HydroWorkingTreeCtrl();
+                _workingCtrl.Dock = DockStyle.Fill;
             }
-            if (_allMarkList == null)
-            {
-                _allMarkList = new List<HydroMarkSetViewModel>();
-                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Waterbox,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Waterbox),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pump),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Valve),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pipe),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
-                {
-                    _allMarkList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Nozzle),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-            }
-            var dlg = new SetHydroMarkDlg();
-            dlg.InitialData(() => _hydroInfo);
-            dlg.SetBindingData(_allMarkList);
-            dlg.ReloadDataEvent += async (allResultList) =>
-            {
-                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text)).ToList();
-                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
-            };
-            if (dlg.ShowDialog() != DialogResult.OK)
-            {
-                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
-            }
-        }
-
-        //璁剧疆鏍囨敞
-        private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowMarkDlg();
+            return _workingCtrl;
         }
 
         #endregion
 
-        #region 棰滆壊鍒嗙骇
 
-        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-        private List<string> _allGradingCodeList = null;
-
-        //璁剧疆
-        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var dlg = new SetHydroGradingModelDlg();
-            dlg.SetBindingData(_hydroInfo.ID);
-            dlg.ShowDialog();
-        }
-
-        //搴旂敤
-        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_allGradingApplyList == null)
-            {
-                _allGradingApplyList = new List<HydroGradingApplyViewModel>();
-                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Waterbox,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Waterbox),
-                        PropName = string.Empty
-                    });
-                }
-                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pump),
-                        PropName = string.Empty
-                    });
-                }
-                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Valve),
-                        PropName = string.Empty
-                    });
-                }
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pipe),
-                        PropName = string.Empty
-                    });
-                }
-                if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Nozzle),
-                        PropName = string.Empty
-                    });
-                }
-            }
-            var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(() => _hydroInfo, _allGradingApplyList, GetAllCalcuResult());
-            dlg.ReloadDataEvent += (obj) =>
-            {
-                _allGradingCodeList = obj?.Select(x => x.Code).Distinct().ToList();
-                var objGroupList = obj?.GroupBy(x => x.Color).ToList();
-                objGroupList.ForEach(async x =>
-                {
-                    await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
-                });
-            };
-            dlg.ShowDialog();
-        }
-
-        //鍙栨秷
-        private async void barBtnGradingCancel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            await _bimfaceCtrl?.RestoreComponentsColor(_allGradingCodeList);
-        }
-
-        #endregion
 
 
 

--
Gitblit v1.9.3