From d2dabd9187f2dc5a9f6ac3a90cf0577db1d883b8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 23 十一月 2024 10:13:23 +0800
Subject: [PATCH] 工况协调

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 2614 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 1,177 insertions(+), 1,437 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 71f3b2f..51ca1cc 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,20 +1,10 @@
-锘縢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 HStation.WinFrmUI.PhartRelation;
+using NPOI.SS.Formula.Functions;
 using System.Diagnostics;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
-using Yw.Hydro;
-using Yw.Pump;
+using Yw.Model;
 using Yw.Vmo;
-using Yw.WinFrmUI.Bimface;
-using Yw.WinFrmUI.Hydro;
 
 namespace HStation.WinFrmUI
 {
@@ -78,11 +68,20 @@
             ShowBimfaceCtrl();
             ShowQ3dCtrl();
             ShowPropertyCtrl();
+        }
 
+        //鍒濆鍖朥I
+        private async void InitialUI()
+        {
+            var workingTupleHelper = GetWorkingTupleHelper();
+            var allWorkingList = await workingTupleHelper.GetWorkingList();
+            InitialUIWorkingList(allWorkingList);
+            var working = allWorkingList?.LastOrDefault();
+            SetUIWorking(working);
         }
 
 
-        #region Bimface
+        #region BIM鎺т欢
 
         //bimface鎺т欢
         private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
@@ -90,26 +89,28 @@
         //鑾峰彇 bimface 鎺т欢
         private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_bimfaceCtrl == null)
             {
                 _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                await _bimfaceCtrl.InitialData(_project, _projectSite);
                 _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
                     if (_hydroInfo == null)
                     {
                         return;
                     }
+                    InitialUI();
                 };
-                _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 +124,9 @@
             this.tabPageBimface.Controls.Add(bimfaceCtrl);
         }
 
-        private void SelectBimfaceParter()
-        {
-
-        }
-
         #endregion
 
-        #region Q3d
+        #region Q3d鎺т欢
 
         //Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
@@ -138,20 +134,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;
@@ -175,44 +171,39 @@
         //鑾峰彇灞炴�ф帶浠�
         private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_propertyCtrl == null)
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
-                _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
-                { //寮鸿皟杩炴帴缁勪欢
-                    if (string.IsNullOrEmpty(code))
+                _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 +212,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) =>
-                {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    _bimfaceCtrl?.ZoomToComponent(parter.Code);
-                };
-                _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
                 {
                     if (visual == null)
                     {
                         return;
                     }
                     UpdateVisualListCtrl();
-                    ApplyGradingResultList(visual);
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set();
                 };
-                _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
                 {
                     //鏍囨敞灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
-                    UpdateMark(visual);
+                    var markHelper = await GetMarkHelper();
+                    markHelper.Set(visual);
                 };
-                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
                 {
                     //鍒嗙骇灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set(visual);
                 };
-                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
                 {
                     //娴佸悜灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    UpdateFlowEffect(visual);
+                    var flowEffectHelper = await GetFlowEffectHelper();
+                    flowEffectHelper.Set(visual);
                 };
 
             }
@@ -302,42 +290,314 @@
             this.docPnlRight.Width = 300;
         }
 
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty()
+        //璁剧疆灞炴�ф帶浠�
+        private async void SetPropertyCtrl(HydroVisualInfo visual)
         {
-            ShowSelectedProperty(_selectedVisual);
+            ShowPropertyCtrl();
+            var visualVmListHelper = await GetVisualVmListHelper();
+            var vm = visualVmListHelper.GetVisual(visual);
+            _propertyCtrl.SelectedObject = vm;
         }
 
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
+        //鏇存柊灞炴�ф帶浠�
+        private void UpdatePropertyCtrl()
+        {
+            _propertyCtrl?.UpdateRows();
+        }
+
+        //娓呯悊灞炴�ф帶浠�
+        private void ClearPropertyCtrl()
+        {
+            if (_propertyCtrl != null)
+            {
+                _propertyCtrl.SelectedObject = null;
+            }
+        }
+
+        #endregion
+
+        #region 閫夋嫨鏋勪欢
+
+        //鍙鏉ユ簮
+        protected enum eVisualSource
+        {
+            None,
+            Bimface,
+            Q3d,
+            Property,
+            List,
+            Search,
+            Monitor,
+            Check,
+            Calcu,
+            Warning,
+        }
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _visual = null;
+
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
+        {
+            _visual = visual;
+            switch (source)
+            {
+                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.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;
+            }
+        }
+
+        #endregion
+
+        #region 鏋勪欢鏄庣粏
+
+        #region 鍙鍒楄〃
+
+        //鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper _visualListHelper = null;
+
+        //鑾峰彇鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper GetVisualListHelper()
+        {
+            if (_visualListHelper == null)
+            {
+                _visualListHelper = new SimulationVisualListHelper();
+                _visualListHelper.InitialData(_hydroInfo);
+            }
+            return _visualListHelper;
+        }
+
+        #endregion
+
+        #region 瑙嗗浘鍒楄〃
+
+        //鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private SimulationVisualVmListHelper _visualVmListHelper = null;
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private async Task<SimulationVisualVmListHelper> GetVisualVmListHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_visualVmListHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = await GetCalcuResultHelper();
+                _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
+            }
+            return _visualVmListHelper;
+        }
+
+        #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) =>
+                {
+
+                };
+                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+                {
+
+                };
+            }
+            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 async void ShowVisualListCtrl()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            ShowPropertyCtrl();
-            _selectedVisual = visual;
-            if (_selectedVisual == null)
+            var visualListCtrl = GetVisualListCtrl();
+            if (!IsVisualListCtrlVisible)
             {
-                _propertyCtrl.SelectedObject = null;
-                return;
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(visualListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+                this.docPnlBottom.Height = 350;
             }
-            _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
+            var visualVmListHelper = await GetVisualVmListHelper();
+            var allVisualVmList = visualVmListHelper.GetVisualList();
+            visualListCtrl.SetBindingData(allVisualVmList);
+            var calcuResult = await GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
+            {
+                visualListCtrl.SetCalcuView();
+            }
+            else
+            {
+                visualListCtrl.SetNormalView();
+            }
         }
 
