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

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 1035 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 600 insertions(+), 435 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 0b09759..1037523 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,4 +1,5 @@
 锘縢lobal using Yw.EPAnet;
+using DevExpress.CodeParser;
 using DevExpress.Mvvm.Native;
 using DevExpress.Office.Utils;
 using DevExpress.Utils.Extensions;
@@ -7,10 +8,12 @@
 using DevExpress.XtraRichEdit.Layout;
 using DevExpress.XtraSpreadsheet.Commands;
 using HStation.WinFrmUI.PhartRelation;
+using NPOI.SS.Formula.Functions;
 using System.Diagnostics;
 using System.Windows.Media;
 using System.Windows.Media.Media3D;
 using Yw.Hydro;
+using Yw.Model;
 using Yw.Pump;
 using Yw.Vmo;
 using Yw.WinFrmUI.Bimface;
@@ -167,6 +170,314 @@
 
         #endregion
 
+        #region 鍙鍒楄〃
+
+        //鎵�鏈夊彲瑙嗗瓧鍏�
+        private Dictionary<string, HydroVisualInfo> _allVisualDict = null;
+
+        //鑾峰彇鍙瀛楀吀
+        private Dictionary<string, HydroVisualInfo> GetVisualDict()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allVisualDict == null)
+            {
+                _allVisualDict = new Dictionary<string, HydroVisualInfo>();
+                var allVisualList = _hydroInfo.GetAllVisuals();
+                allVisualList?.ForEach(x => _allVisualDict.Add(x.Code, x));
+            }
+            return _allVisualDict;
+        }
+
+        //鑾峰彇鍙鍒楄〃
+        private List<HydroVisualInfo> GetVisualList()
+        {
+            var allVisualDict = GetVisualDict();
+            return allVisualDict?.Values.ToList();
+        }
+
+        //鑾峰彇鑺傜偣鍒楄〃
+        private List<HydroNodeInfo> GetNodeList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            return _hydroInfo.GetAllNodes();
+        }
+
+        //鑾峰彇绠℃鍒楄〃
+        private List<HydroLinkInfo> GetLinkList()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            return _hydroInfo.GetAllLinks();
+        }
+
+        //鑾峰彇鍙鏋勪欢
+        private HydroVisualInfo GetVisual(string code)
+        {
+            var allVisualDict = GetVisualDict();
+            if (allVisualDict == null)
+            {
+                return default;
+            }
+            if (allVisualDict.ContainsKey(code))
+            {
+                return allVisualDict[code];
+            }
+            return default;
+        }
+
+        #endregion
+
+        #region 璁$畻缁撴灉
+
+        //璁$畻缁撴灉
+        private HydroCalcuResult _calcuResult = null;
+
+        //鑾峰彇璁$畻缁撴灉
+        private HydroCalcuResult GetCalcuResult(string calcuMode, bool needCalcuAgain = false)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (needCalcuAgain)
+            {
+                _calcuResult = _hydroInfo.Calcu(calcuMode);
+            }
+            if (_calcuResult == null)
+            {
+                _calcuResult = _hydroInfo.Calcu(calcuMode);
+            }
+            return _calcuResult;
+        }
+
+        //鑾峰彇鍙缁勪欢璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuVisualResult> GetCalcuVisualResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.GetVisualList();
+        }
+
+        //鑾峰彇鑺傜偣璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuNodeResult> GetCalcuNodeResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.NodeList;
+        }
+
+        //鑾峰彇绠℃璁$畻缁撴灉鍒楄〃
+        private List<HydroCalcuLinkResult> GetCalcuLinkResultList(string calcuMode, bool needCalcuAgain = false)
+        {
+            var calcuResult = GetCalcuResult(calcuMode, needCalcuAgain);
+            if (calcuResult == null)
+            {
+                return default;
+            }
+            if (!calcuResult.Succeed)
+            {
+                return default;
+            }
+            return calcuResult.LinkList;
+        }
+
+        //鎵�鏈夊彲瑙佽绠楀瓧鍏�
+        private Dictionary<string, HydroCalcuVisualResult> _allCalcuVisualDict = null;
+
+        //鑾峰彇鍙璁$畻瀛楀吀
+        private Dictionary<string, HydroCalcuVisualResult> GetCalcuVisualDict(string calcuMode, bool needCalcuAgain = false)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            var allCalcuVisualResultList = GetCalcuVisualResultList(calcuMode, needCalcuAgain);
+            if (needCalcuAgain)
+            {
+                _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
+                allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
+            }
+            if (_allCalcuVisualDict == null)
+            {
+                _allCalcuVisualDict = new Dictionary<string, HydroCalcuVisualResult>();
+                allCalcuVisualResultList?.ForEach(x => _allCalcuVisualDict.Add(x.Code, x));
+            }
+            return _allCalcuVisualDict;
+        }
+
+        //鑾峰彇鍙璁$畻缁撴灉
+        private HydroCalcuVisualResult GetCalcuVisualResult(string code, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
+        {
+            var allCalcuVisualDict = GetCalcuVisualDict(calcuMode, needCalcuAgain);
+            if (allCalcuVisualDict == null || allCalcuVisualDict.Count < 1)
+            {
+                return default;
+            }
+            if (allCalcuVisualDict.ContainsKey(code))
+            {
+                return allCalcuVisualDict[code];
+            }
+            return default;
+        }
+
+        //鑾峰彇鍙璁$畻缁撴灉
+        private HydroCalcuVisualResult GetCalcuVisualResult(Yw.Model.HydroVisualInfo visual, string calcuMode = Yw.EPAnet.CalcuMode.MinorLoss, bool needCalcuAgain = false)
+        {
+            return GetCalcuVisualResult(visual?.Code, calcuMode, needCalcuAgain);
+        }
+
+        #endregion
+
+        #region 鍙瑙嗗浘鍒楄〃
+
+        //鎵�鏈夊彲瑙佽鍥惧瓧鍏�
+        private Dictionary<string, HydroVisualViewModel> _allVisualViewModelDict = null;
+
+        //鑾峰彇鍙瑙嗗浘瀛楀吀
+        private Dictionary<string, HydroVisualViewModel> GetVisualViewModelDict()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allVisualViewModelDict == null)
+            {
+                _allVisualViewModelDict = new Dictionary<string, HydroVisualViewModel>();
+                var allVisualDict = GetVisualDict();
+                if (allVisualDict != null && allVisualDict.Count > 0)
+                {
+                    foreach (var visualKeyValue in allVisualDict)
+                    {
+                        var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(visualKeyValue.Value, _hydroInfo);
+                        var calcuVisualResult = GetCalcuVisualResult(visualKeyValue.Key);
+                        if (calcuVisualResult != null)
+                        {
+                            vm.UpdateCalcuProperty(calcuVisualResult);
+                        }
+                        _allVisualViewModelDict.Add(visualKeyValue.Key, vm);
+                    }
+                }
+            }
+            return _allVisualViewModelDict;
+        }
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            return allVisualViewModelDict?.Values.ToList();
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty()
+        {
+            var allVisualViewModelList = GetVisualViewModelList();
+            allVisualViewModelList?.ForEach(x => x.UpdateProperty());
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(string code)
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
+            {
+                if (allVisualViewModelDict.ContainsKey(code))
+                {
+                    allVisualViewModelDict[code].UpdateProperty();
+                }
+            }
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(List<string> codes)
+        {
+            codes?.ForEach(x => UpdateVisualViewModelProperty(x));
+        }
+
+        //鏇存柊鍙瑙嗗浘灞炴��
+        private void UpdateVisualViewModelProperty(List<HydroVisualInfo> visualList)
+        {
+            visualList?.ForEach(x => UpdateVisualViewModelProperty(x.Code));
+        }
+
+        //鏇存柊鍙瑙嗗浘璁$畻灞炴��
+        private void UpdateVisualViewModelCalcuProperty()
+        {
+            var allVisualViewModelDict = GetVisualViewModelDict();
+            if (allVisualViewModelDict != null && allVisualViewModelDict.Count > 0)
+            {
+                foreach (var visualViewModelKeyValue in allVisualViewModelDict)
+                {
+                    var calcuVisualResult = GetCalcuVisualResult(visualViewModelKeyValue.Key);
+                    if (calcuVisualResult != null)
+                    {
+                        visualViewModelKeyValue.Value.UpdateCalcuProperty(calcuVisualResult);
+                    }
+                }
+            }
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(string code)
+        {
+            if (string.IsNullOrEmpty(code))
+            {
+                return default;
+            }
+            var allVisualViewModelList = GetVisualViewModelList();
+            return allVisualViewModelList?.Find(x => x.Code == code);
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
+        {
+            return GetVisualViewModel(visual?.Code);
+        }
+
+        #endregion
+
+        #region 閫夋嫨鏋勪欢
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _selectedVisual = null;
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo SelectedVisual
+        {
+            get { return _selectedVisual; }
+            set
+            {
+
+                _selectedVisual = value;
+                this.barBtnSetMonitor.Enabled = _selectedVisual != null;
+            }
+        }
+
+
+        #endregion
+
         #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
@@ -179,40 +490,42 @@
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
-                _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
-                { //寮鸿皟杩炴帴缁勪欢
-                    if (string.IsNullOrEmpty(code))
+                _propertyCtrl.HydroViewEvent += (visual) =>
+                {
+                    if (visual == null)
                     {
                         return;
                     }
-                    if (string.IsNullOrEmpty(linkCode))
-                    {
-                        return;
-                    }
+                    _bimfaceCtrl?.ZoomToComponent(visual.Code);
+                };
+                _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
+                { //寮鸿皟杩炴帴鑺傜偣
                     if (_hydroInfo == null)
                     {
                         return;
                     }
-                    var allVisualList = _hydroInfo.GetAllVisuals();
-                    if (allVisualList == null || allVisualList.Count < 1)
+                    if (link == null)
                     {
                         return;
                     }
-                    var linkParter = allVisualList.Find(x => x.Code == linkCode);
-                    if (linkParter == null)
+                    if (string.IsNullOrEmpty(linkNodeCode))
+                    {
+                        return;
+                    }
+                    var linkNode = GetVisual(linkNodeCode);
+                    if (linkNode == null)
                     {
                         return;
                     }
                     var blinkCodes = new List<string>();
-                    if (linkParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
+                    if (linkNode.GetType() == typeof(HydroJunctionInfo))
                     {
-                        var allLinkList = _hydroInfo.GetAllLinks();
+                        var allLinkList = GetLinkList();
                         if (allLinkList == null || allLinkList.Count < 1)
                         {
                             return;
                         }
-                        var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code || x.EndCode == linkParter.Code) && x.Code != code).ToList();
+                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
                         if (linkList == null || linkList.Count < 1)
                         {
                             return;
@@ -221,21 +534,13 @@
                     }
                     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) =>
                 {
@@ -244,24 +549,24 @@
                         return;
                     }
                     UpdateVisualListCtrl();
-                    ApplyGradingResultList(visual);
+                    //ApplyGradingResultList(visual);
                 };
                 _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
                 {
                     //鏍囨敞灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
-                    UpdateMark(visual);
+                    //UpdateMark(visual);
                 };
                 _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
                 {
                     //鍒嗙骇灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
                 };
-                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
                 {
                     //娴佸悜灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    UpdateFlowEffect(visual);
+                    //UpdateFlowEffect(visual);
                 };
 
             }
@@ -339,6 +644,21 @@
             _propertyCtrl?.UpdateRows();
         }
 
+        //璁剧疆灞炴�ф帶浠�
+        private void SetPropertyCtrl(Yw.Model.HydroVisualInfo visual)
+        {
+            if (visual == null)
+            {
+
+            }
+        }
+
+        //鏇存柊灞炴�ф帶浠�
+        private void UpdatePropertyCtrl()
+        {
+            _propertyCtrl?.UpdateRows();
+        }
+
         #endregion
 
         #region 鑷姩鍖归厤
@@ -390,7 +710,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
+            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false));
             matchingListCtrl.SetBindingData(input);
             this.controlContainerBottom.Controls.Add(matchingListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -933,7 +1253,7 @@
             {
                 return;
             }
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             var vmList = new List<XhsSinglePumpViewModel>();
             foreach (var pump in _hydroInfo.Pumps)
             {
@@ -1381,7 +1701,7 @@
             }
             var allGradingList = await GetGradingList();
             var allGradingApplyList = GetGradingApplyList();
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             if (!useCache)
             {
                 _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
@@ -1435,7 +1755,7 @@
             var allGradingList = await GetGradingList();
             var allGradingApplyList = GetGradingApplyList();
             var allGradingResultList = await GetGradingResultList(true);
-            var allCalcuResultList = GetCalcuResultList(true);
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
             if (oldResult != null)
             {
@@ -1533,7 +1853,7 @@
             if (_allFlowEffectList == null)
             {
                 _allFlowEffectList = new List<LogicFlowEffect>();
-                var allCalcuResultList = GetCalcuResultList();
+                var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
                 if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
                 {
                     foreach (var parter in _hydroInfo.Pipes)
@@ -1656,7 +1976,7 @@
                 flowEffect.SpeedY = -0.1;
             }
 
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
             if (calcuResult != null)
             {
@@ -1676,165 +1996,6 @@
         {
             _isFlowEffectVisible = this.barCkFlowEffect.Checked;
             SetFlowEffect();
-        }
-
-        #endregion
-
-        #region 閫夋嫨鏋勪欢
-
-        //閫夋嫨鏋勪欢
-        private Yw.Model.HydroVisualInfo _selectedVisual = null;
-
-        //閫夋嫨鏋勪欢
-        private Yw.Model.HydroVisualInfo SelectedVisual
-        {
-            get { return _selectedVisual; }
-            set
-            {
-                _selectedVisual = value;
-                if (_selectedVisual == null)
-                {
-                    this.barBtnSetMonitor.Enabled = false;
-                }
-                else
-                {
-                    this.barBtnSetMonitor.Enabled = true;
-                }
-            }
-        }
-
-        #endregion
-
-        #region 鏋勪欢鏄庣粏
-
-        #region 鏋勪欢鍒楄〃
-
-        //鎵�鏈夋瀯浠惰鍥惧垪琛�
-        private List<HydroVisualViewModel> _allVisualViewModelList = null;
-
-        //鑾峰彇鏋勪欢瑙嗗浘鍒楄〃
-        private List<HydroVisualViewModel> GetVisualViewModelList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_allVisualViewModelList == null)
-            {
-                _allVisualViewModelList = new List<HydroVisualViewModel>();
-                var allVisualList = _hydroInfo.GetAllVisuals();
-                if (allVisualList != null && allVisualList.Count > 0)
-                {
-                    var allCalcuResultList = GetCalcuResultList();
-                    allVisualList.ForEach(x =>
-                    {
-                        var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(x, _hydroInfo);
-                        var calcuResult = allCalcuResultList?.Find(x => x.Code == x.Code);
-                        if (calcuResult != null)
-                        {
-                            vm.UpdateCalcuProperty(calcuResult);
-                        }
-                        _allVisualViewModelList.Add(vm);
-                    });
-                }
-            }
-            return _allVisualViewModelList;
-        }
-
-        //鏇存柊鍙瑙嗗浘灞炴��
-        private void UpdateVisualViewModelProperty()
-        {
-            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)
-            {
-                return;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
-            {
-                allVisualViewModelList.ForEach(x =>
-                {
-                    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);
-                        }
-                    });
-                }
-            }
-        }
-
-        //鑾峰彇鏋勪欢瑙嗗浘
-        private HydroVisualViewModel GetVisualViewModel(string code)
-        {
-            if (string.IsNullOrEmpty(code))
-            {
-                return default;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            return allVisualViewModelList?.Find(x => x.Code == code);
-        }
-
-        //鑾峰彇鍙瑙嗗浘
-        private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
-        {
-            if (visual == null)
-            {
-                return default;
-            }
-            var allVisualViewModelList = GetVisualViewModelList();
-            return allVisualViewModelList?.Find(x => x.Code == visual.Code);
         }
 
         #endregion
@@ -1900,7 +2061,7 @@
             var visualListCtrl = GetVisualListCtrl();
             var allVisualViewModelList = GetVisualViewModelList();
             visualListCtrl.SetBindingData(allVisualViewModelList);
-            var allCalcuResultList = GetCalcuResultList();
+            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
             if (allCalcuResultList == null || allCalcuResultList.Count < 1)
             {
                 visualListCtrl.SetNormalView();
@@ -1931,8 +2092,6 @@
         {
             ShowVisualListCtrl();
         }
-
-        #endregion
 
         #endregion
 
@@ -2175,8 +2334,6 @@
 
         #endregion
 
-        #region 姘村姏妫�鏌�
-
         #region 妫�鏌ョ粨鏋�
 
         //妫�鏌ョ粨鏋滅紦瀛�
@@ -2260,41 +2417,10 @@
             this.docPnlBottom.Height = 350;
         }
 
-        #endregion
-
         //妫�鏌�
         private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             ShowCheckCtrl(true);
-        }
-
-        #endregion
-
-        #region EPA璁$畻缁撴灉
-
-        //EPA璁$畻缁撴灉
-        private Yw.EPAnet.CalcuResult _epaCalcuResult = null;
-
-        //鑾峰彇EPA璁$畻缁撴灉
-        //CalcuMode 鍦� Yw.EPANet.Calcu.Core 涓畾涔�
-        //NeedCalcuAgain 鏄惁闇�瑕侀噸鏂拌绠�
-        private Yw.EPAnet.CalcuResult GetEpaCalcuResult(string calcuMode, bool needCalcuAgain = false)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (needCalcuAgain)
-            {
-                var network = _hydroInfo.ToNetwork();
-                _epaCalcuResult = network.Calcu(calcuMode);
-            }
-            if (_epaCalcuResult == null)
-            {
-                var network = _hydroInfo.ToNetwork();
-                _epaCalcuResult = network.Calcu(calcuMode);
-            }
-            return _epaCalcuResult;
         }
 
         #endregion
