From adf7734a40dec76fc31590906eeadd02c782db90 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 08 十一月 2024 21:29:59 +0800
Subject: [PATCH] 优化导入,优化水流动画

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 1050 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 943 insertions(+), 107 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 832ba33..813ad8e 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
@@ -28,9 +28,9 @@
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
 
-        private Yw.Model.HydroParterInfo _parter = null;
-        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;
-        private Yw.EPAnet.CalcuResult _calcuResult = null;
+
+        private Yw.WinFrmUI.HydroCheckResult _checkResult = null;//妫�鏌ョ粨鏋�
+        private Yw.EPAnet.CalcuResult _calcuResult = null;//璁$畻缁撴灉
 
         /// <summary>
         /// 缁戝畾鏁版嵁
@@ -78,6 +78,7 @@
 
         }
 
+
         #region Bimface
 
         //bimface鎺т欢
@@ -97,6 +98,7 @@
                     {
                         return;
                     }
+                    ApplyGrading();
                 };
                 _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
@@ -104,7 +106,7 @@
                     {
                         return;
                     }
-                    _parter = obj;
+                    _selectedParter = obj;
                     ShowProperty();
                 };
             }
@@ -117,6 +119,11 @@
             var bimfaceCtrl = await GetBimfaceCtrl();
             this.tabPageBimface.Controls.Clear();
             this.tabPageBimface.Controls.Add(bimfaceCtrl);
+        }
+
+        private void SelectBimfaceParter()
+        {
+
         }
 
         #endregion
@@ -141,7 +148,7 @@
                         return;
                     }
                     var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
+                    _selectedParter = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
                     ShowProperty();
                 };
             }
@@ -219,6 +226,42 @@
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
+
+                _propertyCtrl.ViewParterEvent += (parter) =>
+                {
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    _bimfaceCtrl?.ZoomToComponent(parter.Code);
+                };
+                _propertyCtrl.PropertyValueChangedEvent += (parter) =>
+                {
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    UpdateParterListProperty(parter);
+                    AutoApplyGrading();
+                };
+                _propertyCtrl.MarkPropertyValueChangedEvent += (parter) =>
+                {
+                    //鏍囨敞灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
+                };
+                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                {
+                    //鍒嗙骇灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                };
+                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (parter) =>
+                {
+                    //娴佸悜灞炴�у彂鐢熸敼鍙�
+                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
+                    UpdateFlowEffect(parter);
+                    //await _bimfaceCtrl?.UnloadFlowEffectById(parter.Code);
+                };
+
             }
             return _propertyCtrl;
         }
@@ -234,12 +277,6 @@
             this.docPnlRight.Width = 300;
         }
 