-        //鏇存柊閫夋嫨灞炴��
-        private void UpdateSelectedProperty()
+        //鏇存柊鏋勪欢鏄庣粏鎺т欢
+        private void UpdateVisualListCtrl()
         {
-            if (!IsPropertyCtrlVisible)
+            if (!IsVisualListCtrlVisible)
             {
                 return;
             }
-            if (_selectedVisual == null)
-            {
-                return;
-            }
-            _propertyCtrl?.UpdateRows();
+            _visualListCtrl?.UpdateBindingData();
         }
+
+        //鏋勪欢鏄庣粏
+        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
 
@@ -357,14 +617,14 @@
                         return;
                     }
                     var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == code);
+                    _visual = allParterList?.Find(x => x.Code == code);
                     var elementIds = new List<string>();
-                    if (_selectedVisual != null)
+                    if (_visual != null)
                     {
-                        elementIds.Add(_selectedVisual.Code);
+                        elementIds.Add(_visual.Code);
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
+                    //ShowSelectedProperty();
                 };
                 _matchingListCtrl.ApplyMatchingEvent += (output) =>
                 {
@@ -390,7 +650,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
+            var input = AssetsMatchingParasHelper.Create(_hydroInfo, null);
             matchingListCtrl.SetBindingData(input);
             this.controlContainerBottom.Controls.Add(matchingListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -400,7 +660,7 @@
 
         #endregion
 
-        #region 鏈尮閰嶅垪琛�
+        #region 鏈尮鍒楄〃
 
         //鑾峰彇鏈尮閰嶅垪琛ㄦ帶浠�
         private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
@@ -420,17 +680,17 @@
                         return;
                     }
                     var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
+                    _visual = allParterList?.Find(x => x.Code == parter.Code);
                     var elementIds = new List<string>() { parter.Code };
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
+                    //ShowSelectedProperty();
                 };
                 _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
                 {
                     var codes = parters?.Select(x => x.Code).Distinct().ToList();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _selectedVisual = null;
-                    ShowSelectedProperty();
+                    _visual = null;
+                    //ShowSelectedProperty();
                 };
             }
             return _unMatchingListCtrl;
@@ -458,39 +718,27 @@
 
         #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 淇濆瓨淇℃伅
 
@@ -920,132 +1168,29 @@
 
         #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 鏋勪欢鏌ヨ
 
         //鏌ヨ缁勪欢
         private HydroVisualSearchListCtrl _searchCtrl = null;
 
         //鑾峰彇鏌ヨ缁勪欢