@@ -2316,7 +2442,7 @@
         }
 
         //鏄剧ず璁$畻澶辫触鎺т欢
-        private void ShowCalcuFailedCtrl(Yw.EPAnet.CalcuResult calcuResult)
+        private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
         {
             if (_hydroInfo == null)
             {
@@ -2330,6 +2456,7 @@
             {
                 return;
             }
+
             var calcuFailedCtrl = GetCalcuFailedCtrl();
             calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
             this.controlContainerBottom.Controls.Clear();
@@ -2342,9 +2469,8 @@
         //鏄剧ず璁$畻澶辫触鎺т欢
         private void ShowCalcuFailedCtrl()
         {
-            ShowCalcuFailedCtrl(_epaCalcuResult);
+            ShowCalcuFailedCtrl(_calcuResult);
         }
-
 
         #endregion
 
@@ -2365,32 +2491,39 @@
             if (!checkResult.Succeed)
             {
                 ShowCheckCtrl(false);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄淇锛�");
+                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 == null)
+            {
+                return;
+            }
+            if (!calcuResult.Succeed)
             {
                 ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝慨澶嶏紒");
+                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
                 return;
             }
-
             var allLinks = _hydroInfo.GetAllLinks();
             if (allLinks != null && allLinks.Count < 1)
             {
-                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝慨澶嶏紒");
+                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
                 return;
             }
             int count = 0;
             foreach (var link in allLinks)
             {
-                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;
@@ -2517,20 +2650,8 @@
 
         #region 宸ュ喌璁$畻
 
-        //鎵�鏈夊伐鍐靛垪琛�
-        private List<HydroWorkingVmo> _allWorkingList = null;
-
         //鎵�鏈夊伐鍐靛厓缁勫垪琛�
-        private Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult> _allWorkingTupleList = null;
-
-
-
-
-
-
-
-        #region 宸ュ喌
-
+        private List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>> _allWorkingTupleList = new List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>();
 
         //鏄剧ず宸ュ喌璁$畻绐椾綋
         private void ShowWorkingCalcuDlg()
@@ -2551,11 +2672,27 @@
                 {
                     return;
                 }
+                var vmo = new HydroWorkingVmo();
+                vmo.ModelID = _hydroInfo.ID;
+                vmo.Name = working.Name;
+                vmo.WorkingInfo = JsonHelper.Object2Json(working.WorkingInfo);
+                vmo.MonitorInfo = JsonHelper.Object2Json(working.MonitorInfo);
+                vmo.SortCode = _allWorkingList.Count < 1 ? 1 : _allWorkingList.Max(x => x.SortCode) + 1;
+                vmo.Description = working.Description;
+                vmo.ID = await BLLFactory<Yw.BLL.HydroWorking>.Instance.Insert(vmo);
+                if (vmo.ID < 1)
+                {
+                    TipFormHelper.ShowError("鍒涘缓宸ュ喌澶辫触锛岃绠楀彇娑堬紒");
+                    return;
+                }
+                _allWorkingList.Add(vmo);
+
                 _hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
                 //鏍¢獙
                 _checkResult = _hydroInfo.Check();
                 if (!_checkResult.Succeed)
                 {
+                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, null));
                     ShowCheckCtrl();
                     TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
                     return;
@@ -2565,19 +2702,18 @@
 
 
                 //await Task.Delay(5000);
+                _calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
 
-                var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-                _epaCalcuResult = netWork.CalcuMinorLoss();
 
                 WaitFormHelper.HideWaitForm();
-                if (_epaCalcuResult.Succeed)
+                if (_calcuResult.Succeed)
                 {
-                    GetCalcuResultList(false);
+                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, _calcuResult));
                     UpdateVisualViewModelProperty();
                     UpdateVisualViewModelCalcuProperty();
                     UpdateVisualListCtrl();
                     UpdateSelectedProperty();
-                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_epaCalcuResult);
+                    await _bimfaceCtrl?.SetLogicCalcuCustomLabelsCalcuResult(_calcuResult);
                     TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
                     var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