-        //灞炴�ч潰鏉挎寜閽�
-        private void barBtnProperty_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowPropertyCtrl();
-        }
-
         //鏄剧ず灞炴��
         private void ShowProperty()
         {
@@ -251,22 +288,120 @@
             {
                 ShowPropertyCtrl();
             }
-            if (_parter == null)
+            if (_selectedParter == null)
             {
-                _propertyCtrl?.SelectParter(null);
+                _propertyCtrl?.CancelSelectParter();
                 return;
             }
-            _propertyCtrl?.SelectParter(_parter.Code);
+            _propertyCtrl?.SelectParter(_selectedParter.Code);
 
             var allCalcuResultList = GetCalcuResultList();
             if (allCalcuResultList != null && allCalcuResultList.Count > 0)
             {
-                var calcuResult = allCalcuResultList.Find(x => x.Code == _parter.Code);
+                var calcuResult = allCalcuResultList.Find(x => x.Code == _selectedParter.Code);
                 if (calcuResult != null)
                 {
                     _propertyCtrl?.UpdateCalcuProperty(calcuResult);
                 }
             }
+        }
+
+        #endregion
+
+        #region 閫夋嫨鏋勪欢
+
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroParterInfo _selectedParter = null;
+
+        //鏇存柊閫夋嫨缁勪欢灞炴��
+        private void UpdateSelectedParterProperty()
+        {
+            if (_selectedParter == null)
+            {
+                return;
+            }
+            _propertyCtrl?.UpdateProperty();
+        }
+
+        //鏇存柊閫夋嫨缁勪欢璁$畻灞炴��
+        private void UpdateSelectedParterCalcuProperty()
+        {
+            if (_selectedParter == null)
+            {
+                return;
+            }
+            var allCalcuResultList = GetCalcuResultList();
+            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
+            {
+                return;
+            }
+            var calcuResult = allCalcuResultList.Find(x => x.Code == _selectedParter.Code);
+            if (calcuResult == null)
+            {
+                return;
+            }
+            _propertyCtrl?.UpdateCalcuProperty(calcuResult);
+        }
+
+        //鏇存柊鏋勪欢鍒楄〃灞炴��
+        private void UpdateParterListProperty()
+        {
+            if (this.docPnlBottom.Visibility != DevExpress.XtraBars.Docking.DockVisibility.Visible)
+            {
+                return;
+            }
+            var parterListCtrl = this.controlContainerBottom.Controls[0] as Yw.WinFrmUI.HydroParterListCtrl;
+            if (parterListCtrl == null)
+            {
+                return;
+            }
+            parterListCtrl.UpdateProperty();
+        }
+
+        //鏇存柊鏋勪欢鍒楄〃灞炴��
+        private void UpdateParterListProperty(Yw.Model.HydroParterInfo parter)
+        {
+            if (this.docPnlBottom.Visibility != DevExpress.XtraBars.Docking.DockVisibility.Visible)
+            {
+                return;
+            }
+            var parterListCtrl = this.controlContainerBottom.Controls[0] as Yw.WinFrmUI.HydroParterListCtrl;
+            if (parterListCtrl == null)
+            {
+                return;
+            }
+            parterListCtrl.UpdateProperty(parter);
+        }
+
+        //鏇存柊鏋勪欢鍒楄〃灞炴��
+        private void UpdateParterListProperty(List<Yw.Model.HydroParterInfo> parterList)
+        {
+            if (this.docPnlBottom.Visibility != DevExpress.XtraBars.Docking.DockVisibility.Visible)
+            {
+                return;
+            }
+            var parterListCtrl = this.controlContainerBottom.Controls[0] as Yw.WinFrmUI.HydroParterListCtrl;
+            if (parterListCtrl == null)
+            {
+                return;
+            }
+            parterListCtrl.UpdateProperty(parterList);
+        }
+
+        //鏇存柊鏋勪欢鍒楄〃璁$畻灞炴��
+        private void UpdateParterListCalcuProperty()
+        {
+            if (this.docPnlBottom.Visibility != DevExpress.XtraBars.Docking.DockVisibility.Visible)
+            {
+                return;
+            }
+            var parterListCtrl = this.controlContainerBottom.Controls[0] as Yw.WinFrmUI.HydroParterListCtrl;
+            if (parterListCtrl == null)
+            {
+                return;
+            }
+            var allCalcuResultList = GetCalcuResultList();
+            parterListCtrl.UpdateCalcuProperty(allCalcuResultList);
         }
 
         #endregion
@@ -287,11 +422,11 @@
                         return;
                     }
                     var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == code);
+                    _selectedParter = allParterList?.Find(x => x.Code == code);
                     var elementIds = new List<string>();
-                    if (_parter != null)
+                    if (_selectedParter != null)
                     {
-                        elementIds.Add(_parter.Code);
+                        elementIds.Add(_selectedParter.Code);
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                     ShowProperty();
@@ -350,7 +485,7 @@
                         return;
                     }
                     var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == parter.Code);
+                    _selectedParter = allParterList?.Find(x => x.Code == parter.Code);
                     var elementIds = new List<string>() { parter.Code };
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                     ShowProperty();
@@ -359,7 +494,7 @@
                 {
                     var codes = parters?.Select(x => x.Code).Distinct().ToList();
                     await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _parter = null;
+                    _selectedParter = null;
                     ShowProperty();
                 };
             }
@@ -388,8 +523,11 @@
 
         #region 涓�閿樉闅�
 
