From 513c72dd3c97787b0845bcc8526e004da9e50e64 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 10 十二月 2024 12:02:47 +0800
Subject: [PATCH] 能耗分析整改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 4496 +++++++++++++++++++++--------------------------------------
 1 files changed, 1,637 insertions(+), 2,859 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 7359ca3..3daca48 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,19 +1,16 @@
-锘縢lobal using Yw.EPAnet;
+锘縰sing DevExpress.Diagram.Core.Native;
 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 DevExpress.Utils.MVVM;
+using DevExpress.XtraMap;
 using HStation.WinFrmUI.PhartRelation;
+using Mapster;
+using NPOI.SS.Formula.Functions;
 using System.Diagnostics;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
-using Yw.Pump;
+using Yw.EPAnet;
+using Yw.Hydro;
+using Yw.Model;
 using Yw.Vmo;
-using Yw.WinFrmUI.Bimface;
-using Yw.WinFrmUI.Hydro;
+using Yw.WinFrmUI.Q3d;
 
 namespace HStation.WinFrmUI
 {
@@ -28,39 +25,35 @@
             RegistBulkSetEvents();
         }
 
+        /// <summary>
+        /// 鏂板宸ュ喌浜嬩欢
+        /// </summary>
+        public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
+        private HStation.Vmo.XhsSchemeVmo _scheme = null;//鏂规
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
-
-
+        private Dictionary<HydroWorkingVmo, bool> _allWorkingCheckedListDict = null;//鎵�鏈夊伐鍐甸�夋嫨鍒楄〃瀛楀吀
 
         /// <summary>
         /// 缁戝畾鏁版嵁
         /// </summary>
-        public async Task SetBindingData
+        public void SetBindingData
             (
-                HStation.Vmo.XhsProjectVmo project,
-                HStation.Vmo.XhsProjectSiteVmo projectSite,
-                Yw.Model.HydroModelInfo hydroInfo
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                Yw.Model.HydroModelInfo hydroInfo,
+                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
             )
         {
-            if (project == null)
-            {
-                return;
-            }
             _project = project;
             _projectSite = projectSite;
+            _scheme = scheme;
             _hydroInfo = hydroInfo;
-            if (_projectSite == null)
-            {
-                _projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(_project.ID);
-            }
-            if (_hydroInfo == null)
-            {
-                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
-                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
-            }
+            _allWorkingCheckedListDict = allWorkingCheckedListDict;
+            ResetMonitorValue();
         }
 
         /// <summary>
@@ -69,47 +62,40 @@
         public override void InitialDataSource()
         {
             base.InitialDataSource();
-            if (_project == null)
-            {
-                return;
-            }
-            this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
             ShowBimfaceCtrl();
             ShowQ3dCtrl();
             ShowPropertyCtrl();
-
         }
 
-
-        #region Bimface
+        #region BIM鎺т欢
 
         //bimface鎺т欢
-        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
+        private SimulationBimfaceCtrl _bimfaceCtrl = null;
 
         //鑾峰彇 bimface 鎺т欢
-        private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
+        private async Task<SimulationBimfaceCtrl> GetBimfaceCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_bimfaceCtrl == null)
             {
-                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
+                var overlay = this.ShowOverlay();
+                _bimfaceCtrl = new SimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                await _bimfaceCtrl.InitialData(_project, _projectSite);
                 _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    ApplyGrading();
+                    overlay.Close();
+                    this.barCkDecorator.Checked = false;
+                    this.barCkGrading.Checked = true;
                 };
-                _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
+                _bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    _selectedVisual = obj;
-                    ShowSelectedProperty();
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eVisualSource.Bimface);
                 };
             }
             return _bimfaceCtrl;
@@ -123,14 +109,9 @@
             this.tabPageBimface.Controls.Add(bimfaceCtrl);
         }
 
-        private void SelectBimfaceParter()
-        {
-
-        }
-
         #endregion
 
-        #region Q3d
+        #region Q3d鎺т欢
 
         //Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
@@ -138,20 +119,20 @@
         //鑾峰彇 Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_q3dCtrl == null)
             {
                 _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                 _q3dCtrl.Dock = DockStyle.Fill;
                 _q3dCtrl.InitialData(() => _hydroInfo);
-                _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
+                _q3dCtrl.SelectedPartersChangedEvent += (codes) =>
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
-                    ShowSelectedProperty();
+                    var visualListHelper = GetVisualListHelper();
+                    var visuals = visualListHelper.GetVisualList(codes);
+                    SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
                 };
             }
             return _q3dCtrl;
@@ -170,49 +151,45 @@
         #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
+        private SimulationPropertyCtrl _propertyCtrl = null;
 
         //鑾峰彇灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+        private SimulationPropertyCtrl GetPropertyCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_propertyCtrl == null)
             {
-                _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
+                _propertyCtrl = new SimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
-                _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
-                { //寮鸿皟杩炴帴缁勪欢
-                    if (string.IsNullOrEmpty(code))
+                _propertyCtrl.AllowEdit = true;
+                _propertyCtrl.HydroViewEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Property);
+                };
+                _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
+                { //寮鸿皟杩炴帴鑺傜偣
+                    if (link == null)
                     {
                         return;
                     }
-                    if (string.IsNullOrEmpty(linkCode))
-                    {
-                        return;
-                    }
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allVisualList = _hydroInfo.GetAllVisuals();
-                    if (allVisualList == null || allVisualList.Count < 1)
-                    {
-                        return;
-                    }
-                    var linkParter = allVisualList.Find(x => x.Code == linkCode);
-                    if (linkParter == null)
+                    var visualListHelper = GetVisualListHelper();
+                    var linkNode = visualListHelper.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 = visualListHelper.GetLinkList();
                         if (allLinkList == null || allLinkList.Count < 1)
                         {
                             return;
                         }
-                        var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code || x.EndCode == linkParter.Code) && x.Code != code).ToList();
+                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
                         if (linkList == null || linkList.Count < 1)
                         {
                             return;
@@ -221,47 +198,44 @@
                     }
                     else
                     {
-                        blinkCodes.Add(linkCode);
+                        blinkCodes.Add(linkNodeCode);
                     }
 
+                    await _bimfaceCtrl?.ClearBlinkComponents();
                     await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
-
-                _propertyCtrl.ViewParterEvent += (parter) =>
+                _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
                 {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    _bimfaceCtrl?.ZoomToComponent(parter.Code);
-                };
-                _propertyCtrl.PropertyValueChangedEvent += (parter) =>
-                {
-                    if (parter == null)
+                    if (visual == null)
                     {
                         return;
                     }
                     UpdateVisualListCtrl();
-                    AutoApplyGrading();
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set();
                 };
-                _propertyCtrl.MarkPropertyValueChangedEvent += (parter) =>
+                _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
                 {
                     //鏍囨敞灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+                    var markHelper = await GetMarkHelper();
+                    markHelper.Set(visual);
                 };
-                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
                 {
                     //鍒嗙骇灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set(visual);
                 };
-                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (parter) =>
+                _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
                 {
                     //娴佸悜灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    UpdateFlowEffect(parter);
-                    //await _bimfaceCtrl?.UnloadFlowEffectById(parter.Code);
+                    var flowEffectHelper = await GetFlowEffectHelper();
+                    flowEffectHelper.Set(visual);
                 };
 
             }
@@ -277,7 +251,7 @@
                 {
                     if (this.controlContainerRight.Controls.Count > 0)
                     {
-                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+                        if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
                         {
                             return true;
                         }
@@ -302,199 +276,385 @@
             this.docPnlRight.Width = 300;
         }
 
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty()
+        //璁剧疆灞炴�ф帶浠�
+        private void SetPropertyCtrl(HydroVisualInfo visual)
         {
-            ShowSelectedProperty(_selectedVisual);
-        }
-
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
             ShowPropertyCtrl();
-            _selectedVisual = visual;
-            if (_selectedVisual == null)
-            {
-                _propertyCtrl.SelectedObject = null;
-                return;
-            }
-            _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
+            var visualVmListHelper = GetVisualVmListHelper();
+            var vm = visualVmListHelper.GetVisual(visual);
+            _propertyCtrl.SelectedObject = vm;
+            _propertyCtrl.UpdateRows();
         }
 
-        //鏇存柊閫夋嫨灞炴��
-        private void UpdateSelectedProperty()
+        //鏇存柊灞炴�ф帶浠�
+        private void UpdatePropertyCtrl()
         {
-            if (!IsPropertyCtrlVisible)
-            {
-                return;
-            }
-            if (_selectedVisual == null)
-            {
-                return;
-            }
             _propertyCtrl?.UpdateRows();
         }
 
         #endregion
 
+        #region 閫夋嫨鏋勪欢
 
-
-        #region 鑷姩鍖归厤
-
-        //鑾峰彇鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl GetMatchingListCtrl()
+        //鍙鏉ユ簮
+        protected enum eVisualSource
         {
-            if (_matchingListCtrl == null)
-            {
-                _matchingListCtrl = new XhsProjectSimulationMatchingListCtrl();
-                _matchingListCtrl.Dock = DockStyle.Fill;
-                _matchingListCtrl.HydroClickEvent += async (code) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == code);
-                    var elementIds = new List<string>();
-                    if (_selectedVisual != null)
-                    {
-                        elementIds.Add(_selectedVisual.Code);
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
-                };
-                _matchingListCtrl.ApplyMatchingEvent += (output) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return false;
-                    }
-                    return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
-                };
-            }
-            return _matchingListCtrl;
+            None,
+            Bimface,
+            Q3d,
+            Property,
+            List,
+            Set,
+            Search,
+            Monitor,
+            Check,
+            Calcu,
+            Warning,
         }
 
-        //鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _visual = null;
 