-        private HydroVisualSearchListCtrl GetSearchCtrl()
+        private async Task<HydroVisualSearchListCtrl> GetSearchCtrl()
         {
             if (_searchCtrl == null)
             {
+                var visualVmListHelper = await 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;
@@ -1071,13 +1216,13 @@
         }
 
         //鏄剧ず鏌ヨ鎺т欢
-        private void ShowSearchCtrl(string content)
+        private async void ShowSearchCtrl(string content)
         {
             if (IsSearchCtrlVisible)
             {
                 return;
             }
-            var searchCtrl = GetSearchCtrl();
+            var searchCtrl = await GetSearchCtrl();
             searchCtrl.SetBindingData(content);
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(searchCtrl);
@@ -1116,118 +1261,35 @@
 
         #region 妯″瀷鏍囨敞
 
-        #region 鏍囨敞璁剧疆
+        //鏍囨敞杈呭姪绫�
+        private SimulationMarkHelper _markHelper = null;
 
-        //鎵�鏈夋爣娉ㄨ缃垪琛�
-        private List<HydroMarkSetViewModel> _allMarkSetList = null;
-
-        //鑾峰彇鏍囨敞璁剧疆鍒楄〃
-        private List<HydroMarkSetViewModel> GetMarkSetList()
+        //鑾峰彇鏍囨敞杈呭姪绫�
+        private async Task<SimulationMarkHelper> GetMarkHelper()
         {
-            if (_hydroInfo == null)
+            if (_markHelper == null)
             {
-                return default;
+                var visualListHelper = GetVisualListHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _markHelper = new SimulationMarkHelper(visualListHelper, bimfaceCtrl);
             }
-            if (_allMarkSetList == null)
-            {
-                _allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
-            }
-            return _allMarkSetList;
+            return _markHelper;
         }
 
-        #endregion
-
-        #region 鏍囨敞缁撴灉
-
-        //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
-        private List<HydroMarkResultViewModel> _allMarkResultList = null;
-
-        //鑾峰彇鏍囨敞缁撴灉鍒楄〃
-        //UseCache 鏄惁浣跨敤缂撳瓨
-        private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (!useCache)
-            {
-                var allSetList = GetMarkSetList();
-                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
-            }
-            if (_allMarkResultList == null)
-            {
-                var allSetList = GetMarkSetList();
-                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
-            }
-            return _allMarkResultList;
-        }
-
-        #endregion
-
-        #region 鏍囨敞鏄剧ず
-
-        //鏍囨敞鏄惁鏄剧ず
-        private bool _isMarkVisible = false;
-
-        //鏇存柊鏍囨敞
-        private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
-        {
-            var allSetList = GetMarkSetList();
-            var result = HydroMarkHelper.GetResult(visual, allSetList);
-            if (result == null)
-            {
-                return;
-            }
-            var allResultList = GetMarkResultList(true);
-            allResultList.Remove(x => x.Code == visual.Code);
-            allResultList.Add(result);
-            if (_isMarkVisible)
-            {
-                var leadLabel = new LogicMarkLeadLabel() { Id = result.Code, Text = result.Text, Distance = null };
-                await _bimfaceCtrl?.UpdateLogicMarkLeadLabel(leadLabel);
-            }
-        }
-
-        //鏇存柊鏍囨敞鍒楄〃
-        private void UpdateMarkList(List<Yw.Model.HydroVisualInfo> visuals)
-        {
-            if (visuals == null || visuals.Count < 1)
-            {
-                visuals.ForEach(x => UpdateMark(x));
-            }
-        }
-
-        //搴旂敤鏍囨敞鍒楄〃
-        //UseCache 鏄惁浣跨敤缂撳瓨
-        private async void ApplyMarkList(bool useCache = true)
-        {
-            if (_isMarkVisible)
-            {
-                var allResultList = GetMarkResultList(useCache);
-                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, null)).ToList();
-                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
-            }
-            else
-            {
-                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
-            }
-        }
-
-        //鏄剧ず鏍囨敞璁剧疆绐椾綋
-        private void ShowSetMarkDlg()
+        //鏄剧ず鏍囨敞鍒楄〃
+        private async void ShowMarkList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allMarkSetList = GetMarkSetList();
+            var markHelper = await GetMarkHelper();
             var dlg = new SetHydroMarkDlg();
-            dlg.SetBindingData(allMarkSetList);
+            dlg.SetBindingData(markHelper.Sets);
             dlg.ReloadDataEvent += (list) =>
             {
-                _allMarkSetList = list;
-                ApplyMarkList(false);
+                markHelper.Sets = list;
+                markHelper.Set();
             };
             dlg.ShowDialog();
         }
@@ -1235,251 +1297,98 @@
         //璁剧疆鏍囨敞
         private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSetMarkDlg();
+            ShowMarkList();
         }
 
         //鏄惁鏄剧ず
-        private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isMarkVisible = this.barCkMark.Checked;
-            ApplyMarkList(true);
+            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 = await GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
-            if (_allGradingList == null)
-            {
-                _allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
-            }
-            return _allGradingList;
+            return _gradingHelper;
         }
 
-        //鏄剧ず棰滆壊鍒嗙骇绐椾綋
-        private async void ShowGradingDlg()
+        //璁剧疆棰滆壊鍒嗙骇鍒楄〃
+        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;
-                ApplyGradingResultList(false);
+                gradingHelper.SetGradingList(list);
+                gradingHelper.Set();
             };
             dlg.ApplyDataEvent += (catalog, propName) =>
             {
-                UpdateGradingApplyList(catalog, propName);
-                ApplyGradingResultList(false);
+                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)
         {
-            ShowGradingDlg();
+            SetGradingList();
         }
 