+        //鏄鹃殣缂栫爜鍒楄〃
+        private List<string> _fastShowHiddenCodeList = null;
+
         //涓�閿樉闅�
-        private async Task FastShowHidden()
+        private async void FastShowHidden()
         {
             if (_hydroInfo == null)
             {
@@ -411,13 +549,10 @@
             }
         }
 
-        //鏄鹃殣缂栫爜鍒楄〃
-        private List<string> _fastShowHiddenCodeList = null;
-
         //瑙﹀彂涓�閿樉闅�
-        private async void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            await FastShowHidden();
+            FastShowHidden();
         }
 
         #endregion
@@ -443,15 +578,15 @@
                     var elementIds = new List<string>();
                     if (string.IsNullOrEmpty(code))
                     {
-                        _parter = null;
+                        _selectedParter = null;
                     }
                     else
                     {
                         var allParterList = _hydroInfo.GetAllParters();
-                        _parter = allParterList?.Find(x => x.Code == code);
-                        if (_parter != null)
+                        _selectedParter = allParterList?.Find(x => x.Code == code);
+                        if (_selectedParter != null)
                         {
-                            elementIds.Add(_parter.Code);
+                            elementIds.Add(_selectedParter.Code);
                         }
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
@@ -536,14 +671,14 @@
                 _parterListCtrl.Dock = DockStyle.Fill;
                 _parterListCtrl.HydroClickEvent += async (parter) =>
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllParters();
-                    _parter = allParterList?.Find(x => x.Code == parter.Code);
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _parter.Code });
+                    _selectedParter = parter;
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedParter.Code);
                     ShowProperty();
+                };
+                _parterListCtrl.HydroChangedEvent += (parterList) =>
+                {
+                    UpdateSelectedParterProperty();
+                    AutoApplyGrading();
                 };
             }
             return _parterListCtrl;
@@ -556,8 +691,17 @@
             {
                 return;
             }
+            var allCalcuResultList = GetCalcuResultList();
             var parterListCtrl = GetParterListCtrl();
-            parterListCtrl.SetBindingData(_hydroInfo, GetCalcuResultList());
+            parterListCtrl.SetBindingData(_hydroInfo, allCalcuResultList);
+            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
+            {
+                parterListCtrl.SetNormalView();
+            }
+            else
+            {
+                parterListCtrl.SetCalcuView();
+            }
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(parterListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -603,14 +747,14 @@
             //姘村簱
             this.barBtnSetReservoirList.ItemClick += delegate
             {
-                var dlg = new HydroReservoirBulkSetListDlg();
-                dlg.ShowDialog();
+                //var dlg = new HydroReservoirBulkSetListDlg();
+                //dlg.ShowDialog();
             };
             //姘存睜
             this.barBtnSetTankList.ItemClick += delegate
             {
-                var dlg = new HydroTankBulkSetListDlg();
-                dlg.ShowDialog();
+                //var dlg = new HydroTankBulkSetListDlg();
+                //dlg.ShowDialog();
             };
             //姘寸
             this.barBtnSetWaterboxList.ItemClick += delegate
@@ -619,15 +763,29 @@
                 {
                     return;
                 }
-                var dlg = new HydroWaterboxBulkSetListDlg();
+                var dlg = new SetHydroWaterboxListDlg();
                 dlg.SetBindingData(_hydroInfo);
+                dlg.HydroClickEvent += async (obj) =>
+                {
+                    if (obj == null)
+                    {
+                        return;
+                    }
+                    _selectedParter = obj;
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                    ShowProperty();
+                };
+                dlg.HydroChangedEvent += (obj) =>
+                {
+
+                };
                 dlg.ShowDialog();
             };
             //杩炴帴鑺傜偣
             this.barBtnSetJunctionList.ItemClick += delegate
             {
-                var dlg = new HydroJunctionBulkSetListDlg();
-                dlg.ShowDialog();
+                //var dlg = new HydroJunctionBulkSetListDlg();
+                //dlg.ShowDialog();
             };
             //闂峰ご
             this.barBtnSetBluntheadList.ItemClick += delegate
@@ -636,7 +794,22 @@
                 {
                     return;
                 }