-        //鑷姩鍖归厤
-        private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
         {
-            if (_hydroInfo == null)
+            _visual = visual;
+            switch (source)
             {
-                return;
+                case eVisualSource.None:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Bimface:
+                    {
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Q3d:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Property:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                    }
+                    break;
+                case eVisualSource.List:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Set:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Search:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Monitor:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Check:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Calcu:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                case eVisualSource.Warning:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitor.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+                default: break;
             }
-            this.controlContainerBottom.Controls.Clear();
-            var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
-            matchingListCtrl.SetBindingData(input);
-            this.controlContainerBottom.Controls.Add(matchingListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鍖归厤鍒楄〃";
-            this.docPnlBottom.Height = 350;
+        }
+
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(string code, eVisualSource source)
+        {
+            var visual = GetVisual(code);
+            SelectVisual(visual, source);
         }
 
         #endregion
 
-        #region 鏈尮閰嶅垪琛�
+        #region 鏋勪欢鏄庣粏
 
-        //鑾峰彇鏈尮閰嶅垪琛ㄦ帶浠�
-        private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
+        #region 鍙鍒楄〃
+
+        //鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper _visualListHelper = null;
+
+        //鑾峰彇鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper GetVisualListHelper()
         {
-            if (_unMatchingListCtrl == null)
+            if (_visualListHelper == null)
             {
-                _unMatchingListCtrl = new XhsProjectSimulationUnMatchingListCtrl();
-                _unMatchingListCtrl.Dock = DockStyle.Fill;
-                _unMatchingListCtrl.HydroClickEvent += async (parter) =>//琛岀偣鍑�
-                {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
-                    var elementIds = new List<string>() { parter.Code };
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
-                };
-                _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
-                {
-                    var codes = parters?.Select(x => x.Code).Distinct().ToList();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _selectedVisual = null;
-                    ShowSelectedProperty();
-                };
+                _visualListHelper = new SimulationVisualListHelper();
+                _visualListHelper.InitialData(_hydroInfo);
             }
-            return _unMatchingListCtrl;
+            return _visualListHelper;
         }
 
-        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//鏈尮閰嶅垪琛�
+        //鑾峰彇鍙鏋勪欢
+        private Yw.Model.HydroVisualInfo GetVisual(string code)
+        {
+            var helper = GetVisualListHelper();
+            var visual = helper.GetVisual(code);
+            return visual;
+        }
 
-        //鏈尮閰嶅垪琛�
-        private void barBtnUnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鑾峰彇鍙鍒楄〃
+        private List<Yw.Model.HydroVisualInfo> GetVisualList()
+        {
+            var helper = GetVisualListHelper();
+            return helper.GetVisualList();
+        }
+
+        //鑾峰彇姘存簮鍒楄〃
+        private List<Yw.Model.HydroSourceInfo> GetSourceList()
+        {
+            var helper = GetVisualListHelper();
+            return helper.GetSourceList();
+        }
+
+        #endregion
+
+        #region 瑙嗗浘鍒楄〃
+
+        //鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private SimulationVisualVmListHelper _visualVmListHelper = null;
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private SimulationVisualVmListHelper GetVisualVmListHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_visualVmListHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
+            }
+            return _visualVmListHelper;
+        }
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            var helper = GetVisualVmListHelper();
+            return helper.GetVisualList();
+        }
+
+        #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 += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.List);
+                };
+                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+                {
+                    SelectVisual(_visual, eVisualSource.List);
+                };
+            }
+            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;
             }
-            this.controlContainerBottom.Controls.Clear();
-            var unMatchingListCtrl = GetUnMatchingListCtrl();
-            unMatchingListCtrl.SetBindingData(_hydroInfo);
-            this.controlContainerBottom.Controls.Add(unMatchingListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏈尮閰嶅垪琛�";
-            this.docPnlBottom.Height = 350;
+            var visualListCtrl = GetVisualListCtrl();
+            if (!IsVisualListCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(visualListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+                this.docPnlBottom.Height = 350;
+            }
+            var visualVmListHelper = GetVisualVmListHelper();
+            var allVisualVmList = visualVmListHelper.GetVisualList();
+            visualListCtrl.SetBindingData(allVisualVmList);
+            var calcuResult = GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
+            {
+                visualListCtrl.SetCalcuView();
+            }
+            else
+            {
+                visualListCtrl.SetNormalView();
+            }
         }
+
+        //鏇存柊鏋勪欢鏄庣粏鎺т欢
+        private void UpdateVisualListCtrl()
+        {
+            if (!IsVisualListCtrlVisible)
+            {
+                return;
+            }
+            _visualListCtrl?.UpdateBindingData();
+            var calcuResult = GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
+            {
+                _visualListCtrl.SetCalcuView();
+            }
+            else
+            {
+                _visualListCtrl.SetNormalView();
+            }
+        }
+
+        //鏋勪欢鏄庣粏
+        private void barBtnVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowVisualListCtrl();
+        }
+
+        #endregion
+
+        #region 鏋勪欢鏄剧ず
+
+        //鏋勪欢鍙杈呭姪绫�
+        private SimulationVisualVisibleHelper _visualVisibleHelper = null;
+
+        //鑾峰彇鏋勪欢鍙杈呭姪绫�
+        private async Task<SimulationVisualVisibleHelper> GetVisualVisibleHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_visualVisibleHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _visualVisibleHelper = new SimulationVisualVisibleHelper(visualListHelper, bimfaceCtrl);
+                _visualVisibleHelper.InitialData(_hydroInfo);
+            }
+            return _visualVisibleHelper;
+        }
+
+        //璁剧疆鏋勪欢鍙鎬�
+        private async void SetVisualVisible()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var visualVisibleHelper = await GetVisualVisibleHelper();
+            var allVisibleList = visualVisibleHelper.Items;
+            var dlg = new SetHydroVisualVisibleDlg();
+            dlg.SetBindingData(allVisibleList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                visualVisibleHelper.Items = list;
+                visualVisibleHelper.Set();
+            };
+            dlg.ShowDialog();
+        }
+
+        //璁剧疆鏋勪欢鏄剧ず
+        private void barBtnSetVisualVisible_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            SetVisualVisible();
+        }
+
+        #endregion
 
         #endregion
 
         #region 涓�閿樉闅�
 
-        //鏄鹃殣缂栫爜鍒楄〃
-        private List<string> _fastShowHiddenCodeList = null;
-
-        //涓�閿樉闅�
-        private async void FastShowHidden()
+        //璁剧疆瑁呴グ浠跺彲瑙佹��
+        private async void SetDecoratorVisible(bool isDecoratorVisible)
         {
-            if (_hydroInfo == null)
+            var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
+            if (isDecoratorVisible)
             {
-                return;
-            }
-            if (_hydroInfo.Decorators == null || _hydroInfo.Decorators.Count < 1)
-            {
-                return;
-            }
-            if (_fastShowHiddenCodeList == null)
-            {
-                _fastShowHiddenCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
-                await _bimfaceCtrl?.HideComponents(_fastShowHiddenCodeList);
+                await _bimfaceCtrl?.ShowComponents(codes);
             }
             else
             {
-                await _bimfaceCtrl?.ShowComponents(_fastShowHiddenCodeList);
-                _fastShowHiddenCodeList = null;
+                await _bimfaceCtrl?.HideComponents(codes);
             }
         }
 
-        //瑙﹀彂涓�閿樉闅�
-        private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璁剧疆
+        private void barCkDecorator_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            FastShowHidden();
+            SetDecoratorVisible(this.barCkDecorator.Checked);
         }
 
-        #endregion
-
-
+        #endregion   
 
         #region 淇濆瓨淇℃伅
 
@@ -527,10 +687,6 @@
 
         #endregion
 
-
-
-
-
         #region 鎵归噺閰嶇疆
 
         //娉ㄥ唽鎵归噺閰嶇疆浜嬩欢