-        #endregion
-
-        #region 搴旂敤鍒嗙骇
-
-        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> GetGradingApplyList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_allGradingApplyList == null)
-            {
-                _allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
-            }
-            return _allGradingApplyList;
-        }
-
-        //鏇存柊棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private void UpdateGradingApplyList(string catalog, string propName)
-        {
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return;
-            }
-            var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
-            if (apply == null)
-            {
-                return;
-            }
-            apply.PropName = propName;
-        }
-
-        //鏄剧ず棰滆壊鍒嗙骇搴旂敤绐椾綋
-        private void ShowGradingApplyDlg()
+        //搴旂敤棰滆壊鍒嗙骇鍒楄〃
+        private async void ApplyGradingList()
         {
             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;
-                ApplyGradingResultList(false);
+                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)
         {
-            ShowGradingApplyDlg();
-        }
-
-        #endregion
-
-        #region 搴旂敤缁撴灉
-
-        //鎵�鏈夐鑹插垎绾х粨鏋滃垪琛�
-        private List<HydroGradingResultViewModel> _allGradingResultList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        //UseCache鏄惁浣跨敤缂撳瓨
-        private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            var allGradingList = await GetGradingList();
-            var allGradingApplyList = GetGradingApplyList();
-            var allCalcuResultList = GetCalcuResultList();
-            if (!useCache)
-            {
-                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
-            }
-            if (_allGradingResultList == null)
-            {
-                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
-            }
-            return _allGradingResultList;
-        }
-
-        #endregion
-
-        #region 缁撴灉灞曠ず
-
-        //棰滆壊鍒嗙骇鏄惁鏄剧ず
-        private bool _isGradingVisible = false;
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        //UseCache鏄惁浣跨敤缂撳瓨
-        private async void ApplyGradingResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allGradingResultList = await GetGradingResultList(useCache);
-            if (allGradingResultList == null || allGradingResultList.Count < 1)
-            {
-                return;
-            }
-            if (_isGradingVisible)
-            {
-                var groupList = allGradingResultList.GroupBy(x => x.Color).ToList();
-                groupList.ForEach(async x => await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1));
-            }
-            else
-            {
-                var codes = allGradingResultList.Select(x => x.Code).Distinct().ToList();
-                await _bimfaceCtrl?.RestoreComponentsColor(codes);
-            }
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        private async void ApplyGradingResultList(Yw.Model.HydroVisualInfo visual)
-        {
-            if (visual == null)
-            {
-                return;
-            }
-            var allGradingList = await GetGradingList();
-            var allGradingApplyList = GetGradingApplyList();
-            var allGradingResultList = await GetGradingResultList(true);
-            var allCalcuResultList = GetCalcuResultList(true);
-            var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
-            if (oldResult != null)
-            {
-                allGradingResultList.Remove(oldResult);
-            }
-            var newResult = HydroGradingHelper.GetResult(visual, allGradingList, allGradingApplyList, allCalcuResultList);
-            if (newResult != null)
-            {
-                allGradingResultList.Add(newResult);
-            }
-            if (_isGradingVisible)
-            {
-                if (newResult == null)
-                {
-                    if (oldResult != null)
-                    {
-                        await _bimfaceCtrl?.RestoreComponentsColor(oldResult.Code);
-                    }
-                }
-                else
-                {
-                    await _bimfaceCtrl?.OverrideComponentsColor(newResult.Code, newResult.Color, 1);
-                }
-            }
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        private void ApplyGradingResultList(List<Yw.Model.HydroVisualInfo> visualList)
-        {
-            if (visualList == null || visualList.Count < 1)
-            {
-                return;
-            }
-            visualList.ForEach(x => ApplyGradingResultList(x));
+            ApplyGradingList();
         }
 
         //棰滆壊鍒嗙骇灞曠ず
-        private void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isGradingVisible = this.barCkGrading.Checked;
-            ApplyGradingResultList(true);
+            var gradingHelper = await GetGradingHelper();
+            gradingHelper.Visible = this.barCkGrading.Checked;
+            gradingHelper.Set();
         }
-
-        #endregion
 
         #endregion
 
@@ -1506,10 +1415,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);
             }
         }
 
@@ -1517,357 +1429,139 @@
 
         #region 姘存祦鍔ㄧ敾
 
-        //姘存祦鍔ㄧ敾鏄惁鍙
-        private bool _isFlowEffectVisible = false;
+        //姘存祦鍔ㄧ敾杈呭姪绫�
+        private SimulationFlowEffectHelper _flowEffectHelper = null;
 
-        //鎵�鏈夋按娴佸姩鐢诲垪琛�
-        private List<LogicFlowEffect> _allFlowEffectList = 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 = await GetCalcuResult();
+                _flowEffectHelper.InitialData(calcuResult);
             }
-            return _allFlowEffectList;
-        }
-
-        //鍔犺浇姘存祦鍔ㄧ敾
-        private async void LoadFlowEffect()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allFlowEffectList = GetFlowEffectList();
-            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
-        }
-
-        //鍗歌浇姘存祦鍔ㄧ敾
-        private async void UnloadFlowEffect()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            await _bimfaceCtrl?.UnloadFlowEffect();
-        }
-
-        //璁剧疆姘村姏鍔ㄧ敾
-        private void SetFlowEffect()
-        {
-            if (_isFlowEffectVisible)
-            {
-                LoadFlowEffect();
-            }
-            else
-            {
-                UnloadFlowEffect();
-            }
-        }
-
-        //鏇存柊姘存祦鍔ㄧ敾
-        private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allFlowEffectList = GetFlowEffectList();
-            var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
-            if (flowEffect == null)
-            {
-                return;
-            }
-            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedX = 0;
-            }
-            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedX = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedX = -0.1;
-            }
-
-            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedY = 0;
-            }
-            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedY = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedY = -0.1;
-            }
-
-            var allCalcuResultList = GetCalcuResultList();
-            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
-            if (calcuResult != null)
-            {
-                if (calcuResult.CalcuVelocity < 0)
-                {
-                    flowEffect.SpeedX = -flowEffect.SpeedX;
-                }
-            }
-            if (_isFlowEffectVisible)
-            {
-                await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
-            }
+            return _flowEffectHelper;
         }
 
         //姘存祦鍔ㄧ敾鏄惁鍙