-                var dlg = new HydroBluntheadBulkSetListDlg();
+                var dlg = new SetHydroBluntheadListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.HydroClickEvent += async (obj) =>
+                {
+                    if (obj == null)
+                    {
+                        return;
+                    }
+                    _selectedParter = obj;
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                    ShowProperty();
+                };
+                dlg.HydroChangedEvent += (obj) =>
+                {
+
+                };
                 dlg.ShowDialog();
             };
             //寮ご
@@ -646,8 +819,22 @@
                 {
                     return;
                 }
-                var dlg = new HydroElbowBulkSetListDlg();
+                var dlg = new SetHydroElbowListDlg();
                 dlg.SetBindingData(_hydroInfo);
+                dlg.HydroClickEvent += async (obj) =>
+                {
+                    if (obj == null)
+                    {
+                        return;
+                    }
+                    _selectedParter = obj;
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
+                    ShowProperty();
+                };
+                dlg.HydroChangedEvent += (obj) =>
+                {
+
+                };
                 dlg.ShowDialog();
             };
             //涓夐��
@@ -657,7 +844,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroThreelinkBulkSetListDlg();
+                var dlg = new SetHydroThreelinkListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -668,7 +855,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroFourlinkBulkSetListDlg();
+                var dlg = new SetHydroFourlinkListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -679,7 +866,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroMeterBulkSetListDlg();
+                var dlg = new SetHydroMeterListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -690,7 +877,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroFlowmeterBulkSetListDlg();
+                var dlg = new SetHydroFlowmeterListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -701,7 +888,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroPressmeterBulkSetListDlg();
+                var dlg = new SetHydroPressmeterListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -712,7 +899,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroPipeBulkSetListDlg();
+                var dlg = new SetHydroPipeListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -723,7 +910,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroPumpBulkSetListDlg();
+                var dlg = new SetHydroPumpListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -734,7 +921,7 @@
                 {
                     return;
                 }
-                var dlg = new HydroValveBulkSetListDlg();
+                var dlg = new SetHydroValveListDlg();
                 dlg.SetBindingData(_hydroInfo);
                 dlg.ShowDialog();
             };
@@ -1058,10 +1245,10 @@
             dlg.SetBindingData(_hydroInfo);
             dlg.HydroViewEvent += async (parter) =>
             {
-                _parter = parter;
-                if (_parter != null)
+                _selectedParter = parter;
+                if (_selectedParter != null)
                 {
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _parter.Code });
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedParter.Code });
                 }
                 ShowProperty();
             };
@@ -1083,7 +1270,8 @@
 
                 WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
 
-                await Task.Delay(5000);
+
+                //await Task.Delay(5000);
 
                 var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
                 _calcuResult = netWork.Calcu();
@@ -1102,6 +1290,65 @@
                 }
 
             };
+            dlg.ShowDialog();
+        }
+
+        //鏄剧ず宸ュ喌璁$畻绐椾綋
+        private void ShowWorkingCalcuDlg()
+        {
+            var dlg = new SetHydroWorkingInfoDlg();
+            dlg.HydroViewEvent += async (parter) =>
+            {
+                _selectedParter = parter;
+                if (_selectedParter != null)
+                {
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedParter.Code });
+                }
+                ShowProperty();
+            };
+            dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                _hydroInfo.UpdateWorkingInfo(workingInfo);
+                //鏍¢獙
+                _checkResult = _hydroInfo.Check();
+                if (!_checkResult.Succeed)
+                {
+                    ShowCheckCtrl();
+                    TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    return;
+                }
+
+                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
+
+
+                await Task.Delay(5000);
+
+                var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
+                _calcuResult = netWork.Calcu();
+
+                WaitFormHelper.HideWaitForm();
+                if (_calcuResult.Succeed)
+                {
+                    GetCalcuResultList(false);
+                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
+                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
+                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
+                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
+                }
+                else
+                {
+                    ShowCalcuFailedCtrl();
+                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
+                }
+                AutoApplyGrading();
+                UpdateParterListProperty();
+                ShowProperty();
+            };
+            dlg.SetBindingData(_hydroInfo);
             dlg.ShowDialog();
         }
 