@@ -539,182 +695,290 @@
             //姘村簱
             this.barBtnSetReservoirList.ItemClick += delegate
             {
-                //var dlg = new HydroReservoirBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroReservoirListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //姘存睜
             this.barBtnSetTankList.ItemClick += delegate
             {
-                //var dlg = new HydroTankBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroTankListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                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();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroWaterboxListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //杩炴帴鑺傜偣
             this.barBtnSetJunctionList.ItemClick += delegate
             {
-                //var dlg = new HydroJunctionBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroJunctionListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                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();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroBluntheadListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                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();
+                var allVisualVmList = GetVisualViewModelList();
+                var dlg = new SetHydroElbowListDlg();
+                dlg.SetBindingData(allVisualVmList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //涓夐��
             this.barBtnSetThreelinkList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroThreelinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //鍥涢��
             this.barBtnSetFourlinkList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroFourlinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //姘磋〃
             this.barBtnSetMeterList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroMeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //娴侀噺璁�
             this.barBtnSetFlowmeterList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroFlowmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //鍘嬪姏琛�
             this.barBtnSetPressmeterList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroPressmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //绠¢亾
             this.barBtnSetPipeList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroPipeListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //杩囨浮浠�
+            this.barBtnSetTranslationList.ItemClick += delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroTranslationListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //姘存车
             this.barBtnSetPumpList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroPumpListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //闃�闂�
             this.barBtnSetValveList.ItemClick += delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
                 var dlg = new SetHydroValveListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鎹㈢儹鍣�
+            this.barBtnSetExchangerList.ItemClick += delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroExchangerListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鎹㈢儹鍣�
+            this.barBtnSetCompressorList.ItemClick += delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var dlg = new SetHydroCompressorListDlg();
+                dlg.SetBindingData(allVisualViewModelList);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
         }
@@ -884,26 +1148,6 @@
                 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)
             {
@@ -924,104 +1168,30 @@
                 this.barBtnSetValveList.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;
+            }
+
+
         }
 
         #endregion
-
-        #region 骞惰仈鍒嗘瀽
-
-        //骞惰仈鍒嗘瀽
-        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
-            {
-                return;
-            }
-            var allCalcuResultList = GetCalcuResultList();
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in _hydroInfo.Pumps)
-            {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
-                {
-                    var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    if (calcuResult != null)
-                    {
-                        if (calcuResult.CalcuFlow.HasValue)
-                        {
-                            vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
-                        }
-
-                        var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                        var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                        if (calcuResultStart != null && calcuResultEnd != null)
-                        {
-                            if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
-                            {
-                                vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            var dlg = new PumpParallelAnalyDlg();
-            dlg.SetBindingData(vmList);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                list?.ForEach(x =>
-                {
-                    var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
-                    if (pump != null)
-                    {
-                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
-                        pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
-                    }
-                });
-                ShowSelectedProperty();
-                return true;
-            };
-            dlg.ShowDialog();
-        }
-
-        #endregion
-
-
 
         #region 鏋勪欢鏌ヨ
 
@@ -1033,29 +1203,19 @@
         {
             if (_searchCtrl == null)
             {
+                var visualVmListHelper = GetVisualVmListHelper();
+                var allVisualVmList = visualVmListHelper.GetVisualList();
                 _searchCtrl = new HydroVisualSearchListCtrl();
                 _searchCtrl.Dock = DockStyle.Fill;
-                var allVisualViewModelList = GetVisualViewModelList();
-                _searchCtrl.InitialData(allVisualViewModelList);
-                _searchCtrl.HydroClickInfoEvent += async (visual) =>
+                _searchCtrl.InitialData(allVisualVmList);
+                _searchCtrl.HydroClickInfoEvent += (visual) =>
                 {
-                    ShowSelectedProperty(visual);
-                    await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                    SelectVisual(visual, eVisualSource.Check);
                 };
-                _searchCtrl.HydroSearchInfoEvent += async (list) =>
+                _searchCtrl.HydroSearchInfoEvent += (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);
+                    var visual = list?.FirstOrDefault();
+                    SelectVisual(visual, eVisualSource.Search);
                 };
             }
             return _searchCtrl;
@@ -1126,517 +1286,36 @@
 
         #region 妯″瀷鏍囨敞
 
-        //鎵�鏈夋爣娉ㄨ缃垪琛�
-        private List<HydroMarkSetViewModel> _allMarkSetList = null;
+        //鏍囨敞杈呭姪绫�
+        private SimulationMarkHelper _markHelper = null;
 
-        //鑾峰彇鏍囨敞璁剧疆鍒楄〃
-        private List<HydroMarkSetViewModel> GetMarkSetList()
+        //鑾峰彇鏍囨敞杈呭姪绫�
+        private async Task<SimulationMarkHelper> GetMarkHelper()
         {
-            if (_allMarkSetList == null)
+            if (_markHelper == null)
             {
-                _allMarkSetList = new List<HydroMarkSetViewModel>();
-                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Waterbox,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Waterbox),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
-                if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
-                {
-                    _allMarkSetList.Add(new HydroMarkSetViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle),
-                        MarkType = (int)eWaterboxMarkType.None
-                    });
-                }
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _markHelper = new SimulationMarkHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
-            return _allMarkSetList;
+            return _markHelper;
         }
 
-        //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
-        private List<HydroMarkResultViewModel> _allMarkResultList = null;
-
-        //鑾峰彇鏍囨敞缁撴灉鍒楄〃
-        private List<HydroMarkResultViewModel> GetMarkResultList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            _allMarkResultList = new List<HydroMarkResultViewModel>();
-            var allMarkSetList = GetMarkSetList();
-            foreach (var markSet in allMarkSetList)
-            {
-                switch (markSet.Code)
-                {
-                    case Yw.Hydro.ParterCatalog.Waterbox:
-                        {
-                            if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                            {
-                                switch ((eWaterboxMarkType)markSet.MarkType)
-                                {
-                                    case eWaterboxMarkType.None:
-                                        {
-
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.PoolElev:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"姹犲簳鏍囬珮:{Math.Round(t.PoolElev, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.InitLevel:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鍒濆姘翠綅:{Math.Round(t.InitLevel, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.MinLevel:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鏈�灏忔按浣�:{Math.Round(t.MinLevel, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.MaxLevel:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鏈�楂樻按浣�:{Math.Round(t.MaxLevel, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.DN:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鐩村緞:{Math.Round(t.DN, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eWaterboxMarkType.MinVol:
-                                        {
-                                            _hydroInfo.Waterboxs.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鏈�灏忓绉�:{Math.Round(t.MinVol, 1)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                        break;
-                    case Yw.Hydro.ParterCatalog.Pump:
-                        {
-                            if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                            {
-                                switch ((ePumpMarkType)markSet.MarkType)
-                                {
-                                    case ePumpMarkType.None:
-                                        {
-
-                                        }
-                                        break;
-                                    case ePumpMarkType.PumpStatus:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"寮�鏈虹姸鎬�:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.RatedP:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"棰濆畾鍔熺巼:{t.RatedP}kW"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.RatedQ:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"棰濆畾娴侀噺:{t.RatedQ}m鲁/h"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.RatedH:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"棰濆畾鎵▼:{t.RatedH}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.RatedN:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"棰濆畾杞��:{t.RatedN}r/min"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.RatedHz:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"棰濆畾棰戠巼:{t.RatedHz}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.CurrentN:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                if (t.RatedN.HasValue)
-                                                {
-                                                    _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                    {
-                                                        Code = t.Code,
-                                                        Text = $"璁惧畾杞��:{Math.Round(t.RatedN.Value * t.SpeedRatio, 1)}r/min"
-                                                    });
-                                                }
-                                            });
-                                        }
-                                        break;
-                                    case ePumpMarkType.CurrentHz:
-                                        {
-                                            _hydroInfo.Pumps.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"璁惧畾棰戠巼:{Math.Round(t.RatedHz * t.SpeedRatio, 1)}hz"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                        break;
-                    case Yw.Hydro.ParterCatalog.Valve:
-                        {
-                            if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                            {
-                                switch ((eValveMarkType)markSet.MarkType)
-                                {
-                                    case eValveMarkType.None:
-                                        {
-
-                                        }
-                                        break;
-                                    case eValveMarkType.ValveStatus:
-                                        {
-                                            _hydroInfo.Valves.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"闃�闂ㄧ姸鎬�:{HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eValveMarkType.ValveType:
-                                        {
-                                            _hydroInfo.Valves.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"闃�闂ㄧ被鍨�:{HydroValveTypeHelper.GetTypeName(t.ValveType)}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eValveMarkType.Diameter:
-                                        {
-                                            _hydroInfo.Valves.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鐩村緞:{t.Diameter}mm"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eValveMarkType.MinorLoss:
-                                        {
-                                            _hydroInfo.Valves.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"灞�闃荤郴鏁�:{t.MinorLoss}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                        break;
-                    case Yw.Hydro.ParterCatalog.Pipe:
-                        {
-                            if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                            {
-                                switch ((ePipeMarkType)markSet.MarkType)
-                                {
-                                    case ePipeMarkType.None:
-                                        {
-
-                                        }
-                                        break;
-                                    case ePipeMarkType.PipeStatus:
-                                        {
-                                            _hydroInfo.Pipes.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鐘舵��:{Yw.WinFrmUI.HydroLinkStatusHelper.GetStatusName(t.LinkStatus)}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePipeMarkType.Diameter:
-                                        {
-                                            _hydroInfo.Pipes.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鐩村緞:{t.Diameter}mm"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePipeMarkType.Length:
-                                        {
-                                            _hydroInfo.Pipes.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"闀垮害:{t.Length}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePipeMarkType.Roughness:
-                                        {
-                                            _hydroInfo.Pipes.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"绮楃硻绯绘暟:{t.Roughness}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case ePipeMarkType.MinorLoss:
-                                        {
-                                            _hydroInfo.Pipes.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"灞�闃荤郴鏁�:{t.MinorLoss}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                        break;
-                    case Yw.Hydro.ParterCatalog.Nozzle:
-                        {
-                            if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
-                            {
-                                switch ((eNozzleMarkType)markSet.MarkType)
-                                {
-                                    case eNozzleMarkType.None:
-                                        {
-
-                                        }
-                                        break;
-                                    case eNozzleMarkType.Elev:
-                                        {
-                                            _hydroInfo.Nozzles.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鏍囬珮:{Math.Round(t.Elev, 4)}m"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eNozzleMarkType.Demand:
-                                        {
-                                            _hydroInfo.Nozzles.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"闇�姘撮噺:{t.Demand}m鲁/h"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    case eNozzleMarkType.Coefficient:
-                                        {
-                                            _hydroInfo.Nozzles.ForEach(t =>
-                                            {
-                                                _allMarkResultList.Add(new HydroMarkResultViewModel()
-                                                {
-                                                    Code = t.Code,
-                                                    Text = $"鍠峰皠绯绘暟:{t.Coefficient}"
-                                                });
-                                            });
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                        break;
-                    default: break;
-                }
-            }
-            return _allMarkResultList;
-        }
-
-        //搴旂敤鏍囨敞缁撴灉鍒楄〃
-        private async Task ApplyMarkResultList()
-        {
-            var allMarkResultList = GetMarkResultList();
-            var leadLabels = allMarkResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, 100000)).ToList();
-            await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
-            TipFormHelper.ShowSucceed("鏍囨敞淇℃伅宸茶缃�");
-        }
-
-        //娓呴櫎鏍囨敞缁撴灉鍒楄〃
-        private async Task ClearMarkResultList()
-        {
-            if (_allMarkResultList == null || _allMarkResultList.Count < 1)
-            {
-                TipFormHelper.ShowWarn("灏氭湭璁剧疆鏍囨敞淇℃伅");
-                return;
-            }
-            _allMarkResultList = null;
-            await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
-            TipFormHelper.ShowSucceed("鏍囨敞淇℃伅宸叉竻闄�");
-        }
-
-        //鏄剧ず鏍囨敞璁剧疆绐椾綋
-        private void ShowMarkSetDlg()
+        //鏄剧ず鏍囨敞鍒楄〃
+        private async void ShowMarkList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allMarkSetList = GetMarkSetList();
+            var markHelper = await GetMarkHelper();
             var dlg = new SetHydroMarkDlg();
-            dlg.SetBindingData(allMarkSetList);
-            dlg.ReloadDataEvent += async (list) =>
+            dlg.SetBindingData(markHelper.Sets);
+            dlg.ReloadDataEvent += (list) =>
             {
-                _allMarkSetList = list;
-                await ApplyMarkResultList();
+                markHelper.Sets = list;
+                markHelper.Set();
             };
             dlg.ShowDialog();
         }
@@ -1644,954 +1323,98 @@
         //璁剧疆鏍囨敞
         private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowMarkSetDlg();
+            ShowMarkList();
         }
-
-        //娓呴櫎鏍囨敞
-        private async void barBtnClearMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            await ClearMarkResultList();
-        }
-
-
-        #region 鏍囨敞鏄剧ず
 
         //鏄惁鏄剧ず
-        private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-
+            var markHelper = await GetMarkHelper();
+            markHelper.Visible = this.barCkMark.Checked;
+            markHelper.Set();
         }
-
-        #endregion
 
         #endregion
 
         #region 棰滆壊鍒嗙骇
 
-        #region 棰滆壊閰嶇疆
+        //棰滆壊鍒嗙骇杈呭姪绫�
+        private SimulationGradingHelper _gradingHelper = null;
 
-        //鎵�鏈夊垎绾у垪琛�
-        private List<HydroGradingVmo> _allGradingList = null;
-
-        //鑾峰彇鍒嗙骇鍒楄〃
-        private async Task<List<HydroGradingVmo>> GetGradingList()
+        //鑾峰彇棰滆壊鍒嗙骇杈呭姪绫�
+        private async Task<SimulationGradingHelper> GetGradingHelper()
         {
-            if (_hydroInfo == null)
+            if (_gradingHelper == null)
             {
-                return default;
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
-            if (_allGradingList == null)
-            {
-                _allGradingList = await BLLFactory<Yw.BLL.HydroGrading>.Instance.GetByModelID(_hydroInfo.ID);
-                if (_allGradingList == null || _allGradingList.Count < 1)
-                {
-                    var config = Yw.Settings.HydroParasHelper.Hydro.Grading;
-                    if (config != null && config.Items != null && config.Items.Count > 0)
-                    {
-                        _allGradingList = new List<HydroGradingVmo>();
-                        config.Items.ForEach(x =>
-                        {
-                            var vmo = new HydroGradingVmo()
-                            {
-                                ModelID = _hydroInfo.ID,
-                                Catalog = x.Catalog,
-                                PropName = x.PropName,
-                                SetValue = x.SetValue,
-                                MinValue = x.MinValue,
-                                MaxValue = x.MaxValue,
-                                Color = x.Color,
-                                SortCode = config.Items.IndexOf(x)
-                            };
-                            _allGradingList.Add(vmo);
-                        });
-                    }
-                }
-            }
-            return _allGradingList;
+            return _gradingHelper;
         }
 
-        //鏄剧ず閰嶇疆棰滆壊鍒嗙骇绐椾綋
-        private async void ShowSetGradingDlg()
+        //璁剧疆棰滆壊鍒嗙骇鍒楄〃
+        private async void SetGradingList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allGradingList = await GetGradingList();
+            var gradingHelper = await GetGradingHelper();
+            var allGradingList = await gradingHelper.GetGradingList();
             var dlg = new SetHydroGradingTreeDlg();
             dlg.SetBindingData(_hydroInfo, allGradingList);
             dlg.ReloadDataEvent += (list) =>
             {
-                _allGradingList = list;
+                gradingHelper.SetGradingList(list);
+                gradingHelper.Set();
             };
             dlg.ApplyDataEvent += (catalog, propName) =>
             {
-                ApplyGrading(catalog, propName);
+                gradingHelper.UpdateApply(catalog, propName);
+                gradingHelper.Set();
             };
             dlg.ShowDialog();
         }
 
         //閰嶇疆棰滆壊鍒嗙骇
-        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnSetGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSetGradingDlg();
+            SetGradingList();
         }
 
-        #endregion
-
-        #region 搴旂敤鍒嗙骇
-
-        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> GetGradingApplyList()
-        {
-            if (_allGradingApplyList == null)
-            {
-                _allGradingApplyList = new List<HydroGradingApplyViewModel>();
-
-                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pump,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pump),
-                        PropName = Yw.Hydro.ParterProp.LinkStatus
-                    });
-                }
-                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Valve,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Valve),
-                        PropName = Yw.Hydro.ParterProp.LinkStatus
-                    });
-                }
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Pipe,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
-                        PropName = HydroVisualCalcuProp.CalcuFlow
-                    });
-                }
-            }
-            return _allGradingApplyList;
-        }
-
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-
-            //鎵�鏈夊垎绾у垪琛�
-            var allGradingList = await GetGradingList();
-            if (allGradingList == null || allGradingList.Count < 1)
-            {
-                return default;
-            }
-
-            //鎵�鏈夊垎绾у簲鐢ㄥ垪琛�
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return default;
-            }
-
-            //鎵�鏈夎绠楃粨鏋滃垪琛�
-            var allCalcuResultList = GetCalcuResultList();
-
-            //鎵�鏈夊簲鐢ㄧ粨鏋滃垪琛�
-            var allGradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
-            allGradingApplyList.ForEach(x =>
-            {
-                var allCatalogGradingList = allGradingList.Where(t => t.Catalog == x.Code).ToList();
-                if (allCatalogGradingList != null || allCatalogGradingList.Count > 0)
-                {
-                    switch (x.Code)
-                    {
-                        case Yw.Hydro.ParterCatalog.Pump:
-                            {
-                                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                                {
-                                    foreach (var pump in _hydroInfo.Pumps)
-                                    {
-                                        switch (x.PropName)
-                                        {
-                                            case Yw.Hydro.ParterProp.LinkStatus:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var grading = gradingList.Meet(pump.LinkStatus);
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pump.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            allGradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuFlow:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuFlow.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pump.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuVelocity:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pump.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuHeadLoss:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pump.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            default: break;
-                                        }
-                                    }
-                                }
-                            }
-                            break;
-                        case Yw.Hydro.ParterCatalog.Valve:
-                            {
-                                if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                                {
-                                    foreach (var valve in _hydroInfo.Valves)
-                                    {
-                                        switch (x.PropName)
-                                        {
-                                            case Yw.Hydro.ParterProp.LinkStatus:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var grading = gradingList.Meet(valve.LinkStatus);
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = valve.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            allGradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuFlow:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuFlow.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = valve.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuVelocity:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = valve.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuHeadLoss:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = valve.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            default: break;
-                                        }
-                                    }
-                                }
-                            }
-                            break;
-                        case Yw.Hydro.ParterCatalog.Pipe:
-                            {
-                                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                                {
-                                    foreach (var pipe in _hydroInfo.Pipes)
-                                    {
-                                        switch (x.PropName)
-                                        {
-                                            case HydroVisualCalcuProp.CalcuFlow:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuFlow.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pipe.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuVelocity:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pipe.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            case HydroVisualCalcuProp.CalcuHeadLoss:
-                                                {
-                                                    var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                                    if (gradingList != null && gradingList.Count > 0)
-                                                    {
-                                                        var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                        if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                        {
-                                                            if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                            {
-                                                                var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                                if (grading != null)
-                                                                {
-                                                                    var result = new HydroGradingApplyResultViewModel()
-                                                                    {
-                                                                        Code = pipe.Code,
-                                                                        Color = grading.Color
-                                                                    };
-                                                                    allGradingApplyResultList.Add(result);
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                                break;
-                                            default: break;
-                                        }
-                                    }
-                                }
-                            }
-                            break;
-                        default: break;
-                    }
-                }
-            });
-
-            return allGradingApplyResultList;
-        }
-
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList(string catalog, string propName)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-
-            //鎵�鏈夊垎绾у垪琛�
-            var allGradingList = await GetGradingList();
-            if (allGradingList == null || allGradingList.Count < 1)
-            {
-                return default;
-            }
-            var currentGradingList = allGradingList.Where(x => x.Catalog == catalog).ToList();
-            if (currentGradingList.Count < 1)
-            {
-                return default;
-            }
-
-            //鎵�鏈夊垎绾у簲鐢ㄥ垪琛�
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return default;
-            }
-
-            //褰撳墠鍒嗙骇搴旂敤
-            var gradingApply = allGradingApplyList.Find(x => x.Code == catalog);
-            if (gradingApply == null)
-            {
-                return default;
-            }
-            gradingApply.PropName = propName;
-
-            //鎵�鏈夎绠楃粨鏋�
-            var allCalcuResultList = GetCalcuResultList();
-
-            //搴旂敤缁撴灉鍒楄〃
-            var gradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
-
-            switch (catalog)
-            {
-                case Yw.Hydro.ParterCatalog.Pump:
-                    {
-                        if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
-                        {
-                            foreach (var pump in _hydroInfo.Pumps)
-                            {
-                                switch (propName)
-                                {
-                                    case Yw.Hydro.ParterProp.LinkStatus:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var grading = gradingList.Meet(pump.LinkStatus);
-                                                if (grading != null)
-                                                {
-                                                    var result = new HydroGradingApplyResultViewModel()
-                                                    {
-                                                        Code = pump.Code,
-                                                        Color = grading.Color
-                                                    };
-                                                    gradingApplyResultList.Add(result);
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuFlow:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuFlow.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pump.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuVelocity:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pump.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuHeadLoss:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pump.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case Yw.Hydro.ParterCatalog.Valve:
-                    {
-                        if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
-                        {
-                            foreach (var valve in _hydroInfo.Valves)
-                            {
-                                switch (propName)
-                                {
-                                    case Yw.Hydro.ParterProp.LinkStatus:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var grading = gradingList.Meet(valve.LinkStatus);
-                                                if (grading != null)
-                                                {
-                                                    var result = new HydroGradingApplyResultViewModel()
-                                                    {
-                                                        Code = valve.Code,
-                                                        Color = grading.Color
-                                                    };
-                                                    gradingApplyResultList.Add(result);
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuFlow:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuFlow.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = valve.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuVelocity:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = valve.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuHeadLoss:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = valve.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case Yw.Hydro.ParterCatalog.Pipe:
-                    {
-                        if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                        {
-                            foreach (var pipe in _hydroInfo.Pipes)
-                            {
-                                switch (propName)
-                                {
-                                    case HydroVisualCalcuProp.CalcuFlow:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuFlow.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pipe.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuVelocity:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pipe.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    case HydroVisualCalcuProp.CalcuHeadLoss:
-                                        {
-                                            var gradingList = currentGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
-                                            if (gradingList != null && gradingList.Count > 0)
-                                            {
-                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
-                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
-                                                {
-                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
-                                                    {
-                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
-                                                        if (grading != null)
-                                                        {
-                                                            var result = new HydroGradingApplyResultViewModel()
-                                                            {
-                                                                Code = pipe.Code,
-                                                                Color = grading.Color
-                                                            };
-                                                            gradingApplyResultList.Add(result);
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        break;
-                                    default: break;
-                                }
-                            }
-                        }
-                    }
-                    break;
-                default: break;
-            }
-
-            return gradingApplyResultList;
-        }
-
-        //棰滆壊鍒嗙骇鏄惁搴旂敤浜�
-        private bool _isGradingApply = false;
-        //棰滆壊鍒嗙骇搴旂敤缂栫爜鍒楄〃
-        private List<string> _allGradingApplyCodeList = null;
-
-        //搴旂敤棰滆壊鍒嗙骇
-        private async void ApplyGrading()
+        //搴旂敤棰滆壊鍒嗙骇鍒楄〃
+        private async void ApplyGradingList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            _isGradingApply = true;
-            var allGradingApplyResultList = await GetGradingApplyResultList();
-            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
-            {
-                CancelApplyGrading();
-                return;
-            }
-            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
-            objGroupList.ForEach(async x =>
-            {
-                await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
-            });
-            _allGradingApplyCodeList = allGradingApplyResultList.Select(x => x.Code).Distinct().ToList();
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇
-        private async void ApplyGrading(string catalog, string propName)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            _isGradingApply = true;
-            var allGradingApplyResultList = await GetGradingApplyResultList(catalog, propName);
-            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
-            {
-                return;
-            }
-            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
-            objGroupList.ForEach(async x =>
-            {
-                await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
-            });
-            var codeList = allGradingApplyResultList.Select(x => x.Code);
-            if (_allGradingApplyCodeList == null)
-            {
-                _allGradingApplyCodeList = new List<string>();
-            }
-            _allGradingApplyCodeList.AddRange(codeList);
-            _allGradingApplyCodeList = _allGradingApplyCodeList.Distinct().ToList();
-        }
-
-        //鑷姩搴旂敤棰滆壊鍒嗙骇
-        private void AutoApplyGrading()
-        {
-            if (!_isGradingApply)
-            {
-                return;
-            }
-            ApplyGrading();
-        }
-
-        //鍙栨秷搴旂敤棰滆壊鍒嗙骇
-        private async void CancelApplyGrading()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            _isGradingApply = false;
-            if (_allGradingApplyCodeList != null && _allGradingApplyCodeList.Count > 0)
-            {
-                await _bimfaceCtrl?.RestoreComponentsColor(_allGradingApplyCodeList);
-            }
-        }
-
-        //鏄剧ず搴旂敤棰滆壊鍒嗙骇绐椾綋
-        private void ShowApplyGradingDlg()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return;
-            }
+            var gradingHelper = await GetGradingHelper();
             var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(allGradingApplyList);
-            dlg.ReloadDataEvent += (obj) =>
+            dlg.SetBindingData(gradingHelper.Applies);
+            dlg.ReloadDataEvent += (list) =>
             {
-                _allGradingApplyList = obj;
-                ApplyGrading();
+                gradingHelper.Applies = list;
+                gradingHelper.Set();
             };
             dlg.ShowDialog();
         }
 
         //搴旂敤棰滆壊鍒嗙骇
-        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnApplyGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowApplyGradingDlg();
+            ApplyGradingList();
         }
 
-        //鍙栨秷搴旂敤鍒嗙骇
-        private void batBtnCancelGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //棰滆壊鍒嗙骇灞曠ず
+        private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            CancelApplyGrading();
+            var gradingHelper = await GetGradingHelper();
+            gradingHelper.Visible = this.barCkGrading.Checked;
+            gradingHelper.Set();
         }
-
-        #endregion
 
         #endregion
 
@@ -2618,10 +1441,13 @@
                 sw.Stop();
                 TimeSpan ts2 = sw.Elapsed;
                 Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-                _selectedVisual = null;
+                _visual = null;
                 await _bimfaceCtrl?.ZoomAndSelectComponents(null);
-                ShowSelectedProperty();
+                //ShowSelectedProperty();
                 TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+
+                var visualListHelper = GetVisualListHelper();
+                visualListHelper.InitialData(_hydroInfo);
             }
         }
 
@@ -2629,356 +1455,153 @@
 
         #region 姘存祦鍔ㄧ敾
 
-        //鎵�鏈夋祦鍚戝垪琛�
-        private List<LogicFlowEffect> _allFlowEffectList = null;
+        //姘存祦鍔ㄧ敾杈呭姪绫�
+        private SimulationFlowEffectHelper _flowEffectHelper = null;
 
-        //鑾峰彇娴佸悜鍒楄〃
-        private List<LogicFlowEffect> GetFlowEffectList()
+        //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
+        private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
         {
             if (_hydroInfo == null)
             {
                 return default;
             }
-            if (_allFlowEffectList == null)
+            if (_flowEffectHelper == null)
             {
-                _allFlowEffectList = new List<LogicFlowEffect>();
-                var allCalcuResultList = GetCalcuResultList();
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    foreach (var parter in _hydroInfo.Pipes)
-                    {
-                        var flowEffect = new LogicFlowEffect();
-                        _allFlowEffectList.Add(flowEffect);
-                        flowEffect.Id = parter.Code;
-                        flowEffect.Rotation = 90;
-                        flowEffect.SpeedX = 0.1;
-                        if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
-                        {
-                            flowEffect.SpeedX = 0;
-                        }
-                        else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
-                        {
-                            flowEffect.SpeedX = 0.1;
-                        }
-                        else
-                        {
-                            flowEffect.SpeedX = -0.1;
-                        }
-
-                        if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
-                        {
-                            flowEffect.SpeedY = 0;
-                        }
-                        else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
-                        {
-                            flowEffect.SpeedY = 0.1;
-                        }
-                        else
-                        {
-                            flowEffect.SpeedY = -0.1;
-                        }
-
-                        var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
-                        if (calcuResult != null)
-                        {
-                            if (calcuResult.CalcuVelocity < 0)
-                            {
-                                flowEffect.SpeedX = -flowEffect.SpeedX;
-                            }
-                        }
-                    }
-                }
+                var visualListHelper = GetVisualListHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
+                var calcuResult = GetCalcuResult();
+                _flowEffectHelper.InitialData(calcuResult);
             }
-            return _allFlowEffectList;
+            return _flowEffectHelper;
         }
 
-        /// <summary>
-        /// 鍔犺浇姘存祦鍔ㄧ敾
-        /// </summary>
-        private async void LoadFlowEffect()
+        //姘存祦鍔ㄧ敾鏄惁鍙
+        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_allFlowEffectList != null)
-            {
-                return;
-            }
-            var allFlowEffectList = GetFlowEffectList();
-            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
-        }
-
-        //鍗歌浇娴佸悜
-        private async void UnloadFlowEffect()
-        {
-            if (_allFlowEffectList == null)
-            {
-                return;
-            }
-            _allFlowEffectList = null;
-            await _bimfaceCtrl?.UnloadFlowEffect();
-        }
-
-        //鏇存柊姘存祦鍔ㄧ敾
-        private async void UpdateFlowEffect(Yw.Model.HydroParterInfo parter)
-        {
-            if (_allFlowEffectList == null)
-            {
-                return;
-            }
-            var visual = parter as Yw.Model.HydroVisualInfo;
-            if (visual == null)
-            {
-                return;
-            }
-            var flowEffect = _allFlowEffectList.Find(x => x.Id == parter.Code);
-            if (flowEffect == null)
-            {
-                return;
-            }
-            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedX = 0;
-            }
-            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedX = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedX = -0.1;
-            }
-
-            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedY = 0;
-            }
-            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedY = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedY = -0.1;
-            }
-
-            var allCalcuResultList = GetCalcuResultList();
-            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
-            if (calcuResult != null)
-            {
-                if (calcuResult.CalcuVelocity < 0)
-                {
-                    flowEffect.SpeedX = -flowEffect.SpeedX;
-                }
-            }
-            await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
-        }
-
-        //鍔犺浇娴佸悜
-        private void barBtnLoadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            LoadFlowEffect();
-        }
-
-        //鍗歌浇娴佸悜
-        private void barBtnUnloadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            UnloadFlowEffect();
-        }
-
-        private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-
+            var flowEffectHelper = await GetFlowEffectHelper();
+            flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
+            flowEffectHelper.Set();
         }
 
         #endregion
 
-        #region 閫夋嫨鏋勪欢
+        #region 鐩戞祴鍒楄〃
 
-        //閫夋嫨鏋勪欢
-        private Yw.Model.HydroVisualInfo _selectedVisual = null;
+        #region 鐩戞祴鐐�
 
-        //閫夋嫨鏋勪欢
-        private Yw.Model.HydroVisualInfo SelectedVisual
-        {
-            get { return _selectedVisual; }
-            set
-            {
-                _selectedVisual = value;
-                if (_selectedVisual == null)
-                {
-                    this.barBtnSetMonitor.Enabled = false;
-                }
-                else
-                {
-                    this.barBtnSetMonitor.Enabled = true;
-                }
-            }
-        }
+        //鐩戞祴鐐硅緟鍔╃被
+        private SimulationMonitorHelper _monitorHelper = null;
 
-        #endregion
-
-        #region 鏋勪欢鏄庣粏
-
-        #region 鏋勪欢鍒楄〃
-
-        //鎵�鏈夋瀯浠惰鍥惧垪琛�
-        private List<HydroVisualViewModel> _allVisualViewModelList = null;
-
-        //鑾峰彇鏋勪欢瑙嗗浘鍒楄〃
-        private List<HydroVisualViewModel> GetVisualViewModelList()
+        //鑾峰彇鐩戞祴鐐硅緟鍔╃被
+        private SimulationMonitorHelper GetMonitorHelper()
         {
             if (_hydroInfo == null)
             {
                 return default;
             }
-            if (_allVisualViewModelList == null)
+            if (_monitorHelper == null)
             {
-                _allVisualViewModelList = new List<HydroVisualViewModel>();
-                var allVisualList = _hydroInfo.GetAllVisuals();
-                if (allVisualList != null && allVisualList.Count > 0)
-                {
-                    var allCalcuResultList = GetCalcuResultList();
-                    allVisualList.ForEach(x =>
-                    {
-                        var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(x, _hydroInfo);
-                        var calcuResult = allCalcuResultList?.Find(x => x.Code == x.Code);
-                        if (calcuResult != null)
-                        {
-                            vm.UpdateCalcuProperty(calcuResult);
-                        }
-                        _allVisualViewModelList.Add(vm);
-                    });
-                }
+                var visualListHelper = GetVisualListHelper();
+                _monitorHelper = new SimulationMonitorHelper(visualListHelper);
             }
-            return _allVisualViewModelList;
+            return _monitorHelper;
         }
 
-        //鏇存柊鍙瑙嗗浘灞炴��
-        private void UpdateVisualViewModelProperty()
+        //璁剧疆鐩戞祴鐐瑰垪琛�
+        private async void SetMonitorList(HydroVisualInfo visual)
         {
-            var allVisualViewModelList = GetVisualViewModelList();
-            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
-            {
-                allVisualViewModelList.ForEach(x =>
-                {
-                    x.UpdateProperty();
-                });
-            }
-        }
-
-        //鏇存柊鍙瑙嗗浘灞炴��
-        private void UpdateVisualViewModelProperty(List<string> codes)
-        {
-            if (codes == null || codes.Count < 1)
+            if (_hydroInfo == null)
             {
                 return;
             }
-            var allVisualViewModelList = GetVisualViewModelList();
-            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
+            var monitorHelper = GetMonitorHelper();
+            var allMonitorList = await monitorHelper.Get();
+            var dlg = new SetHydroMonitorListDlg();
+            dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
+            dlg.ReloadDataEvent += async (list) =>
             {
-                allVisualViewModelList.ForEach(x =>
+                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
+                if (!bol)
                 {
-                    if (codes.Contains(x.Code))
-                    {
-                        x.UpdateProperty();
-                    }
-                });
-            }
-        }
-
-        //鏇存柊鍙瑙嗗浘灞炴��
-        private void UpdateVisualViewModelProperty(List<Yw.Model.HydroVisualInfo> visualList)
-        {
-            if (visualList == null || visualList.Count < 1)
-            {
-                return;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
-            {
-                allVisualViewModelList.ForEach(x =>
-                {
-                    if (visualList.Exists(t => t.Code == x.Code))
-                    {
-                        x.UpdateProperty();
-                    }
-                });
-            }
-        }
-
-        //鏇存柊鍙瑙嗗浘璁$畻灞炴��
-        private void UpdateVisualViewModelCalcuProperty()
-        {
-            var allVisualViewModelList = GetVisualViewModelList();
-            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
-            {
-                var allCalcuResultList = GetCalcuResultList();
-                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
-                {
-                    allVisualViewModelList.ForEach(x =>
-                    {
-                        var calcuResult = allCalcuResultList.Find(t => t.Code == x.Code);
-                        if (calcuResult != null)
-                        {
-                            x.UpdateCalcuProperty(calcuResult);
-                        }
-                    });
+                    TipFormHelper.ShowError("璁剧疆澶辫触锛�");
+                    return;
                 }
-            }
+                TipFormHelper.ShowSucceed("璁剧疆鎴愬姛锛�");
+                var monitorList = await monitorHelper.Update(visual.Code);
+                var monitorValueHelper = GetMonitorValueHelper();
+                monitorValueHelper.Update(visual.Code, monitorList);
+                var monitorMarkerHelper = await GetMonitorMarkerHelper();
+                monitorMarkerHelper.Update(visual.Code, monitorList);
+                monitorMarkerHelper.Set();
+            };
+            dlg.ShowDialog();
         }
 
-        //鑾峰彇鏋勪欢瑙嗗浘
-        private HydroVisualViewModel GetVisualViewModel(string code)
+        //璁剧疆鐩戞祴鐐�
+        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (string.IsNullOrEmpty(code))
-            {
-                return default;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            return allVisualViewModelList?.Find(x => x.Code == code);
+            SetMonitorList(_visual);
         }
-
-        //鑾峰彇鍙瑙嗗浘
-        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
-        {
-            if (visual == null)
-            {
-                return default;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            return allVisualViewModelList?.Find(x => x.Code == visual.Code);
-        }
-
-
 
         #endregion
 
-        #region 鏋勪欢鏄庣粏鎺т欢
+        #region 鐩戞祴鍊�
 
-        //鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+        //鐩戞祴鍊艰緟鍔╃被
+        private SimulationMonitorValueHelper _monitorValueHelper = null;
 
-        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+        //鑾峰彇鐩戞祴鍊艰緟鍔╃被
+        private SimulationMonitorValueHelper GetMonitorValueHelper()
         {
-            if (_visualListCtrl == null)
+            if (_monitorValueHelper == null)
             {
-                _visualListCtrl = new HydroVisualListCtrl();
-                _visualListCtrl.Dock = DockStyle.Fill;
-                _visualListCtrl.HydroClickInfoEvent += async (visual) =>
-                {
-                    ShowSelectedProperty(visual);
-                    await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
-                };
-                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
-                {
-                    UpdateSelectedProperty();
-                    AutoApplyGrading();
-                };
+                var visualListHelper = GetVisualListHelper();
+                var monitorHelper = GetMonitorHelper();
+                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
             }
-            return _visualListCtrl;
+            return _monitorValueHelper;
         }
 
-        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
-        private bool IsVisualListCtrlVisible
+        //閲嶇疆
+        private void ResetMonitorValue()
+        {
+            var allWorkingList = GetWorkingList();
+            var working = allWorkingList?.Last(x => !string.IsNullOrEmpty(x.MonitorInfo));
+            if (working != null)
+            {
+                var helper = GetMonitorValueHelper();
+                helper.Reset(working.MonitorInfo);
+            }
+
+        }
+
+        #endregion
+
+        #region 鐩戞祴鍊兼帶浠�
+
+        //鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
+
+        //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroMonitorValueListCtrl GetMonitorValueListCtrl()
+        {
+            if (_monitorValueListCtrl == null)
+            {
+                _monitorValueListCtrl = new HydroMonitorValueListCtrl();
+                _monitorValueListCtrl.Dock = DockStyle.Fill;
+                _monitorValueListCtrl.HydroViewEvent += (code) =>
+                {
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eVisualSource.Monitor);
+                };
+            }
+            return _monitorValueListCtrl;
+        }
+
+        //鐩戞祴鍊煎垪琛ㄦ帶浠舵槸鍚﹀彲瑙�
+        private bool IsMonitorValueListCtrlVisible
         {
             get
             {
@@ -2986,7 +1609,7 @@
                 {
                     if (this.controlContainerBottom.Controls.Count > 0)
                     {
-                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
                         {
                             return true;
                         }
@@ -2996,240 +1619,21 @@
             }
         }
 
-        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowVisualListCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (IsVisualListCtrlVisible)
-            {
-                return;
-            }
-
-            var visualListCtrl = GetVisualListCtrl();
-            var allVisualViewModelList = GetVisualViewModelList();
-            visualListCtrl.SetBindingData(allVisualViewModelList);
-            var allCalcuResultList = GetCalcuResultList();
-            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
-            {
-                visualListCtrl.SetNormalView();
-            }
-            else
-            {
-                visualListCtrl.SetCalcuView();
-            }
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(visualListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
-            this.docPnlBottom.Height = 350;
-        }
-
-        //鏇存柊鏋勪欢鏄庣粏鎺т欢
-        private void UpdateVisualListCtrl()
-        {
-            if (!IsVisualListCtrlVisible)
-            {
-                return;
-            }
-            _visualListCtrl?.UpdateBindingData();
-        }
-
-        //鏋勪欢鏄庣粏
-        private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowVisualListCtrl();
-        }
-
-        #endregion
-
-        #endregion
-
-        #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;
-            }
-            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();
+            if (!IsMonitorValueListCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鐩戞祴鍊�";
+                this.docPnlBottom.Height = 350;
+            }
+            var monitorValueHelper = GetMonitorValueHelper();
+            var allMonitorValueList = await monitorValueHelper.Get();
             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;
         }
 
         //璁剧疆鐩戞祴鍊�
@@ -3240,81 +1644,36 @@
 
         #endregion
 
-        #region 鐩戞祴鍒楄〃鏄剧ず
+        #region 鐩戞祴鐐规爣璁�
 
-        //鐩戞祴鏄惁鏄剧ず
-        private bool _isMonitorVisible = false;
+        //鐩戞祴鏍囪杈呭姪绫�
+        private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
 
-        //鑾峰彇涓氬姟鐩戞祴鍒楄〃
-        private async Task<List<LogicMonitor>> GetLogicMonitorList()
+        //鑾峰彇鐩戞祴鏍囪杈呭姪绫�
+        private async Task<SimulationMonitorMarkerHelper> GetMonitorMarkerHelper()
         {
-            var allMonitorList = await GetMonitorList();
-            var allLogicMonitorList = allMonitorList.Select(x =>
+            if (_monitorMarkerHelper == null)
             {
-                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);
+                var monitorHelper = GetMonitorHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _monitorMarkerHelper = new SimulationMonitorMarkerHelper(monitorHelper, bimfaceCtrl);
             }
-            else
-            {
-                await _bimfaceCtrl?.ClearLogicMonitors();
-            }
+            return _monitorMarkerHelper;
         }
 
         //鏄剧ず鐘舵�佹敼鍙�
-        private void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isMonitorVisible = this.barCkMonitor.Checked;
-            SetLogicMonitorList();
-        }
-
-
-        #endregion
-
-        #endregion
-
-        #region 妯℃嫙妫�鏌�
-
-        #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;
+            var monitorMarkerHelper = await GetMonitorMarkerHelper();
+            monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
+            monitorMarkerHelper.Set();
         }
 
         #endregion
 
-        #region 妫�鏌ユ帶浠�
+        #endregion
+
+        #region 妯″瀷妫�鏌�
 
         //妫�鏌ユ帶浠�
         private HydroCheckResultCtrl _checkCtrl = null;
@@ -3322,66 +1681,333 @@
         //鑾峰彇妫�鏌ユ帶浠�
         private HydroCheckResultCtrl GetCheckCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_checkCtrl == null)
             {
                 _checkCtrl = new HydroCheckResultCtrl();
                 _checkCtrl.Dock = DockStyle.Fill;
-                _checkCtrl.HydroClickEvent += async (code) =>
+                _checkCtrl.HydroClickEvent += (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();
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eVisualSource.Check);
                 };
             }
             return _checkCtrl;
         }
 
-        //鏄剧ず妫�鏌ユ帶浠�
-        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
-        private void ShowCheckCtrl(bool needCheckAgain = false)
+        //妫�鏌ユ帶浠舵槸鍚﹀彲瑙�
+        private bool IsCheckCtrlVisible
         {
-            var checkResult = GetCheckResult(needCheckAgain);
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCheckResultCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず妫�鏌ユ帶浠�
+        private void ShowCheckCtrl(HydroCheckResult checkResult)
+        {
             if (checkResult == null)
             {
                 return;
             }
             var checkCtrl = GetCheckCtrl();
+            if (!IsCheckCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(checkCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
+                this.docPnlBottom.Height = 350;
+            }
             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;
         }
 
-        #endregion
+        //鏄剧ず妫�鏌ユ帶浠�
+        private void ShowCheckCtrl()
+        {
+            var checkResult = GetCheckResult();
+            ShowCheckCtrl(checkResult);
+        }
 
         //妫�鏌�
         private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowCheckCtrl(true);
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var checkResult = _hydroInfo.Check();
+            ShowCheckCtrl(checkResult);
         }
 
         #endregion
 
-        #region 瀵煎嚭INP鏂囦欢
+        #region 妯″瀷璁$畻
+
+        #region 璁$畻缁撴灉
+
+        //璁$畻缁撴灉杈呭姪绫�
+        private SimulationCalcuResultHelper _calcuResultHelper = null;
+
+        //鑾峰彇璁$畻缁撴灉杈呭姪绫�
+        private SimulationCalcuResultHelper GetCalcuResultHelper()
+        {
+            if (_calcuResultHelper == null)
+            {
+                var workingHelper = GetWorkingHelper();
+                _calcuResultHelper = new SimulationCalcuResultHelper(workingHelper);
+            }
+            return _calcuResultHelper;
+        }
+
+        #endregion
+
+        #region 璁$畻澶辫触
+
+        //璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
+
+        //鑾峰彇璁$畻澶辫触鎺т欢
+        private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
+        {
+            if (_calcuFailedCtrl == null)
+            {
+                _calcuFailedCtrl = new HydroCalcuFailedCtrl();
+                _calcuFailedCtrl.Dock = DockStyle.Fill;
+            }
+            return _calcuFailedCtrl;
+        }
+
+        //璁$畻澶辫触鎺т欢鏄惁鍙
+        private bool IsCalcuFailedCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCalcuFailedCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず璁$畻澶辫触鎺т欢
+        private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (calcuResult == null)
+            {
+                return;
+            }
+            if (calcuResult.Succeed)
+            {
+                return;
+            }
+            var calcuFailedCtrl = GetCalcuFailedCtrl();
+            if (!IsCalcuFailedCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
+                this.docPnlBottom.Height = 350;
+            }
+            calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
+        }
+
+        #endregion
+
+        #region 璁$畻璀﹀憡
+
+        //璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl _calcuWarningCtrl = null;
+
+        //鑾峰彇璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
+        {
+            if (_calcuWarningCtrl == null)
+            {
+                _calcuWarningCtrl = new HydroCalcuWarningCtrl();
+                _calcuWarningCtrl.Dock = DockStyle.Fill;
+                _calcuWarningCtrl.HydroClickEvent += (code) =>
+                {
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eVisualSource.Warning);
+                };
+            }
+            return _calcuWarningCtrl;
+        }
+
+        //璁$畻璀﹀憡鎺т欢鏄惁鍙
+        private bool IsCalcuWarningCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCalcuWarningCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず璁$畻璀﹀憡鎺т欢
+        private void ShowCalcuWarningCtrl(HydroCalcuResult calcuResult)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (calcuResult == null)
+            {
+                return;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return;
+            }
+            var calcuWaringCtrl = GetCalcuWarningCtrl();
+            if (!IsCalcuWarningCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(calcuWaringCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "璁$畻璀﹀憡";
+                this.docPnlBottom.Height = 350;
+            }
+            var visualListHelper = GetVisualListHelper();
+            var allVisualDict = visualListHelper.GetVisualDict();
+            calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
+        }
+
+        #endregion
+
+        #region 璁$畻鏍囩
+
+        //璁$畻鏍囩杈呭姪绫�
+        private SimulationCalcuResultLabelHelper _calcuResultLabelHelper = null;
+
+        //鑾峰彇璁$畻鏍囩杈呭姪绫�
+        private async Task<SimulationCalcuResultLabelHelper> GetCalcuResultLabelHelper()
+        {
+            if (_calcuResultLabelHelper == null)
+            {
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(calcuResultHelper, bimfaceCtrl);
+            }
+            return _calcuResultLabelHelper;
+        }
+
+        //璁剧疆璁$畻鏍囩鏄惁鏄剧ず
+        private async void barCkCalcu_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+            calcuResultLabelHelper.Visible = this.barCkCalcu.Checked;
+            calcuResultLabelHelper.Set();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region 绠$綉淇
+
+        //淇绠$綉
+        private void Repair()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var checkResult = _hydroInfo.Check();
+            if (!checkResult.Succeed)
+            {
+                ShowCheckCtrl(checkResult);
+                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
+                return;
+            }
+            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
+            if (!calcuResult.Succeed)
+            {
+                ShowCalcuFailedCtrl(calcuResult);
+                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
+                return;
+            }
+            var visualListHelper = GetVisualListHelper();
+            var allLinkList = visualListHelper.GetLinkList();
+            if (allLinkList != null && allLinkList.Count < 1)
+            {
+                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
+                return;
+            }
+            int count = 0;
+            foreach (var link in allLinkList)
+            {
+                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++;
+                }
+            }
+            var visualVmListHelper = GetVisualVmListHelper();
+            visualVmListHelper.UpdateProperty();
+            UpdateVisualListCtrl();
+            UpdatePropertyCtrl();
+            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)
@@ -3403,10 +2029,10 @@
 
         #endregion
 