@@ -2595,182 +2731,6 @@
             dlg.ShowDialog();
         }
 
-        #endregion
-
-
-
-        #region 璁$畻缁撴灉
-
-        //鎵�鏈夎绠楃粨鏋滃垪琛�
-        private List<HydroCalcuVisualResult> _allCalcuResultList = null;
-
-        //鑾峰彇璁$畻缁撴灉
-        //true 浣跨敤缂撳瓨锛宖alse 涓嶄娇鐢ㄧ紦瀛�
-        private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
-        {
-            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;
-        }
-
-        #endregion
-
         //姘村姏璁$畻
         private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
@@ -2779,9 +2739,214 @@
 
         #endregion
 
+        #region 褰撳墠宸ュ喌
+
+        //褰撳墠宸ュ喌
+        private Yw.Vmo.HydroWorkingVmo _currentWorking = null;
+
+        //鍒濆鍖栧綋鍓嶅伐鍐�
+        private void InitialCurrentWorking(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.barEditCurrentWorking.EditValue = allWorkingList.Last();
+            }
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+        }
+
+        //澧炲姞褰撳墠宸ュ喌
+        private void AppendCurrentWorking(HydroWorkingVmo working)
+        {
+            this.repositoryItemImageComboBox1.Items.BeginUpdate();
+            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
+            this.repositoryItemImageComboBox1.Items.EndUpdate();
+            this.barEditCurrentWorking.EditValue = working;
+        }
+
+        //璁剧疆褰撳墠宸ュ喌
+        private void SetCurrentWorking(HydroWorkingVmo working)
+        {
+            _currentWorking = working;
+        }
+
+        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
+        private void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
+        {
+            var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
+            SetCurrentWorking(working);
+        }
+
+
+        #endregion
+
+        #region 宸ュ喌鍒楄〃
+
+        //鎵�鏈夊伐鍐靛垪琛�
+        private List<HydroWorkingVmo> _allWorkingList = null;
+
+        //鍒濆鍖栧伐鍐靛垪琛�
+        private async void InitialWorkingList()
+        {
+            _allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(_hydroInfo.ID);
+            if (_allWorkingList == null)
+            {
+                _allWorkingList = new List<HydroWorkingVmo>();
+            }
+        }
 
 
 