@@ -1324,7 +1571,8 @@
         //姘村姏璁$畻
         private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowCalcuPrefixDlg();
+            //ShowCalcuPrefixDlg();
+            ShowWorkingCalcuDlg();
         }
 
         #endregion
@@ -1332,17 +1580,31 @@
         #region 鏋勪欢鏌ヨ
 
         //鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl _searchCtrl = null;
+        private HydroParterSearchListCtrl _searchCtrl = null;
 
         //鑾峰彇鏌ヨ缁勪欢
-        private XhsProjectSimulationSearchCtrl GetSearchCtrl()
+        private HydroParterSearchListCtrl GetSearchCtrl()
         {
             if (_searchCtrl == null)
             {
-                _searchCtrl = new XhsProjectSimulationSearchCtrl();
+                _searchCtrl = new HydroParterSearchListCtrl();
                 _searchCtrl.Dock = DockStyle.Fill;
                 _searchCtrl.InitialData(() => _hydroInfo);
-                _searchCtrl.ApplySearchEvent += async (list) =>
+                _searchCtrl.HydroClickEvent += async (parter) =>
+                {
+                    if (_hydroInfo == null)
+                    {
+                        return;
+                    }
+                    if (parter == null)
+                    {
+                        return;
+                    }
+                    _selectedParter = parter;
+                    await _bimfaceCtrl?.ZoomAndSelectComponent(parter.Code);
+                    ShowProperty();
+                };
+                _searchCtrl.HydroSearchEvent += async (list) =>
                 {
                     if (_hydroInfo == null)
                     {
@@ -1351,14 +1613,12 @@
                     var elementIds = new List<string>();
                     if (list != null && list.Count > 0)
                     {
-                        var first = list.First();
-                        var allParterList = _hydroInfo.GetAllParters();
-                        _parter = allParterList?.Find(x => x.Code == first.Code);
+                        _selectedParter = list.First();
                         list.ForEach(x => elementIds.Add(x.Code));
                     }
                     else
                     {
-                        _parter = null;
+                        _selectedParter = null;
                     }
                     await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
                     ShowProperty();
@@ -1368,13 +1628,14 @@
         }
 
         //鏄剧ず鏌ヨ鎺т欢
-        private void ShowSearchCtrl()
+        private void ShowSearchCtrl(string content)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
             var searchCtrl = GetSearchCtrl();
+            searchCtrl.SetBindingData(content);
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(searchCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -1382,10 +1643,36 @@
             this.docPnlBottom.Height = 350;
         }
 
+        //鏄剧ず鏌ヨ绐椾綋
+        private void ShowSearchDlg()
+        {
+            if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+            {
+                if (this.controlContainerBottom.Controls.Count > 0)
+                {
+                    if (this.controlContainerBottom.Controls[0] is HydroParterSearchListCtrl)
+                    {
+                        return;
+                    }
+                }
+            }
+            var dlg = new InputHydroParterSearchListDlg();
+            dlg.SearchEvent += (content) =>
+            {
+                if (string.IsNullOrEmpty(content))
+                {
+                    return;
+                }
+                ShowSearchCtrl(content);
+            };
+            dlg.SetBindingData();
+            dlg.ShowDialog();
+        }
+
         //鏌ヨ
         private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSearchCtrl();
+            ShowSearchDlg();
         }
 
         #endregion
@@ -1979,9 +2266,9 @@
             {
                 _allGradingList = list;
             };
-            dlg.ApplyDataEvent += () =>
+            dlg.ApplyDataEvent += (catalog, propName) =>
             {
-                ShowApplyGradingDlg();
+                ApplyGrading(catalog, propName);
             };
             dlg.ShowDialog();
         }
@@ -2037,9 +2324,6 @@
             return _allGradingApplyList;
         }
 
-        //棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
-        private List<HydroGradingApplyResultViewModel> _allGradingApplyResultList = null;
-
         //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
         private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList()
         {
@@ -2062,9 +2346,11 @@
                 return default;
             }
 