-        #region 骞惰仈鍒嗘瀽
+        #region 姘存车鍒楄〃
 
-        //骞惰仈鍒嗘瀽
-        private void ParallelAnalysis()
+        //鎬ц兘鏇茬嚎
+        private void PumpFeat()
         {
             if (_hydroInfo == null)
             {
@@ -3418,373 +2044,525 @@
                 XtraMessageBox.Show("鏃犳按娉典俊鎭�");
                 return;
             }
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in pumps)
+            var dlg = new SimulationPumpFeatDlg();
+            dlg.SaveEvent += async (list) =>
             {
-                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;
-                }
+                pumps.ForEach(x => x.UpdateWorkingInfo(list));
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+                SelectVisual(_visual, eVisualSource.None);
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+            };
+            dlg.SetBindingData(_hydroInfo);
+            dlg.ShowDialog();
+        }
 
-                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();
+        //鎬ц兘鏇茬嚎
+        private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            PumpFeat();
+        }
 
-                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;
-
+        //骞惰仈妯℃嫙
+        private void PumpParallel()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
             }
-
-            var dlg = new PumpParallelAnalyDlg();
-            dlg.SetBindingData(vmList);
-            dlg.ReloadDataEvent += (list) =>
+            var pumps = _hydroInfo.Pumps;
+            if (pumps == null || pumps.Count < 1)
+            {
+                XtraMessageBox.Show("鏃犳按娉典俊鎭�");
+                return;
+            }
+            var dlg = new SimulationPumpParallelDlg();
+            dlg.SaveEvent += async (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;
+                        pump.LinkStatus = x.LinkStatus;
+                        pump.SpeedRatio = x.SpeedRatio;
                     }
                 });