+        ////鑾峰彇灞炴�ф帶浠�
+        //private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+        //{
+        //    if (_propertyCtrl == null)
+        //    {
+        //        _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
+        //        _propertyCtrl.Dock = DockStyle.Fill;
+        //        _propertyCtrl.HydroViewEvent += (visual) =>
+        //        {
+        //            if (visual == null)
+        //            {
+        //                return;
+        //            }
+        //            _bimfaceCtrl?.ZoomToComponent(visual.Code);
+        //        };
+        //        _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
+        //        { //寮鸿皟杩炴帴鑺傜偣
+        //            if (_hydroInfo == null)
+        //            {
+        //                return;
+        //            }
+        //            if (link == null)
+        //            {
+        //                return;
+        //            }
+        //            if (string.IsNullOrEmpty(linkNodeCode))
+        //            {
+        //                return;
+        //            }
+        //            var linkNode = GetVisual(linkNodeCode);
+        //            if (linkNode == null)
+        //            {
+        //                return;
+        //            }
+        //            var blinkCodes = new List<string>();
+        //            if (linkNode.GetType() == typeof(HydroJunctionInfo))
+        //            {
+        //                var allLinkList = GetLinkList();
+        //                if (allLinkList == null || allLinkList.Count < 1)
+        //                {
+        //                    return;
+        //                }
+        //                var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
+        //                if (linkList == null || linkList.Count < 1)
+        //                {
+        //                    return;
+        //                }
+        //                blinkCodes.AddRange(linkList.Select(x => x.Code));
+        //            }
+        //            else
+        //            {
+        //                blinkCodes.Add(linkNodeCode);
+        //            }
+
+        //            await _bimfaceCtrl?.ClearBlinkComponents();
+        //            await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
+        //            await Task.Delay(5000);
+        //            await _bimfaceCtrl?.ClearBlinkComponents();
+        //        };
+        //        _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+        //        {
+        //            if (visual == null)
+        //            {
+        //                return;
+        //            }
+        //            UpdateVisualListCtrl();
+        //            //ApplyGradingResultList(visual);
+        //        };
+        //        _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+        //        {
+        //            //鏍囨敞灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+        //            //UpdateMark(visual);
+        //        };
+        //        _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+        //        {
+        //            //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+        //        };
+        //        _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
+        //        {
+        //            //娴佸悜灞炴�у彂鐢熸敼鍙�
+        //            //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
+        //            //UpdateFlowEffect(visual);
+        //        };
+
+        //    }
+        //    return _propertyCtrl;
+        //}
+
+        ////灞炴�ф帶浠舵槸鍚﹀彲瑙�
+        //private bool IsPropertyCtrlVisible
+        //{
+        //    get
+        //    {
+        //        if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+        //        {
+        //            if (this.controlContainerRight.Controls.Count > 0)
+        //            {
+        //                if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+        //                {
+        //                    return true;
+        //                }
+        //            }
+        //        }
+        //        return false;
+        //    }
+        //}
+
+        ////鏄剧ず灞炴�ф帶浠�
+        //private void ShowPropertyCtrl()
+        //{
+        //    if (IsPropertyCtrlVisible)
+        //    {
+        //        return;
+        //    }
+        //    var propertyCtrl = GetPropertyCtrl();
+        //    this.controlContainerRight.Controls.Clear();
+        //    this.controlContainerRight.Controls.Add(propertyCtrl);
+        //    this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+        //    this.docPnlRight.Text = "灞炴��";
+        //    this.docPnlRight.Width = 300;
+        //}
+
+        private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+
+        }
+
+        #endregion
+
+        #region 宸ュ喌鎺т欢
+
+        //宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl _workingCtrl = null;
+
+        //鑾峰彇宸ュ喌鎺т欢
+        private HydroWorkingTreeCtrl GetWorkingCtrl()
+        {
+            if (_workingCtrl == null)
+            {
+                _workingCtrl = new HydroWorkingTreeCtrl();
+                _workingCtrl.Dock = DockStyle.Fill;
+            }
+            return _workingCtrl;
+        }
+
+        #endregion
 
 
 

--
Gitblit v1.9.3