+            //鎵�鏈夎绠楃粨鏋滃垪琛�
             var allCalcuResultList = GetCalcuResultList();
 
-            _allGradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+            //鎵�鏈夊簲鐢ㄧ粨鏋滃垪琛�
+            var allGradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
             allGradingApplyList.ForEach(x =>
             {
                 var allCatalogGradingList = allGradingList.Where(t => t.Catalog == x.Code).ToList();
@@ -2093,7 +2379,7 @@
                                                                 Code = pump.Code,
                                                                 Color = grading.Color
                                                             };
-                                                            _allGradingApplyResultList.Add(result);
+                                                            allGradingApplyResultList.Add(result);
                                                         }
                                                     }
                                                 }
@@ -2116,7 +2402,7 @@
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2141,7 +2427,7 @@
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2166,7 +2452,7 @@
                                                                         Code = pump.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2200,7 +2486,7 @@
                                                                 Code = valve.Code,
                                                                 Color = grading.Color
                                                             };
-                                                            _allGradingApplyResultList.Add(result);
+                                                            allGradingApplyResultList.Add(result);
                                                         }
                                                     }
                                                 }
@@ -2223,7 +2509,7 @@
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2248,7 +2534,7 @@
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2273,7 +2559,7 @@
                                                                         Code = valve.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2312,7 +2598,7 @@
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2337,7 +2623,7 @@
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2362,7 +2648,7 @@
                                                                         Code = pipe.Code,
                                                                         Color = grading.Color
                                                                     };
-                                                                    _allGradingApplyResultList.Add(result);
+                                                                    allGradingApplyResultList.Add(result);
                                                                 }
                                                             }
                                                         }
@@ -2380,11 +2666,365 @@
                 }
             });
 
-            return _allGradingApplyResultList;
+            return allGradingApplyResultList;
         }
 