-                var codes = list?.Select(x => x.Code).ToList();
-                UpdateVisualViewModelProperty(codes);
-                ShowSelectedProperty();
-                UpdateVisualListCtrl();
-                return true;
-            };
-            dlg.ShowDialog();
-        }
-
-        //骞惰仈
-        private void barBtnParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ParallelAnalysis();
-        }
-
-        #endregion
-
-        #region 妯℃嫙璁$畻
-
-        //鎵�鏈夊伐鍐靛厓缁勫垪琛�
-        private Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult> _allWorkingTupleList = null;
-
-
-        private Yw.EPAnet.CalcuResult _calcuResult = null;//璁$畻缁撴灉
-
-
-
-
-        #region 宸ュ喌
-
-
-        //鏄剧ず宸ュ喌璁$畻绐椾綋
-        private void ShowWorkingCalcuDlg()
-        {
-            var dlg = new SetHydroWorkingInfoDlg();
-            dlg.HydroViewEvent += async (parter) =>
-            {
-                _selectedVisual = parter as Yw.Model.HydroVisualInfo;
-                if (_selectedVisual != null)
-                {
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
-                }
-                ShowSelectedProperty();
-            };
-            dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                _hydroInfo.UpdateWorkingInfo(workingInfo);
-                //鏍¢獙
-                _checkResult = _hydroInfo.Check();
-                if (!_checkResult.Succeed)
-                {
-                    ShowCheckCtrl();
-                    TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
-                    return;
-                }
-
-                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
-
-
-                //await Task.Delay(5000);
-
-                var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-                _calcuResult = netWork.CalcuMinorLoss();
-
-                WaitFormHelper.HideWaitForm();
-                if (_calcuResult.Succeed)
-                {
-                    GetCalcuResultList(false);
-                    UpdateVisualViewModelProperty();
-                    UpdateVisualViewModelCalcuProperty();
-                    UpdateVisualListCtrl();
-                    UpdateSelectedProperty();
-                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
-                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                }
-                else
-                {
-                    ShowCalcuFailedCtrl();
-                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
-                }
-                AutoApplyGrading();
-                UpdateVisualListCtrl();
-                ShowSelectedProperty();
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+                SelectVisual(_visual, eVisualSource.None);
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
             };
             dlg.SetBindingData(_hydroInfo);
             dlg.ShowDialog();
         }
 