-        private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isFlowEffectVisible = this.barCkFlowEffect.Checked;
-            SetFlowEffect();
+            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);
-                    });
-                }
+                _monitorHelper = new SimulationMonitorHelper(_hydroInfo.ID);
             }
-            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);
-        }
-
-        //鑾峰彇鍙瑙嗗浘
-        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
-        {
-            if (visual == null)
-            {
-                return default;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            return allVisualViewModelList?.Find(x => x.Code == visual.Code);
+            SetMonitorList(_visual);
         }
 
         #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) =>
-                {
-                    UpdateMarkList(visualList);
-                    UpdateSelectedProperty();
-                    ApplyGradingResultList();
-                };
+                var visualListHelper = GetVisualListHelper();
+                var monitorHelper = GetMonitorHelper();
+                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
             }
-            return _visualListCtrl;
+            return _monitorValueHelper;
         }
 
-        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
-        private bool IsVisualListCtrlVisible
+        #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
             {
@@ -1875,7 +1569,7 @@
                 {
                     if (this.controlContainerBottom.Controls.Count > 0)
                     {
-                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
                         {
                             return true;
                         }
@@ -1885,240 +1579,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;
         }
 
         //璁剧疆鐩戞祴鍊�
@@ -2129,81 +1604,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;
@@ -2211,90 +1641,99 @@
         //鑾峰彇妫�鏌ユ帶浠�
         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 async void ShowCheckCtrl()
+        {
+            var checkResult = await 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 EPA璁$畻缁撴灉
+        #region 妯″瀷璁$畻
 
-        //EPA璁$畻缁撴灉
-        private Yw.EPAnet.CalcuResult _epaCalcuResult = null;
+        #region 璁$畻缁撴灉
 
-        //鑾峰彇EPA璁$畻缁撴灉
-        //CalcuMode 鍦� Yw.EPANet.Calcu.Core 涓畾涔�
-        //NeedCalcuAgain 鏄惁闇�瑕侀噸鏂拌绠�
-        private Yw.EPAnet.CalcuResult GetEpaCalcuResult(string calcuMode, bool needCalcuAgain = false)
+        //璁$畻缁撴灉杈呭姪绫�
+        private SimulationCalcuResultHelper _calcuResultHelper = null;
+
+        //鑾峰彇璁$畻缁撴灉杈呭姪绫�
+        private async Task<SimulationCalcuResultHelper> GetCalcuResultHelper()
         {
-            if (_hydroInfo == null)
+            if (_calcuResultHelper == null)
             {
-                return default;
+                _calcuResultHelper = new SimulationCalcuResultHelper();
+                var calcuResult = await GetCalcuResult();
+                _calcuResultHelper.InitialData(calcuResult);
             }
-            if (needCalcuAgain)
-            {
-                var network = _hydroInfo.ToNetwork();
-                _epaCalcuResult = network.Calcu(calcuMode);
-            }
-            if (_epaCalcuResult == null)
-            {
-                var network = _hydroInfo.ToNetwork();
-                _epaCalcuResult = network.Calcu(calcuMode);
-            }
-            return _epaCalcuResult;
+            return _calcuResultHelper;
         }
 
         #endregion
@@ -2315,8 +1754,27 @@
             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(Yw.EPAnet.CalcuResult calcuResult)
+        private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
         {
             if (_hydroInfo == null)
             {
@@ -2331,66 +1789,164 @@
                 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);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
-            this.docPnlBottom.Height = 350;
         }
 
-        //鏄剧ず璁$畻澶辫触鎺т欢
-        private void ShowCalcuFailedCtrl()
+        #endregion
+
+        #region 璁$畻璀﹀憡
+
+        //璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl _calcuWarningCtrl = null;
+
+        //鑾峰彇璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
         {
-            ShowCalcuFailedCtrl(_epaCalcuResult);
+            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 visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = await GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(visualListHelper, 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()
+        private async void Repair()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var checkResult = GetCheckResult(true);
-            if (checkResult == null)
-            {
-                return;
-            }
+            var checkResult = _hydroInfo.Check();
             if (!checkResult.Succeed)
             {
-                ShowCheckCtrl(false);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄淇锛�");
+                ShowCheckCtrl(checkResult);
+                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
                 return;
             }
-            var calcuResult = GetEpaCalcuResult(Yw.EPAnet.CalcuMode.Simple, true);
-            if (calcuResult == null || !calcuResult.Succeed)
+            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
+            if (!calcuResult.Succeed)
             {
                 ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝慨澶嶏紒");
+                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
                 return;
             }
-
-            var allLinks = _hydroInfo.GetAllLinks();
-            if (allLinks != null && allLinks.Count < 1)
+            var visualListHelper = GetVisualListHelper();
+            var allLinkList = visualListHelper.GetLinkList();
+            if (allLinkList != null && allLinkList.Count < 1)
             {
-                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝慨澶嶏紒");
+                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
                 return;
             }
             int count = 0;
-            foreach (var link in allLinks)
+            foreach (var link in allLinkList)
             {
-                var calcuLink = calcuResult.LinkList?.Find(x => x.Id == link.Code);
+                var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
                 if (calcuLink == null)
                 {
                     continue;
                 }
-                if (calcuLink.Flow < 0)
+                if (!calcuLink.CalcuFlow.HasValue)
+                {
+                    continue;
+                }
+                if (calcuLink.CalcuFlow.Value < 0)
                 {
                     var tempCode = link.StartCode;
                     link.StartCode = link.EndCode;
@@ -2398,9 +1954,10 @@
                     count++;
                 }
             }
-            UpdateVisualViewModelProperty();
+            var visualVmListHelper = await GetVisualVmListHelper();
+            visualVmListHelper.UpdateProperty();
             UpdateVisualListCtrl();
-            UpdateSelectedProperty();
+            UpdatePropertyCtrl();
             TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
         }
 
@@ -2412,7 +1969,7 @@
 
         #endregion
 
-        #region 瀵煎嚭INP鏂囦欢
+        #region 瀵煎嚭INP
 
         //瀵煎嚭INP鏂囦欢
         private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -2434,7 +1991,7 @@
 
         #endregion
 
-        #region 骞惰仈鍒嗘瀽
+        #region 骞惰仈璁$畻
 
         //骞惰仈鍒嗘瀽
         private void ParallelAnalysis()
@@ -2499,8 +2056,8 @@
                     }
                 });
                 var codes = list?.Select(x => x.Code).ToList();
-                UpdateVisualViewModelProperty(codes);
-                ShowSelectedProperty();
+                //UpdateVisualViewModelProperty(codes);
+                //ShowSelectedProperty();
                 UpdateVisualListCtrl();
                 return true;
             };