-        //棰滆壊鍒嗙骇缂栫爜鍒楄〃
-        private List<string> _allGradingCodeList = null;
+        //鑾峰彇棰滆壊鍒嗙骇搴旂敤缁撴灉鍒楄〃
+        private async Task<List<HydroGradingApplyResultViewModel>> GetGradingApplyResultList(string catalog, string propName)
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у垪琛�
+            var allGradingList = await GetGradingList();
+            if (allGradingList == null || allGradingList.Count < 1)
+            {
+                return default;
+            }
+            var currentGradingList = allGradingList.Where(x => x.Catalog == catalog).ToList();
+            if (currentGradingList.Count < 1)
+            {
+                return default;
+            }
+
+            //鎵�鏈夊垎绾у簲鐢ㄥ垪琛�
+            var allGradingApplyList = GetGradingApplyList();
+            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
+            {
+                return default;
+            }
+
+            //褰撳墠鍒嗙骇搴旂敤
+            var gradingApply = allGradingApplyList.Find(x => x.Code == catalog);
+            if (gradingApply == null)
+            {
+                return default;
+            }
+            gradingApply.PropName = propName;
+
+            //鎵�鏈夎绠楃粨鏋�
+            var allCalcuResultList = GetCalcuResultList();
+
+            //搴旂敤缁撴灉鍒楄〃
+            var gradingApplyResultList = new List<HydroGradingApplyResultViewModel>();
+
+            switch (catalog)
+            {
+                case Yw.Hydro.ParterCatalog.Pump:
+                    {
+                        if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
+                        {
+                            foreach (var pump in _hydroInfo.Pumps)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.LinkStatus:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var grading = gradingList.Meet(pump.LinkStatus);
+                                                if (grading != null)
+                                                {
+                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    {
+                                                        Code = pump.Code,
+                                                        Color = grading.Color
+                                                    };
+                                                    gradingApplyResultList.Add(result);
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pump.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Valve:
+                    {
+                        if (_hydroInfo.Valves != null && _hydroInfo.Valves.Count > 0)
+                        {
+                            foreach (var valve in _hydroInfo.Valves)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.LinkStatus:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.LinkStatus).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var grading = gradingList.Meet(valve.LinkStatus);
+                                                if (grading != null)
+                                                {
+                                                    var result = new HydroGradingApplyResultViewModel()
+                                                    {
+                                                        Code = valve.Code,
+                                                        Color = grading.Color
+                                                    };
+                                                    gradingApplyResultList.Add(result);
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = valve.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Pipe:
+                    {
+                        if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
+                        {
+                            foreach (var pipe in _hydroInfo.Pipes)
+                            {
+                                switch (propName)
+                                {
+                                    case Yw.Hydro.ParterProp.CalcuFlow:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuFlow.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuFlow.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuVelocity:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuVelocity.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuVelocity.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    case Yw.Hydro.ParterProp.CalcuHeadLoss:
+                                        {
+                                            var gradingList = currentGradingList.Where(x => x.PropName == Yw.Hydro.ParterProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
+                                            if (gradingList != null && gradingList.Count > 0)
+                                            {
+                                                var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
+                                                if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
+                                                {
+                                                    if (calcuLinkResult.CalcuHeadLoss.HasValue)
+                                                    {
+                                                        var grading = gradingList.Meet(Math.Abs(calcuLinkResult.CalcuHeadLoss.Value));
+                                                        if (grading != null)
+                                                        {
+                                                            var result = new HydroGradingApplyResultViewModel()
+                                                            {
+                                                                Code = pipe.Code,
+                                                                Color = grading.Color
+                                                            };
+                                                            gradingApplyResultList.Add(result);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default: break;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                default: break;
+            }
+
+            return gradingApplyResultList;
+        }
+
+        //棰滆壊鍒嗙骇鏄惁搴旂敤浜�
+        private bool _isGradingApply = false;
+        //棰滆壊鍒嗙骇搴旂敤缂栫爜鍒楄〃
+        private List<string> _allGradingApplyCodeList = null;
 
         //搴旂敤棰滆壊鍒嗙骇
         private async void ApplyGrading()
@@ -2393,13 +3033,70 @@
             {
                 return;
             }
+            _isGradingApply = true;
             var allGradingApplyResultList = await GetGradingApplyResultList();
-            _allGradingCodeList = allGradingApplyResultList?.Select(x => x.Code).Distinct().ToList();
-            var objGroupList = allGradingApplyResultList?.GroupBy(x => x.Color).ToList();
-            objGroupList?.ForEach(async x =>
+            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
+            {
+                CancelApplyGrading();
+                return;
+            }
+            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
+            objGroupList.ForEach(async x =>
             {
                 await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
             });
+            _allGradingApplyCodeList = allGradingApplyResultList.Select(x => x.Code).Distinct().ToList();
+        }
+
+        //搴旂敤棰滆壊鍒嗙骇
+        private async void ApplyGrading(string catalog, string propName)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _isGradingApply = true;
+            var allGradingApplyResultList = await GetGradingApplyResultList(catalog, propName);
+            if (allGradingApplyResultList == null || allGradingApplyResultList.Count < 1)
+            {
+                return;
+            }
+            var objGroupList = allGradingApplyResultList.GroupBy(x => x.Color).ToList();
+            objGroupList.ForEach(async x =>
+            {
+                await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
+            });
+            var codeList = allGradingApplyResultList.Select(x => x.Code);
+            if (_allGradingApplyCodeList == null)
+            {
+                _allGradingApplyCodeList = new List<string>();
+            }
+            _allGradingApplyCodeList.AddRange(codeList);
+            _allGradingApplyCodeList = _allGradingApplyCodeList.Distinct().ToList();
+        }
+
+        //鑷姩搴旂敤棰滆壊鍒嗙骇
+        private void AutoApplyGrading()
+        {
+            if (!_isGradingApply)
+            {
+                return;
+            }
+            ApplyGrading();
+        }
+
+        //鍙栨秷搴旂敤棰滆壊鍒嗙骇
+        private async void CancelApplyGrading()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            _isGradingApply = false;
+            if (_allGradingApplyCodeList != null && _allGradingApplyCodeList.Count > 0)
+            {
+                await _bimfaceCtrl?.RestoreComponentsColor(_allGradingApplyCodeList);
+            }
         }
 
         //鏄剧ず搴旂敤棰滆壊鍒嗙骇绐椾綋
@@ -2416,7 +3113,7 @@
             }
             var dlg = new ApplyHydroGradingDlg();
             dlg.SetBindingData(allGradingApplyList);
-            dlg.ReloadDataEvent += async (obj) =>
+            dlg.ReloadDataEvent += (obj) =>
             {
                 _allGradingApplyList = obj;
                 ApplyGrading();
@@ -2428,6 +3125,12 @@
         private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             ShowApplyGradingDlg();
+        }
+
+        //鍙栨秷搴旂敤鍒嗙骇
+        private void batBtnCancelGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            CancelApplyGrading();
         }
 
         #endregion
@@ -2457,7 +3160,7 @@
                 sw.Stop();
                 TimeSpan ts2 = sw.Elapsed;
                 Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-                _parter = null;
+                _selectedParter = null;
                 await _bimfaceCtrl?.ZoomAndSelectComponents(null);
                 ShowProperty();
                 TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
@@ -2468,31 +3171,164 @@
 
         #region 姘存祦鍔ㄧ敾
 
-        //鍔犺浇娴佸悜
-        private async void barBtnLoadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鎵�鏈夋祦鍚戝垪琛�
+        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> _allFlowEffectList = null;
+
+        //鑾峰彇娴佸悜鍒楄〃
+        private List<Yw.WinFrmUI.Bimface.LogicFlowEffect> GetFlowEffectList()
         {
-            var pipes = _hydroInfo.Pipes;
-            var list = pipes.Select(x =>
+            if (_allFlowEffectList == null)
             {
-                return new Yw.WinFrmUI.Bimface.LogicFlowEffect()
+                if (_hydroInfo == null)
                 {
-                    Id = x.Code,
-                    Rotation = 90,
-                    Speed = 0.1d
-                };
-            }).ToList();
-            await _bimfaceCtrl?.LoadFlowEffect(list);
+                    return default;
+                }
+                _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;
+                            }
+                        }
+                    }
+                }
+            }
+            return _allFlowEffectList;
+        }
+
+        /// <summary>
+        /// 鍔犺浇姘存祦鍔ㄧ敾
+        /// </summary>
+        private async void LoadFlowEffect()
+        {
+            if (_allFlowEffectList != null)
+            {
+                return;
+            }
+            var allFlowEffectList = GetFlowEffectList();
+            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
         }
 
         //鍗歌浇娴佸悜
-        private async void barBtnUnloadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void UnloadFlowEffect()
         {
+            if (_allFlowEffectList == null)
+            {
+                return;
+            }
+            _allFlowEffectList = null;
             await _bimfaceCtrl?.UnloadFlowEffect();
         }
 
+        //鏇存柊姘存祦鍔ㄧ敾
+        private async void UpdateFlowEffect(Yw.Model.HydroParterInfo parter)
+        {
+            if (_allFlowEffectList == null)
+            {
+                return;
+            }
+            var visual = parter as Yw.Model.HydroVisualInfo;
+            if (visual == null)
+            {
+                return;
+            }
+            var flowEffect = _allFlowEffectList.Find(x => x.Id == parter.Code);
+            if (flowEffect == null)
+            {
+                return;
+            }
+            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedX = 0;
+            }
+            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedX = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedX = -0.1;
+            }
+
+            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
+            {
+                flowEffect.SpeedY = 0;
+            }
+            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
+            {
+                flowEffect.SpeedY = 0.1;
+            }
+            else
+            {
+                flowEffect.SpeedY = -0.1;
+            }
+
+            var allCalcuResultList = GetCalcuResultList();
+            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
+            if (calcuResult != null)
+            {
+                if (calcuResult.CalcuVelocity < 0)
+                {
+                    flowEffect.SpeedX = -flowEffect.SpeedX;
+                }
+            }
+            await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
+        }
+
+        //鍔犺浇娴佸悜
+        private void barBtnLoadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            LoadFlowEffect();
+        }
+
+        //鍗歌浇娴佸悜
+        private void barBtnUnloadFlowDirection_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            UnloadFlowEffect();
+        }
+
         #endregion
 
 
 
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3