-        #endregion
-
-        #region 璁$畻澶辫触
-
-        //璁$畻澶辫触鎺т欢
-        private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
-
-        //鑾峰彇璁$畻澶辫触鎺т欢
-        private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
+        //骞惰仈妯℃嫙
+        private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_calcuFailedCtrl == null)
-            {
-                _calcuFailedCtrl = new HydroCalcuFailedCtrl();
-                _calcuFailedCtrl.Dock = DockStyle.Fill;
-            }
-            return _calcuFailedCtrl;
+
+            PumpParallel();
         }
 
-        //鏄剧ず璁$畻澶辫触鎺т欢
-        private void ShowCalcuFailedCtrl()
+        #endregion
+
+        #region 姘村姏璁$畻
+
+        //璁$畻
+        private async void Calcu()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            if (_calcuResult == null)
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allWorkingList = workingCheckedListHelper.GetWorkingList();
+            var monitorValueHelper = GetMonitorValueHelper();
+            var allMonitorValueList = await monitorValueHelper.Get();
+            var dlg = new SetHydroWorkingDlg();
+            dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
+            dlg.HydroViewEvent += (visual) =>
             {
-                return;
-            }
-            if (_calcuResult.Succeed)
+                SelectVisual(visual, eVisualSource.Calcu);
+            };
+            dlg.HydroCalcuEvent += async (vm) =>
             {
-                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;
+                _hydroInfo.UpdateWorkingInfo(vm.WorkingInfo);
+                allMonitorValueList.UpdateMonitorValue(vm.MonitorInfo);
+
+                var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+
+                var working = new HydroWorkingVmo();
+                working.ModelID = vm.ModelID;
+                working.Name = vm.Name;
+                working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo);
+                working.MonitorInfo = JsonHelper.Object2Json(vm.MonitorInfo);
+                working.SortCode = vm.SortCode;
+                working.Description = vm.Description;
+
+                var workingHelper = GetWorkingHelper();
+                //鏍¢獙
+                var checkResult = _hydroInfo.Check();
+                if (!checkResult.Succeed)
+                {
+                    ShowCheckCtrl(checkResult);
+                    workingHelper.InitialData(hydroInfo, working, checkResult, null);
+                    TipFormHelper.ShowError("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    return;
+                }
+
+                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
+                await Task.Delay(3000);
+                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+                WaitFormHelper.HideWaitForm();
+                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
+                if (calcuResult.Succeed)
+                {
+                    if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+                    {
+                        ShowCalcuWarningCtrl(calcuResult);
+                    }
+                    this.barBtnAddWorking.Enabled = true;
+                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                }
+                else
+                {
+                    ShowCalcuFailedCtrl(calcuResult);
+                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                }
+
+                #region 瑙嗗浘鍒楄〃
+
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateCalcuProperty(calcuResult);
+
+                #endregion
+
+                #region 褰撳墠鏋勪欢
+
+                SelectVisual(_visual, eVisualSource.Calcu);
+
+                #endregion
+
+                #region 鏋勪欢鏄庣粏
+
+                UpdateVisualListCtrl();
+
+                #endregion
+
+                #region 棰滆壊鍒嗙骇
+
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+
+                #endregion
+
+                #region 璁$畻鏍囩
+
+                var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+                calcuResultLabelHelper.Set();
+
+                #endregion
+
+            };
+
+            dlg.ShowDialog();
+
         }