@@ -2517,269 +2074,452 @@
 
         #region 宸ュ喌璁$畻
 
-        //鎵�鏈夊伐鍐靛厓缁勫垪琛�
-        private Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult> _allWorkingTupleList = null;
+        //宸ュ喌鍏冪粍杈呭姪绫�
+        private SimulationWorkingTupleHelper _workingTupleHelper = null;
 
-
-
-
-
-
-
-        #region 宸ュ喌
-
-
-        //鏄剧ず宸ュ喌璁$畻绐椾綋
-        private void ShowWorkingCalcuDlg()
+        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
+        private SimulationWorkingTupleHelper GetWorkingTupleHelper()
         {
+            if (_workingTupleHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                _workingTupleHelper = new SimulationWorkingTupleHelper(visualListHelper);
+            }
+            return _workingTupleHelper;
+        }
+
+        //璁剧疆宸ュ喌绐椾綋
+        private async void CalcuWorking()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var workingTupleHelper = GetWorkingTupleHelper();
+            var allWorkingList = await workingTupleHelper.GetWorkingList();
+            var monitorValueHelper = GetMonitorValueHelper();
+            var allMonitorValueList = await monitorValueHelper.Get();
             var dlg = new SetHydroWorkingDlg();
-            dlg.HydroViewEvent += async (parter) =>
+            dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
+            dlg.HydroViewEvent += (visual) =>
             {
-                _selectedVisual = parter as Yw.Model.HydroVisualInfo;
-                if (_selectedVisual != null)
-                {
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
-                }
-                ShowSelectedProperty();
+                SelectVisual(visual, eVisualSource.Calcu);
             };
-            dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
+            dlg.HydroCalcuEvent += async (working) =>
             {
-                if (_hydroInfo == null)
+                var vmo = new HydroWorkingVmo();
+                vmo.ModelID = _hydroInfo.ID;
+                vmo.Name = working.Name;
+                vmo.WorkingInfo = JsonHelper.Object2Json(working.WorkingInfo);
+                vmo.MonitorInfo = JsonHelper.Object2Json(working.MonitorInfo);
+                vmo.SortCode = allWorkingList.Count < 1 ? 1 : allWorkingList.Max(x => x.SortCode) + 1;
+                vmo.Description = working.Description;
+                vmo.ID = await BLLFactory<Yw.BLL.HydroWorking>.Instance.Insert(vmo);
+                if (vmo.ID < 1)
                 {
+                    TipFormHelper.ShowError("鍒涘缓宸ュ喌澶辫触锛岃绠楀彇娑堬紒");
                     return;
                 }
-                _hydroInfo.UpdateWorkingInfo(workingInfo);
+
+                _hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
+
                 //鏍¢獙
-                _checkResult = _hydroInfo.Check();
-                if (!_checkResult.Succeed)
+                var 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);
-                _epaCalcuResult = netWork.CalcuMinorLoss();
-
-                WaitFormHelper.HideWaitForm();
-                if (_epaCalcuResult.Succeed)
-                {
-                    GetCalcuResultList(false);
-                    UpdateVisualViewModelProperty();
-                    UpdateVisualViewModelCalcuProperty();
-                    UpdateVisualListCtrl();
-                    UpdateSelectedProperty();
-                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_epaCalcuResult);
-                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+                    ShowCheckCtrl(checkResult);
+                    workingTupleHelper.AppendTuple(vmo, checkResult, null);
+                    SetUIWorking(vmo);
+                    TipFormHelper.ShowError("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
                 }
                 else
                 {
-                    ShowCalcuFailedCtrl();
-                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                    WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
+                    //await Task.Delay(3000);
+                    var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
+                    WaitFormHelper.HideWaitForm();
+                    workingTupleHelper.AppendTuple(vmo, checkResult, calcuResult);
+                    if (calcuResult.Succeed)
+                    {
+                        if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+                        {
+                            ShowCalcuWarningCtrl(calcuResult);
+                        }
+                        TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                    }
+                    else
+                    {
+                        ShowCalcuFailedCtrl(calcuResult);
+                        TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                    }
                 }