-
-        #endregion
-
-        #region 璁$畻缁撴灉
-
-        //鎵�鏈夎绠楃粨鏋滃垪琛�
-        private List<HydroCalcuVisualResult> _allCalcuResultList = null;
-
-        //鑾峰彇璁$畻缁撴灉
-        //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
-        private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_calcuResult == null)
-            {
-                return default;
-            }
-            if (!_calcuResult.Succeed)
-            {
-                return default;
-            }
-            if (isCache)
-            {
-                return _allCalcuResultList;
-            }
-
-            _allCalcuResultList = new List<HydroCalcuVisualResult>();
-
-            //鑺傜偣
-            var allNodeList = _hydroInfo.GetAllNodes();
-            if (allNodeList != null && allNodeList.Count > 0)
-            {
-                foreach (var node in allNodeList)
-                {
-                    var calcuNode = _calcuResult.NodeList?.Find(x => x.Id == node.Code);
-                    if (calcuNode != null)
-                    {
-                        var calcuResult = new HydroCalcuNodeResult()
-                        {
-                            Code = node.Code,
-                            CalcuPress = calcuNode.Press,
-                            CalcuHead = calcuNode.Head,
-                            CalcuDemand = calcuNode.Demand
-                        };
-                        _allCalcuResultList.Add(calcuResult);
-                    }
-                }
-            }
-
-            //绠℃
-            var allLinkList = _hydroInfo.GetAllLinks();
-            if (allLinkList != null && allLinkList.Count > 0)
-            {
-                foreach (var link in allLinkList)
-                {
-                    var calcuLink = _calcuResult.LinkList?.Find(x => x.Id == link.Code);
-                    if (calcuLink != null)
-                    {
-                        var calcuResult = new HydroCalcuLinkResult()
-                        {
-                            Code = link.Code,
-                            CalcuFlow = calcuLink.Flow,
-                            CalcuVelocity = calcuLink.Velocity,
-                            CalcuHeadLoss = calcuLink.Headloss
-                        };
-                        _allCalcuResultList.Add(calcuResult);
-                    }
-                }
-            }
-
-            //娴侀噺璁�
-            var allFlowmeterList = _hydroInfo.Flowmeters;
-            if (allFlowmeterList != null && allFlowmeterList.Count > 0)
-            {
-                foreach (var flowmeter in allFlowmeterList)
-                {
-                    var calcuFlowmeterResult = _allCalcuResultList.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
-                    if (calcuFlowmeterResult != null)
-                    {
-                        var calcuFlowmeterNewResult = new HydroCalcuFlowmeterResult(calcuFlowmeterResult);
-                        var calcuFlowmeterLinkResultList = new List<HydroCalcuLinkResult>();
-                        var flowmeterLinkList = allLinkList?.Where(x => x.StartCode == flowmeter.Code || x.EndCode == flowmeter.Code).ToList();
-                        if (flowmeterLinkList != null && flowmeterLinkList.Count > 0)
-                        {
-                            foreach (var flowmeterLink in flowmeterLinkList)
-                            {
-                                var calcuFlowmeterLinkResult = _allCalcuResultList.Find(x => x.Code == flowmeterLink.Code) as HydroCalcuLinkResult;
-                                if (calcuFlowmeterLinkResult != null)
-                                {
-                                    calcuFlowmeterLinkResultList.Add(calcuFlowmeterLinkResult);
-                                }
-                            }
-                        }
-                        if (calcuFlowmeterLinkResultList.Exists(x => x.CalcuFlow.HasValue))
-                        {
-                            calcuFlowmeterNewResult.CalcuQ = calcuFlowmeterLinkResultList.Where(x => x.CalcuFlow.HasValue).Average(x => x.CalcuFlow.Value);
-                        }
-                        _allCalcuResultList.Remove(calcuFlowmeterResult);
-                        _allCalcuResultList.Add(calcuFlowmeterNewResult);
-                    }
-                }
-            }
-
-            //鍘嬪姏琛�
-            var allPressmeterList = _hydroInfo.Pressmeters;
-            if (allPressmeterList != null && allPressmeterList.Count > 0)
-            {
-                foreach (var pressmeter in allPressmeterList)
-                {
-                    var calcuPressmeterResult = _allCalcuResultList.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
-                    if (calcuPressmeterResult != null)
-                    {
-                        var calcuPressmeterNewResult = new HydroCalcuPressmeterResult(calcuPressmeterResult);
-                        calcuPressmeterNewResult.CalcuPr = calcuPressmeterResult.CalcuPress;
-                        _allCalcuResultList.Remove(calcuPressmeterResult);
-                        _allCalcuResultList.Add(calcuPressmeterNewResult);
-                    }
-                }
-            }
-
-            //姘存车
-            var allPumpList = _hydroInfo.Pumps;
-            if (allPumpList != null && allPumpList.Count > 0)
-            {
-                foreach (var pump in allPumpList)
-                {
-                    var calcuPumpResult = _allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    if (calcuPumpResult != null)
-                    {
-                        var calcuPumpNewResult = new HydroCalcuPumpResult(calcuPumpResult);
-                        calcuPumpNewResult.CalcuQ = calcuPumpResult.CalcuFlow;
-                        if (calcuPumpNewResult.CalcuQ.HasValue)
-                        {
-                            var calcuNodeStartResult = _allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                            var calcuNodeEndResult = _allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                            if (calcuNodeStartResult != null && calcuNodeEndResult != null)
-                            {
-                                if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
-                                {
-                                    calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
-                                }
-                                if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
-                                {
-                                    var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
-                                    if (curveqp != null)
-                                    {
-                                        if (curveqp.CurveData != null && curveqp.CurveData.Count > 3)
-                                        {
-                                            var point2dList = curveqp.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                                            var point2dSimularList = point2dList.GetQPPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
-                                            var pumpCurveQp = new Yw.Pump.CurveQP(eFeatType.Cubic, point2dSimularList);
-                                            calcuPumpNewResult.CalcuP = pumpCurveQp.FeatCurve.GetPointY(calcuPumpNewResult.CalcuQ.Value);
-                                        }
-                                    }
-                                }
-                                if (calcuPumpNewResult.CalcuH.HasValue && calcuPumpNewResult.CalcuP.HasValue)
-                                {
-                                    calcuPumpNewResult.CalcuE = Yw.Pump.CalculationHelper.CalcuE(calcuPumpNewResult.CalcuQ.Value, calcuPumpNewResult.CalcuH.Value, calcuPumpNewResult.CalcuP.Value);
-                                }
-                            }
-                        }
-                        _allCalcuResultList.Remove(calcuPumpResult);
-                        _allCalcuResultList.Add(calcuPumpNewResult);
-                    }
-                }
-            }
-
-            return _allCalcuResultList;
-        }
-
-        #endregion
 
         //姘村姏璁$畻
-        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowWorkingCalcuDlg();
+            Calcu();
         }
 
         #endregion
 
+        #region 褰撳墠宸ュ喌
+
+        //宸ュ喌杈呭姪绫�
+        private SimulationWorkingHelper _workingHelper = null;
+
+        //鑾峰彇宸ュ喌杈呭姪绫�
+        private SimulationWorkingHelper GetWorkingHelper()
+        {
+            if (_workingHelper == null)
+            {
+                _workingHelper = new SimulationWorkingHelper();
+            }
+            return _workingHelper;
+        }
+
+        //鑾峰彇宸ュ喌
+        private HydroWorkingVmo GetWorking()
+        {
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.Working;
+        }
+
+        //鑾峰彇妫�鏌ョ粨鏋�
+        private HydroCheckResult GetCheckResult()
+        {
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.CheckResult;
+        }
+
+        //鑾峰彇璁$畻缁撴灉
+        private HydroCalcuResult GetCalcuResult()
+        {
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.CalcuResult;
+        }
+
+        //鏂板宸ュ喌
+        private void AddWorking()
+        {
+            var workingHelper = GetWorkingHelper();
+            if (workingHelper.Working == null)
+            {
+                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
+                return;
+            }
+            var dlg = new AddHydroWorkingDlg();
+            dlg.SetBindingData(workingHelper.Working);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                this.barBtnAddWorking.Enabled = false;
+                workingHelper.ResetWorking(rhs);
+                UpdateWorkingCheckedList(rhs, false);
+                this.AppendWorkingEvent?.Invoke(rhs);
+            };
+            dlg.ShowDialog();
+        }
+
+        //澧炲姞宸ュ喌
+        private void barBtnAddWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            AddWorking();
+        }
+
+        #endregion
+
+        #region 閫夋嫨宸ュ喌
+
+        //宸ュ喌閫夋嫨鍒楄〃杈呭姪绫�
+        private SimulationWorkingCheckedListHelper _workingCheckedListHelper = null;
+
+        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
+        private SimulationWorkingCheckedListHelper GetWorkingCheckedListHelper()
+        {
+            if (_workingCheckedListHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                _workingCheckedListHelper = new SimulationWorkingCheckedListHelper(visualListHelper);
+                _workingCheckedListHelper.InitialData(_allWorkingCheckedListDict);
+            }
+            return _workingCheckedListHelper;
+        }
+
+        //鑾峰彇宸ュ喌鍒楄〃
+        private List<HydroWorkingVmo> GetWorkingList()
+        {
+            var helper = GetWorkingCheckedListHelper();
+            return helper.GetWorkingList();
+        }
+
+        //鏇存柊宸ュ喌閫夋嫨鍒楄〃
+        public void UpdateWorkingCheckedList(HydroWorkingVmo working)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Update(working);
+        }
+
+        //鏇存柊宸ュ喌閫夋嫨鍒楄〃
+        public void UpdateWorkingCheckedList(HydroWorkingVmo working, bool hasChecked)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Update(working, hasChecked);
+        }
+
+        //绉婚櫎宸ュ喌閫夋嫨鍒楄〃
+        public void RemoveWorkingCheckedList(HydroWorkingVmo working)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Remove(working);
+        }
+
+
+        #endregion
+
+        #region 宸ュ喌鍒嗘瀽
+
+        //绮惧害璇勪及
+        private async void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var monitorHelper = GetMonitorHelper();
+            var allMonitorList = await monitorHelper.Get();
+
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new HydroSingleWorkingEvaluationDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult);
+                dlg.ShowDialog();
+            }
+            else
+            {
+                var dlg = new HydroMultiWorkingEvaluationDlg();
+                dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
+                dlg.ShowDialog();
+            }
+        }
+
+        //姘存车鍒嗘瀽
+        private void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationSingleWorkingPumpAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult);
+                dlg.ShowDialog();
+            }
+            else
+            {
+                var dlg = new SimulationMultiWorkingPumpAnalyDlg();
+                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
+                dlg.ShowDialog();
+            }
+        }
+
+        //鑳芥晥鍒嗘瀽
+        private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationSingleWorkingEnergyDlg();
+                dlg.SetBindingData(workingHelper.Working, workingHelper.HydroInfo, workingHelper.CalcuResult);
+                dlg.ShowDialog();
+            }
+            else
+            {
+
+                var dlg = new SimulationMultiWorkingEnergyDlg();
+                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
+                dlg.ShowDialog();
+            }
+        }
+
+        //鎹熷け鏇茬嚎
+        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_visual == null)
+            {
+                var sources = GetSourceList();
+                if (sources != null)
+                {
+                    if (sources.Count == 1)
+                    {
+                        SelectVisual(sources[0], eVisualSource.None);
+                    }
+                    else
+                    {
+                        var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.杩涘彛));
+                        if (source != null)
+                        {
+                            SelectVisual(source, eVisualSource.None);
+                        }
+                    }
+                }
+                if (_visual == null)
+                {
+                    TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+                    return;
+                }
+            }
+            HydroVisualInfo visual = _visual;
+            if (_visual is HydroLinkInfo linkInfo)
+            {
+                var visualListHelper = GetVisualListHelper();
+                visual = visualListHelper.GetVisual(linkInfo.StartCode);
+            }
+
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new HydroSingleWorkingLossCurveDlg();
+                dlg.HydroClickEvent += (code) =>
+                {
+                    SelectVisual(code, eVisualSource.None);
+                };
+                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
+                dlg.ShowDialog();
+            }
+            else
+            {
+                var dlg = new HydroMultiWorkingLossCurveDlg();
+                dlg.HydroClickEvent += (code) =>
+                {
+                    SelectVisual(code, eVisualSource.None);
+                };
+                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
+                dlg.ShowDialog();
+            }
+        }
+
+        //鎹熷け缁熻
+        private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new HydroSingleWorkingLossStatisticsDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo);
+                dlg.ShowDialog();
+            }
+            else
+            {
+                var dlg = new HydroMultiWorkingLossStatisticsDlg();
+                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
+                dlg.ShowDialog();
+            }
+        }
+
+        //缁煎悎鍒嗘瀽
+        private async void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_visual == null)
+            {
+                var sources = GetSourceList();
+                if (sources != null)
+                {
+                    if (sources.Count == 1)
+                    {
+                        SelectVisual(sources[0], eVisualSource.None);
+                    }
+                    else
+                    {
+                        var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.杩涘彛));
+                        if (source != null)
+                        {
+                            SelectVisual(source, eVisualSource.None);
+                        }
+                    }
+                }
+                if (_visual == null)
+                {
+                    TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+                    return;
+                }
+            }
+            HydroVisualInfo visual = _visual;
+            if (_visual is HydroLinkInfo linkInfo)
+            {
+                var visualListHelper = GetVisualListHelper();
+                visual = visualListHelper.GetVisual(linkInfo.StartCode);
+            }
+
+            var monitorHelper = GetMonitorHelper();
+            var allMonitorList = await monitorHelper.Get();
+
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
+            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationSingleWorkingAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, visual);
+                dlg.ShowDialog();
+            }
+            else
+            {
+                var dlg = new SimulationMultiWorkingAnalyDlg();
+                dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList, visual);
+                dlg.ShowDialog();
+            }
+        }
+
+        #endregion
 
 
 

--
Gitblit v1.9.3