-                ApplyGradingResultList(false);
-                UpdateVisualListCtrl();
-                ShowSelectedProperty();
+                AppendUIWorking(vmo);
+                SetUIWorking(vmo);
             };
-            dlg.SetBindingData(_hydroInfo);
+
+            dlg.ShowDialog();
+        }
+
+        //宸ュ喌璁$畻
+        private void barBtnWorkingCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            CalcuWorking();
+        }
+
+        #endregion
+
+        #region 宸ュ喌鍒嗘瀽
+
+        #region 褰撳墠宸ュ喌
+
+        //褰撳墠宸ュ喌
+        private Yw.Vmo.HydroWorkingVmo _working = null;
+
+        //鑾峰彇妫�鏌ョ粨鏋�
+        private async Task<HydroCheckResult> GetCheckResult()
+        {
+            var workingTupleHelper = GetWorkingTupleHelper();
+            return await workingTupleHelper.GetCheckResult(_working);
+        }
+
+        //鑾峰彇璁$畻缁撴灉
+        private async Task<HydroCalcuResult> GetCalcuResult()
+        {
+            var workingTupleHelper = GetWorkingTupleHelper();
+            return await workingTupleHelper.GetCalcuResult(_working);
+        }
+
+        //鍒濆鍖朥I宸ュ喌鍒楄〃
+        private void InitialUIWorkingList(List<HydroWorkingVmo> allWorkingList)
+        {
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Clear();
+            if (allWorkingList != null && allWorkingList.Count > 0)
+            {
+                allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
+            }
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+        }
+
+        //澧炲姞UI宸ュ喌
+        private void AppendUIWorking(HydroWorkingVmo working)
+        {
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+        }
+
+        //璁剧疆UI宸ュ喌
+        private void SetUIWorking(HydroWorkingVmo working)
+        {
+            this.barEditCurrentWorking.EditValue = working;
+        }
+
+        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
+        private async void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
+        {
+            _working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
+            var calcuResult = await GetCalcuResult();
+
+            //璁$畻缁撴灉杈呭姪绫�
+            var calcuResultHelper = await GetCalcuResultHelper();
+            calcuResultHelper.InitialData(calcuResult);
+
+            //宸ュ喌鎺т欢
+            UpdateWorkingCtrl();
+            SelectWorkingCtrl(_working);
+
+            //鍙瑙嗗浘鍒楄〃
+            var visualVmListHelper = await GetVisualVmListHelper();
+            visualVmListHelper.UpdateCalcuProperty(calcuResult);
+
+            //璁$畻鏍囩
+            var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+            calcuResultLabelHelper.Set();
+
+        }
+
+        #endregion
+
+        #region 宸ュ喌鎺т欢
+
+        //宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl _workingCtrl = null;
+
+        //鑾峰彇宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl GetWorkingCtrl()
+        {
+            if (_workingCtrl == null)
+            {
+                _workingCtrl = new HydroWorkingTreeCtrl();
+                _workingCtrl.Dock = DockStyle.Fill;
+                _workingCtrl.HydroClickEvent += (working) =>
+                {
+                    SetUIWorking(working);
+                };
+            }
+            return _workingCtrl;
+        }
+
+        //宸ュ喌鎺т欢鏄惁鍙
+        private bool IsWorkingCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerRight.Controls.Count > 0)
+                    {
+                        if (this.controlContainerRight.Controls[0] is HydroWorkingTreeCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず宸ュ喌鎺т欢
+        private async void ShowWorkingCtrl()
+        {
+            var workingCtrl = GetWorkingCtrl();
+            if (!IsWorkingCtrlVisible)
+            {
+                this.controlContainerRight.Controls.Clear();
+                this.controlContainerRight.Controls.Add(workingCtrl);
+                this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlRight.Text = "宸ュ喌";
+                this.docPnlRight.Width = 300;
+            }
+            var workingTupleHelper = GetWorkingTupleHelper();
+            var allWorkingList = await workingTupleHelper.GetWorkingList();
+            workingCtrl.SetBindingData(allWorkingList);
+        }
+
+        //鏇存柊宸ュ喌鎺т欢
+        private async void UpdateWorkingCtrl()
+        {
+            if (!IsWorkingCtrlVisible)
+            {
+                return;
+            }
+            var workingTupleHelper = GetWorkingTupleHelper();
+            var allWorkingList = await workingTupleHelper.GetWorkingList();
+            var workingCtrl = GetWorkingCtrl();
+            workingCtrl.SetBindingData(allWorkingList);
+        }
+
+        //閫夋嫨宸ュ喌鎺т欢
+        private void SelectWorkingCtrl(HydroWorkingVmo working)
+        {
+            if (IsWorkingCtrlVisible)
+            {
+                var workingCtrl = GetWorkingCtrl();
+                workingCtrl.Select(working);
+            }
+        }
+
+        //宸ュ喌鍒楄〃鐐瑰嚮
+        private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowWorkingCtrl();
+        }
+
+        #endregion
+
+        #region 宸ュ喌璇勪及
+
+        //璇勪及
+        private async void Evaluate()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (_working == null)
+            {
+                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
+                return;
+            }
+            var workingTupleHelper = GetWorkingTupleHelper();
+            var checkResult = await workingTupleHelper.GetCheckResult(_working);
+            if (checkResult == null)
+            {
+                return;
+            }
+            if (!checkResult.Succeed)
+            {
+                ShowCheckCtrl(checkResult);
+                TipFormHelper.ShowWarn("妫�鏌ュけ璐ワ紝鍋滄璇勪及锛�");
+                return;
+            }
+            var calcuResult = await workingTupleHelper.GetCalcuResult(_working);
+            if (calcuResult == null)
+            {
+                return;
+            }
+            if (!calcuResult.Succeed)
+            {
+                ShowCalcuFailedCtrl(calcuResult);
+                TipFormHelper.ShowWarn("璁$畻澶辫触锛屽仠姝㈣瘎浼帮紒");
+                return;
+            }
+            if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+            {
+                ShowCalcuWarningCtrl(calcuResult);
+                TipFormHelper.ShowWarn("璇峰叧娉ㄨ鍛婁俊鎭紒");
+            }
+            var visualListHelper = GetVisualListHelper();
+            var allVisualDict = visualListHelper.GetVisualDict();
+            var monitorHelper = GetMonitorHelper();
+            var allMonitorList = await monitorHelper.Get();
+            var allWorkingMonitorList = JsonHelper.Json2Object<List<HydroWorkingMonitorViewModel>>(_working.MonitorInfo);
+            var allCalcuResultDict = calcuResult.GetVisualDict();
+            var dlg = new HydroWorkingEvaluationDlg();
+            dlg.SetBindingData(allVisualDict, allMonitorList, allWorkingMonitorList, allCalcuResultDict);
+            dlg.ShowDialog();
+        }
+
+        //绮惧害璇勪及
+        private void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            Evaluate();
+        }
+
+        #endregion
+
+        #region 宸ュ喌骞惰仈
+
+        //骞惰仈鍒嗘瀽
+        private async void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
+            {
+                return;
+            }
+
+            var calcuResultHelper = await GetCalcuResultHelper();
+            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;
+
+                var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
+                if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
+                {
+                    //var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+                    //if (calcuResult != null)
+                    //{
+                    //    if (calcuResult.CalcuFlow.HasValue)
+                    //    {
+                    //        vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
+                    //    }
+
+                    //    var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+                    //    var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+                    //    if (calcuResultStart != null && calcuResultEnd != null)
+                    //    {
+                    //        if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
+                    //        {
+                    //            vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
+                    //        }
+                    //    }
+                    //}
+                }
+
+            }
+
+            var dlg = new PumpParallelAnalyDlg();
+            dlg.SetBindingData(vmList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                list?.ForEach(x =>
+                {
+                    var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
+                    if (pump != null)
+                    {
+                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
+                        pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
+                    }
+                });
+                //ShowSelectedProperty();
+                return true;
+            };
             dlg.ShowDialog();
         }
 
         #endregion
 
+        #region 宸ュ喌鑳芥晥
 
-
-        #region 璁$畻缁撴灉
-
-        //鎵�鏈夎绠楃粨鏋滃垪琛�
-        private List<HydroCalcuVisualResult> _allCalcuResultList = null;
-
-        //鑾峰彇璁$畻缁撴灉
-        //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
-        private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
+        private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_epaCalcuResult == null)
-            {
-                return default;
-            }
-            if (!_epaCalcuResult.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 = _epaCalcuResult.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 = _epaCalcuResult.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;
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
         }
 
         #endregion
 
-        //姘村姏璁$畻
-        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        #region 鎹熷け鏇茬嚎
+
+        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowWorkingCalcuDlg();
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
         }
 
         #endregion
 
+        #region 鎹熷け姣斾緥
 
+        private void barBtnWorkingLossScale_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
 
+        #endregion
 
+        #region 缁煎悎鍒嗘瀽
+        private void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+        }
 
+        #endregion 
+
+        #endregion
 
 
 

--
Gitblit v1.9.3