From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 12 三月 2025 10:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 4487 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2,500 insertions(+), 1,987 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 1037523..94c7f81 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,23 +1,11 @@
-锘縢lobal using Yw.EPAnet;
-using DevExpress.CodeParser;
+锘縰sing DevExpress.Diagram.Core.Native;
 using DevExpress.Mvvm.Native;
-using DevExpress.Office.Utils;
-using DevExpress.Utils.Extensions;
-using DevExpress.Xpo.Helpers;
-using DevExpress.XtraBars.Ribbon;
-using DevExpress.XtraRichEdit.Layout;
-using DevExpress.XtraSpreadsheet.Commands;
-using HStation.WinFrmUI.PhartRelation;
-using NPOI.SS.Formula.Functions;
-using System.Diagnostics;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
+using DevExpress.Pdf.Native;
+using Mapster;
+using Yw.EPAnet;
 using Yw.Hydro;
 using Yw.Model;
-using Yw.Pump;
 using Yw.Vmo;
-using Yw.WinFrmUI.Bimface;
-using Yw.WinFrmUI.Hydro;
 
 namespace HStation.WinFrmUI
 {
@@ -32,38 +20,91 @@
             RegistBulkSetEvents();
         }
 
+        #region 妯″瀷浜嬩欢
+
+        /// <summary>
+        /// 鑾峰彇妯″瀷浜嬩欢
+        /// </summary>
+        public event Func<XhsSchemeVmo, Task<Yw.Model.HydroModelInfo>> GetModelEvent;
+
+        /// <summary>
+        /// 鍒锋柊妯″瀷浜嬩欢
+        /// </summary>
+        public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;
+
+        #endregion 妯″瀷浜嬩欢
+
+        #region 鏂规浜嬩欢
+
+        /// <summary>
+        /// 鏇存柊鏂规浜嬩欢
+        /// </summary>
+        public event Action<XhsSchemeVmo> UpdateSchemeEvent;
+
+        /// <summary>
+        /// 绉婚櫎鏂规浜嬩欢
+        /// </summary>
+        public event Action<XhsSchemeVmo> RemoveSchemeEvent;
+
+        #endregion 鏂规浜嬩欢
+
+        #region 宸ュ喌浜嬩欢
+
+        /// <summary>
+        /// 鏂板宸ュ喌浜嬩欢
+        /// </summary>
+        public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
+        /// <summary>
+        /// 鏇存柊宸ュ喌浜嬩欢
+        /// </summary>
+        public event Action<HydroWorkingVmo> UpdateWorkingEvent;
+
+        /// <summary>
+        /// 绉婚櫎宸ュ喌浜嬩欢
+        /// </summary>
+        public event Action<HydroWorkingVmo> RemoveWorkingEvent;
+
+        /// <summary>
+        /// 閲嶈浇宸ュ喌浜嬩欢
+        /// </summary>
+        public event Action<Dictionary<HydroWorkingVmo, bool>> ReloadWorkingEvent;
+
+        #endregion 宸ュ喌浜嬩欢
+
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
+        private HStation.Vmo.XhsSchemeVmo _scheme = null;//鏂规
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
-
-
+        private Dictionary<HydroWorkingVmo, bool> _allWorkingCheckedListDict = null;//鎵�鏈夊伐鍐甸�夋嫨鍒楄〃瀛楀吀
 
         /// <summary>
         /// 缁戝畾鏁版嵁
         /// </summary>
-        public async Task SetBindingData
+        public void SetBindingData
             (
-                HStation.Vmo.XhsProjectVmo project,
-                HStation.Vmo.XhsProjectSiteVmo projectSite,
-                Yw.Model.HydroModelInfo hydroInfo
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                Yw.Model.HydroModelInfo hydroInfo,
+                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
             )
         {
-            if (project == null)
-            {
-                return;
-            }
             _project = project;
             _projectSite = projectSite;
+            _scheme = scheme;
             _hydroInfo = hydroInfo;
-            if (_projectSite == null)
+            _allWorkingCheckedListDict = allWorkingCheckedListDict;
+            ResetMonitorValue();
+            if (_scheme == null)
             {
-                _projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(_project.ID);
+                this.ribPageGroupForScheme.Visible = false;
+                this.PageTitle.Caption = $"姘村姏妯℃嫙";
             }
-            if (_hydroInfo == null)
+            else
             {
-                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
-                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
+                this.ribPageGroupForScheme.Visible = true;
+                this.PageTitle.Caption = $"妯℃嫙鏂规\r\n{_scheme.Name}";
             }
         }
 
@@ -73,46 +114,242 @@
         public override void InitialDataSource()
         {
             base.InitialDataSource();
-            if (_project == null)
-            {
-                return;
-            }
-            this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
             ShowBimfaceCtrl();
             ShowQ3dCtrl();
             ShowPropertyCtrl();
-
+            InitialSvgImages();
         }
 
+        //鍒濆鍖朣vg鍥剧墖
+        private void InitialSvgImages()
+        {
+            //鐩戞祴
+            this.barBtnSetMonitorList.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Docking;
 
-        #region Bimface
+            //姘村簱
+            this.barBtnSetReservoirList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
+            this.barBtnSetReservoirList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetReservoirList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetReservoirList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //姘存睜
+            this.barBtnSetTankList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
+            this.barBtnSetTankList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetTankList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetTankList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //姘寸
+            this.barBtnSetWaterboxList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
+            this.barBtnSetWaterboxList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetWaterboxList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetWaterboxList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //杩炴帴鑺傜偣
+            this.barBtnSetJunctionList.ImageOptions.SvgImage = HydroMainSvgImageHelper.Junction;
+            this.barBtnSetJunctionList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetJunctionList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetJunctionList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //闂峰ご
+            this.barBtnSetBluntheadList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Blunthead;
+            this.barBtnSetBluntheadList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetBluntheadList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetBluntheadList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //寮ご
+            this.barBtnSetElbowsList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Elbow;
+            this.barBtnSetElbowsList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetElbowsList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetElbowsList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //涓夐��
+            this.barBtnSetThreelinkList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Threelink;
+            this.barBtnSetThreelinkList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetThreelinkList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetThreelinkList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鍥涢��
+            this.barBtnSetFourlinkList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Fourlink;
+            this.barBtnSetFourlinkList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetFourlinkList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetFourlinkList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //娑堢伀鏍�
+            this.barBtnSetHydrantList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Hydrant;
+            this.barBtnSetHydrantList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetHydrantList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetHydrantList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鍠峰ご
+            this.barBtnSetNozzleList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Nozzle;
+            this.barBtnSetNozzleList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetNozzleList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetNozzleList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鍐峰嵈濉�
+            this.barBtnSetCoolingList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Cooling;
+            this.barBtnSetCoolingList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetCoolingList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetCoolingList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //姘磋〃
+            this.barBtnSetMeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Meter;
+            this.barBtnSetMeterList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetMeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetMeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //娴侀噺璁�
+            this.barBtnSetFlowmeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Flowmeter;
+            this.barBtnSetFlowmeterList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetFlowmeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetFlowmeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鍘嬪姏琛�
+            this.barBtnSetPressmeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pressmeter;
+            this.barBtnSetPressmeterList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetMeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetMeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //绠¢亾
+            this.barBtnSetPipeList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pipe;
+            this.barBtnSetPipeList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetPipeList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetPipeList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //杩囨浮浠�
+            this.barBtnSetTranslationList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Translation;
+            this.barBtnSetTranslationList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetTranslationList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetTranslationList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //姘存车
+            this.barBtnSetPumpList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pump;
+            this.barBtnSetPumpList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetPumpList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetPumpList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //闃�闂�
+            this.barBtnSetValveList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Valve;
+            this.barBtnSetValveList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetValveList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetValveList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鎹㈢儹鍣�
+            this.barBtnSetExchangerList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Exchanger;
+            this.barBtnSetExchangerList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetExchangerList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetExchangerList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+
+            //鍘嬬缉鏈�
+            this.barBtnSetCompressorList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Compressor;
+            this.barBtnSetCompressorList.ImageOptions.SvgImageSize = new Size(32, 32);
+            this.barBtnSetCompressorList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
+            this.barBtnSetCompressorList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
+        }
+
+        #region 灞炴�х姸鎬�
+
+        //灞炴�х姸鎬佽緟鍔╃被
+        private HydroPropStatusHelper _propStatusHelper = null;
+
+        //鑾峰彇灞炴�х姸鎬佽緟鍔╃被
+        private async Task<HydroPropStatusHelper> GetPropStatusHelper()
+        {
+            if (_propStatusHelper == null)
+            {
+                var allPropStatusList = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.GetByModelID(_hydroInfo.ID);
+                _propStatusHelper = new HydroPropStatusHelper(_hydroInfo, allPropStatusList);
+            }
+            return _propStatusHelper;
+        }
+
+        //鑾峰彇灞炴�х姸鎬丏b鍒楄〃
+        private async Task<List<HydroParterPropStatusInfo>> GetPropStatusDbList()
+        {
+            var helper = await GetPropStatusHelper();
+            return helper.GetPropStatusDbList();
+        }
+
+        #endregion 灞炴�х姸鎬�
+
+        #region 鏇存敼鐘舵��
+
+        //鏀瑰彉杈呭姪绫�
+        private HydroChangeHelper _changeHelper = null;
+
+        //鑾峰彇鏀瑰彉杈呭姪绫�
+        private HydroChangeHelper GetChangeHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_changeHelper == null)
+            {
+                _changeHelper = new HydroChangeHelper(_hydroInfo);
+            }
+            return _changeHelper;
+        }
+
+        //闄勫姞鏀瑰彉鏋勪欢
+        private void AppendChangeParter(HydroParterInfo parter, eChangeType changeType)
+        {
+            var helper = GetChangeHelper();
+            helper.Append(parter, changeType);
+        }
+
+        //鑾峰彇澧炲姞鏋勪欢鍒楄〃
+        private List<HydroParterInfo> GetAddParterList()
+        {
+            var helper = GetChangeHelper();
+            return helper.GetAddParterList();
+        }
+
+        //鑾峰彇鏇存柊鏋勪欢鍒楄〃
+        private List<HydroParterInfo> GetUpdateParterList()
+        {
+            var helper = GetChangeHelper();
+            return helper.GetUpdateParterList();
+        }
+
+        //鑾峰彇绉婚櫎鏋勪欢鍒楄〃
+        private List<string> GetRemoveParters()
+        {
+            var helper = GetChangeHelper();
+            return helper.GetRemoveParters();
+        }
+
+        #endregion 鏇存敼鐘舵��
+
+        #region BIM鎺т欢
 
         //bimface鎺т欢
-        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
+        private SimulationBimfaceCtrl _bimfaceCtrl = null;
 
         //鑾峰彇 bimface 鎺т欢
-        private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
+        private async Task<SimulationBimfaceCtrl> GetBimfaceCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_bimfaceCtrl == null)
             {
-                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
+                _bimfaceCtrl = new SimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
-                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
+                WaitFormHelper.ShowWaitForm(this.FindForm(), "姝e湪鍔犺浇妯″瀷锛岃绋嶅悗...");
+                await _bimfaceCtrl.InitialData(_project, _projectSite);
                 _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
+                    WaitFormHelper.HideWaitForm();
+                    this.barCkDecorator.Checked = false;
+                    this.barCkGrading.Checked = true;
                 };
-                _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
+                _bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    _selectedVisual = obj;
-                    ShowSelectedProperty();
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Bimface);
                 };
             }
             return _bimfaceCtrl;
@@ -126,14 +363,9 @@
             this.tabPageBimface.Controls.Add(bimfaceCtrl);
         }
 
-        private void SelectBimfaceParter()
-        {
+        #endregion BIM鎺т欢
 
-        }
-
-        #endregion
-
-        #region Q3d
+        #region Q3d鎺т欢
 
         //Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
@@ -141,20 +373,20 @@
         //鑾峰彇 Q3d 鎺т欢
         private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_q3dCtrl == null)
             {
                 _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                 _q3dCtrl.Dock = DockStyle.Fill;
                 _q3dCtrl.InitialData(() => _hydroInfo);
-                _q3dCtrl.SelectedPartersChangedEvent += (obj) =>
+                _q3dCtrl.SelectedPartersChangedEvent += (codes) =>
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
-                    ShowSelectedProperty();
+                    var visualListHelper = GetVisualListHelper();
+                    var visuals = visualListHelper.GetVisualList(codes);
+                    SelectVisual(visuals?.LastOrDefault(), eSimulationVisualSource.Q3d);
                 };
             }
             return _q3dCtrl;
@@ -168,351 +400,41 @@
             this.tabPageQ3d.Controls.Add(q3dCtrl);
         }
 
-        #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
+        #endregion Q3d鎺т欢
 
         #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
+        private SimulationPropertyCtrl _propertyCtrl = null;
 
         //鑾峰彇灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+        private async Task<SimulationPropertyCtrl> GetPropertyCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_propertyCtrl == null)
             {
-                _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                _propertyCtrl = new SimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
+                _propertyCtrl.AllowEdit = true;
+                _propertyCtrl.InitialData(changeHelper, propStatusHelper);
+                _propertyCtrl.CalcuResult = () => GetCalcuResult();
                 _propertyCtrl.HydroViewEvent += (visual) =>
                 {
-                    if (visual == null)
-                    {
-                        return;
-                    }
-                    _bimfaceCtrl?.ZoomToComponent(visual.Code);
+                    SelectVisual(visual, eSimulationVisualSource.Property);
                 };
                 _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
                 { //寮鸿皟杩炴帴鑺傜偣
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
                     if (link == null)
                     {
                         return;
                     }
-                    if (string.IsNullOrEmpty(linkNodeCode))
-                    {
-                        return;
-                    }
-                    var linkNode = GetVisual(linkNodeCode);
+                    var visualListHelper = GetVisualListHelper();
+                    var linkNode = visualListHelper.GetVisual(linkNodeCode);
                     if (linkNode == null)
                     {
                         return;
@@ -520,12 +442,12 @@
                     var blinkCodes = new List<string>();
                     if (linkNode.GetType() == typeof(HydroJunctionInfo))
                     {
-                        var allLinkList = GetLinkList();
+                        var allLinkList = visualListHelper.GetLinkList();
                         if (allLinkList == null || allLinkList.Count < 1)
                         {
                             return;
                         }
-                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
+                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != link.Code).ToList();
                         if (linkList == null || linkList.Count < 1)
                         {
                             return;
@@ -542,33 +464,30 @@
                     await Task.Delay(5000);
                     await _bimfaceCtrl?.ClearBlinkComponents();
                 };
-                _propertyCtrl.PropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
                 {
                     if (visual == null)
                     {
                         return;
                     }
                     UpdateVisualListCtrl();
-                    //ApplyGradingResultList(visual);
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set();
                 };
-                _propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
+                _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
                 {
                     //鏍囨敞灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
-                    //UpdateMark(visual);
+                    var markHelper = await GetMarkHelper();
+                    markHelper.Set(visual);
                 };
-                _propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
+                _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
                 {
                     //鍒嗙骇灞炴�у彂鐢熸敼鍙�
                     //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
+                    var gradingHelper = await GetGradingHelper();
+                    gradingHelper.Set(visual);
                 };
-                _propertyCtrl.FlowEffectPropertyValueChangedEvent += (visual) =>
-                {
-                    //娴佸悜灞炴�у彂鐢熸敼鍙�
-                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    //UpdateFlowEffect(visual);
-                };
-
             }
             return _propertyCtrl;
         }
@@ -582,7 +501,7 @@
                 {
                     if (this.controlContainerRight.Controls.Count > 0)
                     {
-                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
+                        if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
                         {
                             return true;
                         }
@@ -593,13 +512,13 @@
         }
 
         //鏄剧ず灞炴�ф帶浠�
-        private void ShowPropertyCtrl()
+        private async void ShowPropertyCtrl()
         {
             if (IsPropertyCtrlVisible)
             {
                 return;
             }
-            var propertyCtrl = GetPropertyCtrl();
+            var propertyCtrl = await GetPropertyCtrl();
             this.controlContainerRight.Controls.Clear();
             this.controlContainerRight.Controls.Add(propertyCtrl);
             this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -607,50 +526,14 @@
             this.docPnlRight.Width = 300;
         }
 
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty()
-        {
-            ShowSelectedProperty(_selectedVisual);
-        }
-
-        //鏄剧ず閫夋嫨灞炴��
-        private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            ShowPropertyCtrl();
-            _selectedVisual = visual;
-            if (_selectedVisual == null)
-            {
-                _propertyCtrl.SelectedObject = null;
-                return;
-            }
-            _propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
-        }
-
-        //鏇存柊閫夋嫨灞炴��
-        private void UpdateSelectedProperty()
-        {
-            if (!IsPropertyCtrlVisible)
-            {
-                return;
-            }
-            if (_selectedVisual == null)
-            {
-                return;
-            }
-            _propertyCtrl?.UpdateRows();
-        }
-
         //璁剧疆灞炴�ф帶浠�
-        private void SetPropertyCtrl(Yw.Model.HydroVisualInfo visual)
+        private void SetPropertyCtrl(HydroVisualInfo visual)
         {
-            if (visual == null)
-            {
-
-            }
+            ShowPropertyCtrl();
+            var visualVmListHelper = GetVisualVmListHelper();
+            var vm = visualVmListHelper.GetVisual(visual);
+            _propertyCtrl.SelectedObject = vm;
+            _propertyCtrl.UpdateRows();
         }
 
         //鏇存柊灞炴�ф帶浠�
@@ -659,160 +542,407 @@
             _propertyCtrl?.UpdateRows();
         }
 
-        #endregion
+        #endregion 灞炴�ф帶浠�
 
-        #region 鑷姩鍖归厤
+        #region 閫夋嫨鏋勪欢
 
-        //鑾峰彇鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl GetMatchingListCtrl()
+        //閫夋嫨鏋勪欢
+        private Yw.Model.HydroVisualInfo _visual = null;
+
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(HydroVisualInfo visual, eSimulationVisualSource source)
         {
-            if (_matchingListCtrl == null)
+            _visual = visual;
+            switch (source)
             {
-                _matchingListCtrl = new XhsProjectSimulationMatchingListCtrl();
-                _matchingListCtrl.Dock = DockStyle.Fill;
-                _matchingListCtrl.HydroClickEvent += async (code) =>
-                {
-                    if (_hydroInfo == null)
+                case eSimulationVisualSource.None:
                     {
-                        return;
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
                     }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == code);
-                    var elementIds = new List<string>();
-                    if (_selectedVisual != null)
+                    break;
+
+                case eSimulationVisualSource.Bimface:
                     {
-                        elementIds.Add(_selectedVisual.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
                     }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
-                };
-                _matchingListCtrl.ApplyMatchingEvent += (output) =>
-                {
-                    if (_hydroInfo == null)
+                    break;
+
+                case eSimulationVisualSource.Q3d:
                     {
-                        return false;
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
                     }
-                    return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
-                };
+                    break;
+
+                case eSimulationVisualSource.Property:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                    }
+                    break;
+
+                case eSimulationVisualSource.List:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Set:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Search:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Monitor:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Check:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Calcu:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                case eSimulationVisualSource.Warning:
+                    {
+                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                        this.barBtnSetMonitorList.Enabled = visual != null;
+                        SetPropertyCtrl(visual);
+                    }
+                    break;
+
+                default: break;
             }
-            return _matchingListCtrl;
         }
 
-        //鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(string code, eSimulationVisualSource source)
+        {
+            var visual = GetVisual(code);
+            SelectVisual(visual, source);
+        }
 
-        //鑷姩鍖归厤
-        private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        #endregion 閫夋嫨鏋勪欢
+
+        #region 鏋勪欢鏄庣粏
+
+        #region 鍙鍒楄〃
+
+        //鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper _visualListHelper = null;
+
+        //鑾峰彇鍙鍒楄〃杈呭姪绫�
+        private SimulationVisualListHelper GetVisualListHelper()
+        {
+            if (_visualListHelper == null)
+            {
+                _visualListHelper = new SimulationVisualListHelper();
+                _visualListHelper.InitialData(_hydroInfo);
+            }
+            return _visualListHelper;
+        }
+
+        //閲嶇疆鍙鍒楄〃
+        private void ResetVisualList()
+        {
+            var helper = GetVisualListHelper();
+            helper.InitialData(_hydroInfo);
+        }
+
+        //鑾峰彇鍙鏋勪欢
+        private Yw.Model.HydroVisualInfo GetVisual(string code)
+        {
+            var helper = GetVisualListHelper();
+            var visual = helper.GetVisual(code);
+            return visual;
+        }
+
+        //鑾峰彇鍙鍒楄〃
+        private List<Yw.Model.HydroVisualInfo> GetVisualList()
+        {
+            var helper = GetVisualListHelper();
+            return helper.GetVisualList();
+        }
+
+        //鑾峰彇姘存簮鍒楄〃
+        private List<Yw.Model.HydroSourceInfo> GetSourceList()
+        {
+            var helper = GetVisualListHelper();
+            return helper.GetSourceList();
+        }
+
+        #endregion 鍙鍒楄〃
+
+        #region 瑙嗗浘鍒楄〃
+
+        //鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private SimulationVisualVmListHelper _visualVmListHelper = null;
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃杈呭姪绫�
+        private SimulationVisualVmListHelper GetVisualVmListHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_visualVmListHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
+            }
+            return _visualVmListHelper;
+        }
+
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            var helper = GetVisualVmListHelper();
+            return helper.GetVisualList();
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(string code)
+        {
+            var helper = GetVisualVmListHelper();
+            return helper.GetVisual(code);
+        }
+
+        #endregion 瑙嗗浘鍒楄〃
+
+        #region 鏄庣粏鎺т欢
+
+        //鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+
+        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
+        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+        {
+            if (_visualListCtrl == null)
+            {
+                _visualListCtrl = new HydroVisualListCtrl();
+                _visualListCtrl.Dock = DockStyle.Fill;
+                _visualListCtrl.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.List);
+                };
+                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
+                {
+                    SelectVisual(_visual, eSimulationVisualSource.List);
+                };
+            }
+            return _visualListCtrl;
+        }
+
+        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
+        private bool IsVisualListCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
+        private async void ShowVisualListCtrl()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            this.controlContainerBottom.Controls.Clear();
-            var matchingListCtrl = GetMatchingListCtrl();
-            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;
-            this.docPnlBottom.Text = "鍖归厤鍒楄〃";
-            this.docPnlBottom.Height = 350;
-        }
-
-        #endregion
-
-        #region 鏈尮閰嶅垪琛�
-
-        //鑾峰彇鏈尮閰嶅垪琛ㄦ帶浠�
-        private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
-        {
-            if (_unMatchingListCtrl == null)
+            var visualListCtrl = GetVisualListCtrl();
+            if (!IsVisualListCtrlVisible)
             {
-                _unMatchingListCtrl = new XhsProjectSimulationUnMatchingListCtrl();
-                _unMatchingListCtrl.Dock = DockStyle.Fill;
-                _unMatchingListCtrl.HydroClickEvent += async (parter) =>//琛岀偣鍑�
-                {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
-                    var elementIds = new List<string>() { parter.Code };
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
-                };
-                _unMatchingListCtrl.ViewModelEvent += async (parters) =>//鏌ョ湅妯″瀷
-                {
-                    var codes = parters?.Select(x => x.Code).Distinct().ToList();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
-                    _selectedVisual = null;
-                    ShowSelectedProperty();
-                };
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(visualListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
+                this.docPnlBottom.Height = 350;
             }
-            return _unMatchingListCtrl;
-        }
-
-        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//鏈尮閰嶅垪琛�
-
-        //鏈尮閰嶅垪琛�
-        private void barBtnUnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
+            var visualVmListHelper = GetVisualVmListHelper();
+            var changeHelper = GetChangeHelper();
+            var propStatusHelper = await GetPropStatusHelper();
+            var allVisualVmList = visualVmListHelper.GetVisualList();
+            visualListCtrl.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
+            var calcuResult = GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
             {
-                return;
-            }
-            this.controlContainerBottom.Controls.Clear();
-            var unMatchingListCtrl = GetUnMatchingListCtrl();
-            unMatchingListCtrl.SetBindingData(_hydroInfo);
-            this.controlContainerBottom.Controls.Add(unMatchingListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏈尮閰嶅垪琛�";
-            this.docPnlBottom.Height = 350;
-        }
-
-        #endregion
-
-        #region 涓�閿樉闅�
-
-        //鏄鹃殣缂栫爜鍒楄〃
-        private List<string> _fastShowHiddenCodeList = null;
-
-        //涓�閿樉闅�
-        private async void FastShowHidden()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_hydroInfo.Decorators == null || _hydroInfo.Decorators.Count < 1)
-            {
-                return;
-            }
-            if (_fastShowHiddenCodeList == null)
-            {
-                _fastShowHiddenCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
-                await _bimfaceCtrl?.HideComponents(_fastShowHiddenCodeList);
+                visualListCtrl.SetCalcuView();
             }
             else
             {
-                await _bimfaceCtrl?.ShowComponents(_fastShowHiddenCodeList);
-                _fastShowHiddenCodeList = null;
+                visualListCtrl.SetNormalView();
             }
         }
 
-        //瑙﹀彂涓�閿樉闅�
-        private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏇存柊鏋勪欢鏄庣粏鎺т欢
+        private void UpdateVisualListCtrl()
         {
-            FastShowHidden();
+            if (!IsVisualListCtrlVisible)
+            {
+                return;
+            }
+            _visualListCtrl?.UpdateBindingData();
+            var calcuResult = GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
+            {
+                _visualListCtrl.SetCalcuView();
+            }
+            else
+            {
+                _visualListCtrl.SetNormalView();
+            }
         }
 
-        #endregion
+        //鏋勪欢鏄庣粏
+        private void barBtnVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowVisualListCtrl();
+        }
+
+        #endregion 鏄庣粏鎺т欢
+
+        #region 鏋勪欢鏄剧ず
+
+        //鏋勪欢鍙杈呭姪绫�
+        private SimulationVisualVisibleHelper _visualVisibleHelper = null;
+
+        //鑾峰彇鏋勪欢鍙杈呭姪绫�
+        private async Task<SimulationVisualVisibleHelper> GetVisualVisibleHelper()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_visualVisibleHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _visualVisibleHelper = new SimulationVisualVisibleHelper(visualListHelper, bimfaceCtrl);
+                _visualVisibleHelper.InitialData(_hydroInfo);
+            }
+            return _visualVisibleHelper;
+        }
+
+        //璁剧疆鏋勪欢鍙鎬�
+        private async void SetVisualVisible()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var visualVisibleHelper = await GetVisualVisibleHelper();
+            var allVisibleList = visualVisibleHelper.Items;
+            var dlg = new SetHydroVisualVisibleDlg();
+            dlg.SetBindingData(allVisibleList);
+            dlg.ReloadDataEvent += (list) =>
+            {
+                visualVisibleHelper.Items = list;
+                visualVisibleHelper.Set();
+            };
+            dlg.ShowDialog();
+        }
+
+        //璁剧疆鏋勪欢鏄剧ず
+        private void barBtnSetVisualVisible_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            SetVisualVisible();
+        }
+
+        #endregion 鏋勪欢鏄剧ず
+
+        #endregion 鏋勪欢鏄庣粏
+
+        #region 涓�閿樉闅�
+
+        private List<string> _allDecoratorCodes = null;
+
+        //鑾峰彇瑁呴グ浠禼ode鍒楄〃
+        private async Task<List<string>> GetDecoratorCodes()
+        {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+            if (_allDecoratorCodes == null)
+            {
+                _allDecoratorCodes = await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.GetCodeListByModelID(_hydroInfo.ID, null);
+            }
+            if (_allDecoratorCodes == null)
+            {
+                _allDecoratorCodes = new List<string>();
+            }
+            return _allDecoratorCodes;
+        }
+
+        //璁剧疆瑁呴グ浠跺彲瑙佹��
+        private async void SetDecoratorVisible(bool isDecoratorVisible)
+        {
+            var codes = await GetDecoratorCodes();
+            if (isDecoratorVisible)
+            {
+                await _bimfaceCtrl?.ShowComponents(codes);
+            }
+            else
+            {
+                await _bimfaceCtrl?.HideComponents(codes);
+            }
+        }
+
+        //璁剧疆
+        private void barCkDecorator_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            SetDecoratorVisible(this.barCkDecorator.Checked);
+        }
+
+        #endregion 涓�閿樉闅�
 
         #region 淇濆瓨淇℃伅
+
+        //淇濆瓨閿佸畾瀵硅薄
+        private object _locker_save = new();
+
+        private bool _isSaving = false;//姝e湪淇濆瓨
 
         //淇濆瓨
         private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -821,27 +951,89 @@
             {
                 return;
             }
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
 
-
-            var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
-
-            //鑰楁椂宸ㄥぇ鐨勪唬鐮�  
-
-            sw.Stop();
-            TimeSpan ts2 = sw.Elapsed;
-            Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-            if (id < 1)
+            lock (_locker_save)
             {
-                TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
+                if (_isSaving)
+                {
+                    this.FindForm().ShowAlertInfo("淇濆瓨", "姝e湪淇濆瓨锛岃绋嶅悗閲嶈瘯锛�");
+                    return;
+                }
+            }
+
+            _isSaving = true;
+
+            var changeHelper = GetChangeHelper();
+
+            var addParterList = changeHelper.GetAddParterList();
+            var updateParterList = changeHelper.GetUpdateParterList();
+            var removeParters = changeHelper.GetRemoveParters();
+
+            if (addParterList == null || addParterList.Count < 1)
+            {
+                if (updateParterList == null || updateParterList.Count < 1)
+                {
+                    if (removeParters == null || removeParters.Count < 1)
+                    {
+                        TipFormHelper.ShowWarn("鏈娴嬪埌淇敼锛屾棤闇�淇濆瓨锛�");
+                        _isSaving = false;
+                        return;
+                    }
+                }
+            }
+
+            WaitFormHelper.ShowWaitForm("姝e湪淇濆瓨锛岃绋嶅悗...");
+
+            bool bol = false;
+
+            try
+            {
+                bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
+                .Update(_hydroInfo, addParterList, updateParterList, removeParters);
+            }
+            catch (Exception ex)
+            {
+                XtraMessageBox.Show(ex.Message);
+                _isSaving = false;
+            }
+
+            if (!bol)
+            {
+                WaitFormHelper.HideWaitForm();
+                TipFormHelper.ShowError("姘村姏淇℃伅鏇存柊澶辫触锛�");
+                _isSaving = false;
                 return;
             }
-            _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
+            changeHelper.Reset();
+
+            var propStatusHelper = await GetPropStatusHelper();
+            var updatePropStatusList = propStatusHelper.GetUpdatePropStatusDbList();
+            if (updatePropStatusList != null && updatePropStatusList.Count > 0)
+            {
+                bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Update(_hydroInfo.ID, updatePropStatusList);
+                if (!bol)
+                {
+                    WaitFormHelper.HideWaitForm();
+                    TipFormHelper.ShowWarn("灞炴�х姸鎬佹洿鏂板け璐ワ紒");
+                    _isSaving = false;
+                    return;
+                }
+            }
+            propStatusHelper.Reset();
+
+            WaitFormHelper.HideWaitForm();
             TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
+            _isSaving = false;
+
+            //Stopwatch sw = new Stopwatch();
+            //sw.Start();
+            //鑰楁椂宸ㄥぇ鐨勪唬鐮�
+            //sw.Stop();
+            //TimeSpan ts2 = sw.Elapsed;
+            //Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
         }
 
-        #endregion
+        #endregion 淇濆瓨淇℃伅
 
         #region 鎵归噺閰嶇疆
 
@@ -849,188 +1041,367 @@
         private void RegistBulkSetEvents()
         {
             //姘村簱
-            this.barBtnSetReservoirList.ItemClick += delegate
+            this.barBtnSetReservoirList.ItemClick += async delegate
             {
-                //var dlg = new HydroReservoirBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroReservoirListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //姘存睜
-            this.barBtnSetTankList.ItemClick += delegate
+            this.barBtnSetTankList.ItemClick += async delegate
             {
-                //var dlg = new HydroTankBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroTankListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //姘寸
-            this.barBtnSetWaterboxList.ItemClick += delegate
+            this.barBtnSetWaterboxList.ItemClick += async delegate
             {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroWaterboxListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroWaterboxListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //杩炴帴鑺傜偣
-            this.barBtnSetJunctionList.ItemClick += delegate
+            this.barBtnSetJunctionList.ItemClick += async delegate
             {
-                //var dlg = new HydroJunctionBulkSetListDlg();
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroJunctionListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //闂峰ご
-            this.barBtnSetBluntheadList.ItemClick += delegate
+            this.barBtnSetBluntheadList.ItemClick += async delegate
             {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroBluntheadListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroBluntheadListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //寮ご
-            this.barBtnSetElbowsList.ItemClick += delegate
+            this.barBtnSetElbowsList.ItemClick += async delegate
             {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroElbowListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
+                var allVisualVmList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroElbowListDlg();
+                dlg.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
             };
             //涓夐��
-            this.barBtnSetThreelinkList.ItemClick += delegate
+            this.barBtnSetThreelinkList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroThreelinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //鍥涢��
-            this.barBtnSetFourlinkList.ItemClick += delegate
+            this.barBtnSetFourlinkList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroFourlinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //姘磋〃
-            this.barBtnSetMeterList.ItemClick += delegate
+            this.barBtnSetMeterList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroMeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //娴侀噺璁�
-            this.barBtnSetFlowmeterList.ItemClick += delegate
+            this.barBtnSetFlowmeterList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroFlowmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //鍘嬪姏琛�
-            this.barBtnSetPressmeterList.ItemClick += delegate
+            this.barBtnSetPressmeterList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroPressmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鍠峰槾
+            this.barBtnSetNozzleList.ItemClick += async delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroNozzleListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鍐峰嵈濉�
+            this.barBtnSetCoolingList.ItemClick += async delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroCoolingListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //绠¢亾
-            this.barBtnSetPipeList.ItemClick += delegate
+            this.barBtnSetPipeList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroPipeListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //杩囨浮浠�
+            this.barBtnSetTranslationList.ItemClick += async delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroTranslationListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //姘存车
-            this.barBtnSetPumpList.ItemClick += delegate
+            this.barBtnSetPumpList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroPumpListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
             //闃�闂�
-            this.barBtnSetValveList.ItemClick += delegate
+            this.barBtnSetValveList.ItemClick += async delegate
             {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
                 var dlg = new SetHydroValveListDlg();
-                dlg.SetBindingData(_hydroInfo);
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鎹㈢儹鍣�
+            this.barBtnSetExchangerList.ItemClick += async delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroExchangerListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
+                dlg.ShowDialog();
+            };
+            //鍘嬬缉鏈�
+            this.barBtnSetCompressorList.ItemClick += async delegate
+            {
+                var allVisualViewModelList = GetVisualViewModelList();
+                var changeHelper = GetChangeHelper();
+                var propStatusHelper = await GetPropStatusHelper();
+                var dlg = new SetHydroCompressorListDlg();
+                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
+                dlg.HydroClickInfoEvent += (visual) =>
+                {
+                    SelectVisual(visual, eSimulationVisualSource.Set);
+                };
+                dlg.HydroChangedInfoEvent += visuals =>
+                {
+                    SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set);
+                    UpdateVisualListCtrl();
+                };
                 dlg.ShowDialog();
             };
         }
-
 
         //鏄剧ずRadialMenu
         private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -1104,6 +1475,16 @@
             else
             {
                 this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍐峰嵈濉�
+            if (_hydroInfo.Coolings == null || _hydroInfo.Coolings.Count < 1)
+            {
+                this.barBtnSetCoolingList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetCoolingList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
             }
 
             //闂峰ご
@@ -1196,26 +1577,6 @@
                 this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
             }
 
-            //鎹㈢儹鍣�
-            if (_hydroInfo.Exchangers == null || _hydroInfo.Exchangers.Count < 1)
-            {
-                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //绌哄帇鏈�
-            if (_hydroInfo.Compressors == null || _hydroInfo.Compressors.Count < 1)
-            {
-                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
             //姘存车
             if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
             {
@@ -1236,102 +1597,28 @@
                 this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
             }
 
+            //鎹㈢儹鍣�
+            if (_hydroInfo.Exchangers == null || _hydroInfo.Exchangers.Count < 1)
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //绌哄帇鏈�
+            if (_hydroInfo.Compressors == null || _hydroInfo.Compressors.Count < 1)
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
         }
 
-        #endregion
-
-        #region 骞惰仈鍒嗘瀽
-
-        //骞惰仈鍒嗘瀽
-        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
-            {
-                return;
-            }
-            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in _hydroInfo.Pumps)
-            {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
-                {
-                    var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    if (calcuResult != null)
-                    {
-                        if (calcuResult.CalcuFlow.HasValue)
-                        {
-                            vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
-                        }
-
-                        var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                        var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                        if (calcuResultStart != null && calcuResultEnd != null)
-                        {
-                            if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
-                            {
-                                vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
-                            }
-                        }
-                    }
-                }
-
-            }
-
-            var dlg = new PumpParallelAnalyDlg();
-            dlg.SetBindingData(vmList);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                list?.ForEach(x =>
-                {
-                    var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
-                    if (pump != null)
-                    {
-                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
-                        pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
-                    }
-                });
-                ShowSelectedProperty();
-                return true;
-            };
-            dlg.ShowDialog();
-        }
-
-        #endregion
+        #endregion 鎵归噺閰嶇疆
 
         #region 鏋勪欢鏌ヨ
 
@@ -1343,29 +1630,19 @@
         {
             if (_searchCtrl == null)
             {
+                var visualVmListHelper = GetVisualVmListHelper();
+                var allVisualVmList = visualVmListHelper.GetVisualList();
                 _searchCtrl = new HydroVisualSearchListCtrl();
                 _searchCtrl.Dock = DockStyle.Fill;
-                var allVisualViewModelList = GetVisualViewModelList();
-                _searchCtrl.InitialData(allVisualViewModelList);
-                _searchCtrl.HydroClickInfoEvent += async (visual) =>
+                _searchCtrl.InitialData(allVisualVmList);
+                _searchCtrl.HydroClickInfoEvent += (visual) =>
                 {
-                    ShowSelectedProperty(visual);
-                    await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
+                    SelectVisual(visual, eSimulationVisualSource.Check);
                 };
-                _searchCtrl.HydroSearchInfoEvent += async (list) =>
+                _searchCtrl.HydroSearchInfoEvent += (list) =>
                 {
-                    var elementIds = new List<string>();
-                    if (list != null && list.Count > 0)
-                    {
-                        _selectedVisual = list.First();
-                        list.ForEach(x => elementIds.Add(x.Code));
-                    }
-                    else
-                    {
-                        _selectedVisual = null;
-                    }
-                    ShowSelectedProperty();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
+                    var visual = list?.FirstOrDefault();
+                    SelectVisual(visual, eSimulationVisualSource.Search);
                 };
             }
             return _searchCtrl;
@@ -1432,122 +1709,40 @@
             ShowSearchDlg();
         }
 
-        #endregion
+        #endregion 鏋勪欢鏌ヨ
 
         #region 妯″瀷鏍囨敞
 
-        #region 鏍囨敞璁剧疆
+        //鏍囨敞杈呭姪绫�
+        private SimulationMarkHelper _markHelper = null;
 
-        //鎵�鏈夋爣娉ㄨ缃垪琛�
-        private List<HydroMarkSetViewModel> _allMarkSetList = null;
-
-        //鑾峰彇鏍囨敞璁剧疆鍒楄〃
-        private List<HydroMarkSetViewModel> GetMarkSetList()
+        //鑾峰彇鏍囨敞杈呭姪绫�
+        private async Task<SimulationMarkHelper> GetMarkHelper()
         {
-            if (_hydroInfo == null)
+            if (_markHelper == null)
             {
-                return default;
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _markHelper = new SimulationMarkHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
-            if (_allMarkSetList == null)
-            {
-                _allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
-            }
-            return _allMarkSetList;
+            return _markHelper;
         }
 
-        #endregion
-
-        #region 鏍囨敞缁撴灉
-
-        //鎵�鏈夋爣娉ㄧ粨鏋滃垪琛�
-        private List<HydroMarkResultViewModel> _allMarkResultList = null;
-
-        //鑾峰彇鏍囨敞缁撴灉鍒楄〃
-        //UseCache 鏄惁浣跨敤缂撳瓨
-        private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (!useCache)
-            {
-                var allSetList = GetMarkSetList();
-                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
-            }
-            if (_allMarkResultList == null)
-            {
-                var allSetList = GetMarkSetList();
-                _allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
-            }
-            return _allMarkResultList;
-        }
-
-        #endregion
-
-        #region 鏍囨敞鏄剧ず
-
-        //鏍囨敞鏄惁鏄剧ず
-        private bool _isMarkVisible = false;
-
-        //鏇存柊鏍囨敞
-        private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
-        {
-            var allSetList = GetMarkSetList();
-            var result = HydroMarkHelper.GetResult(visual, allSetList);
-            if (result == null)
-            {
-                return;
-            }
-            var allResultList = GetMarkResultList(true);
-            allResultList.Remove(x => x.Code == visual.Code);
-            allResultList.Add(result);
-            if (_isMarkVisible)
-            {
-                var leadLabel = new LogicMarkLeadLabel() { Id = result.Code, Text = result.Text, Distance = null };
-                await _bimfaceCtrl?.UpdateLogicMarkLeadLabel(leadLabel);
-            }
-        }
-
-        //鏇存柊鏍囨敞鍒楄〃
-        private void UpdateMarkList(List<Yw.Model.HydroVisualInfo> visuals)
-        {
-            if (visuals == null || visuals.Count < 1)
-            {
-                visuals.ForEach(x => UpdateMark(x));
-            }
-        }
-
-        //搴旂敤鏍囨敞鍒楄〃
-        //UseCache 鏄惁浣跨敤缂撳瓨
-        private async void ApplyMarkList(bool useCache = true)
-        {
-            if (_isMarkVisible)
-            {
-                var allResultList = GetMarkResultList(useCache);
-                var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, null)).ToList();
-                await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
-            }
-            else
-            {
-                await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
-            }
-        }
-
-        //鏄剧ず鏍囨敞璁剧疆绐椾綋
-        private void ShowSetMarkDlg()
+        //鏄剧ず鏍囨敞鍒楄〃
+        private async void ShowMarkList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allMarkSetList = GetMarkSetList();
+            var markHelper = await GetMarkHelper();
             var dlg = new SetHydroMarkDlg();
-            dlg.SetBindingData(allMarkSetList);
+            dlg.SetBindingData(markHelper.Sets);
             dlg.ReloadDataEvent += (list) =>
             {
-                _allMarkSetList = list;
-                ApplyMarkList(false);
+                markHelper.Sets = list;
+                markHelper.Set();
             };
             dlg.ShowDialog();
         }
@@ -1555,251 +1750,98 @@
         //璁剧疆鏍囨敞
         private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowSetMarkDlg();
+            ShowMarkList();
         }
 
         //鏄惁鏄剧ず
-        private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isMarkVisible = this.barCkMark.Checked;
-            ApplyMarkList(true);
+            var markHelper = await GetMarkHelper();
+            markHelper.Visible = this.barCkMark.Checked;
+            markHelper.Set();
         }
 
-        #endregion
-
-        #endregion
+        #endregion 妯″瀷鏍囨敞
 
         #region 棰滆壊鍒嗙骇
 
-        #region 棰滆壊閰嶇疆
+        //棰滆壊鍒嗙骇杈呭姪绫�
+        private SimulationGradingHelper _gradingHelper = null;
 
-        //鎵�鏈夐鑹插垎绾ч厤缃垪琛�
-        private List<HydroGradingVmo> _allGradingList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇閰嶇疆鍒楄〃
-        private async Task<List<HydroGradingVmo>> GetGradingList()
+        //鑾峰彇棰滆壊鍒嗙骇杈呭姪绫�
+        private async Task<SimulationGradingHelper> GetGradingHelper()
         {
-            if (_hydroInfo == null)
+            if (_gradingHelper == null)
             {
-                return default;
+                var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
-            if (_allGradingList == null)
-            {
-                _allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
-            }
-            return _allGradingList;
+            return _gradingHelper;
         }
 
-        //鏄剧ず棰滆壊鍒嗙骇绐椾綋
-        private async void ShowGradingDlg()
+        //璁剧疆棰滆壊鍒嗙骇鍒楄〃
+        private async void SetGradingList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allGradingList = await GetGradingList();
+            var gradingHelper = await GetGradingHelper();
+            var allGradingList = await gradingHelper.GetGradingList();
             var dlg = new SetHydroGradingTreeDlg();
             dlg.SetBindingData(_hydroInfo, allGradingList);
             dlg.ReloadDataEvent += (list) =>
             {
-                _allGradingList = list;
-                ApplyGradingResultList(false);
+                gradingHelper.SetGradingList(list);
+                gradingHelper.Set();
             };
             dlg.ApplyDataEvent += (catalog, propName) =>
             {
-                UpdateGradingApplyList(catalog, propName);
-                ApplyGradingResultList(false);
+                gradingHelper.UpdateApply(catalog, propName);
+                gradingHelper.Set();
             };
             dlg.ShowDialog();
         }
 
         //閰嶇疆棰滆壊鍒嗙骇
-        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnSetGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowGradingDlg();
+            SetGradingList();
         }
 
-        #endregion
-
-        #region 搴旂敤鍒嗙骇
-
-        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private List<HydroGradingApplyViewModel> GetGradingApplyList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_allGradingApplyList == null)
-            {
-                _allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
-            }
-            return _allGradingApplyList;
-        }
-
-        //鏇存柊棰滆壊鍒嗙骇搴旂敤鍒楄〃
-        private void UpdateGradingApplyList(string catalog, string propName)
-        {
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return;
-            }
-            var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
-            if (apply == null)
-            {
-                return;
-            }
-            apply.PropName = propName;
-        }
-
-        //鏄剧ず棰滆壊鍒嗙骇搴旂敤绐椾綋
-        private void ShowGradingApplyDlg()
+        //搴旂敤棰滆壊鍒嗙骇鍒楄〃
+        private async void ApplyGradingList()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allGradingApplyList = GetGradingApplyList();
-            if (allGradingApplyList == null || allGradingApplyList.Count < 1)
-            {
-                return;
-            }
+            var gradingHelper = await GetGradingHelper();
             var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(allGradingApplyList);
-            dlg.ReloadDataEvent += (obj) =>
+            dlg.SetBindingData(gradingHelper.Applies);
+            dlg.ReloadDataEvent += (list) =>
             {
-                _allGradingApplyList = obj;
-                ApplyGradingResultList(false);
+                gradingHelper.Applies = list;
+                gradingHelper.Set();
             };
             dlg.ShowDialog();
         }
 
         //搴旂敤棰滆壊鍒嗙骇
-        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnApplyGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowGradingApplyDlg();
-        }
-
-        #endregion
-
-        #region 搴旂敤缁撴灉
-
-        //鎵�鏈夐鑹插垎绾х粨鏋滃垪琛�
-        private List<HydroGradingResultViewModel> _allGradingResultList = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        //UseCache鏄惁浣跨敤缂撳瓨
-        private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            var allGradingList = await GetGradingList();
-            var allGradingApplyList = GetGradingApplyList();
-            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-            if (!useCache)
-            {
-                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
-            }
-            if (_allGradingResultList == null)
-            {
-                _allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
-            }
-            return _allGradingResultList;
-        }
-
-        #endregion
-
-        #region 缁撴灉灞曠ず
-
-        //棰滆壊鍒嗙骇鏄惁鏄剧ず
-        private bool _isGradingVisible = false;
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        //UseCache鏄惁浣跨敤缂撳瓨
-        private async void ApplyGradingResultList(bool useCache = true)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var allGradingResultList = await GetGradingResultList(useCache);
-            if (allGradingResultList == null || allGradingResultList.Count < 1)
-            {
-                return;
-            }
-            if (_isGradingVisible)
-            {
-                var groupList = allGradingResultList.GroupBy(x => x.Color).ToList();
-                groupList.ForEach(async x => await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1));
-            }
-            else
-            {
-                var codes = allGradingResultList.Select(x => x.Code).Distinct().ToList();
-                await _bimfaceCtrl?.RestoreComponentsColor(codes);
-            }
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        private async void ApplyGradingResultList(Yw.Model.HydroVisualInfo visual)
-        {
-            if (visual == null)
-            {
-                return;
-            }
-            var allGradingList = await GetGradingList();
-            var allGradingApplyList = GetGradingApplyList();
-            var allGradingResultList = await GetGradingResultList(true);
-            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-            var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
-            if (oldResult != null)
-            {
-                allGradingResultList.Remove(oldResult);
-            }
-            var newResult = HydroGradingHelper.GetResult(visual, allGradingList, allGradingApplyList, allCalcuResultList);
-            if (newResult != null)
-            {
-                allGradingResultList.Add(newResult);
-            }
-            if (_isGradingVisible)
-            {
-                if (newResult == null)
-                {
-                    if (oldResult != null)
-                    {
-                        await _bimfaceCtrl?.RestoreComponentsColor(oldResult.Code);
-                    }
-                }
-                else
-                {
-                    await _bimfaceCtrl?.OverrideComponentsColor(newResult.Code, newResult.Color, 1);
-                }
-            }
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇缁撴灉鍒楄〃
-        private void ApplyGradingResultList(List<Yw.Model.HydroVisualInfo> visualList)
-        {
-            if (visualList == null || visualList.Count < 1)
-            {
-                return;
-            }
-            visualList.ForEach(x => ApplyGradingResultList(x));
+            ApplyGradingList();
         }
 
         //棰滆壊鍒嗙骇灞曠ず
-        private void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            _isGradingVisible = this.barCkGrading.Checked;
-            ApplyGradingResultList(true);
+            var gradingHelper = await GetGradingHelper();
+            gradingHelper.Visible = this.barCkGrading.Checked;
+            gradingHelper.Set();
         }
-
-        #endregion
 
         #endregion
 
@@ -1808,227 +1850,157 @@
         //鍒锋柊
         private async void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
+            if (this.RefreshModelEvent == null)
+            {
+                return;
+            }
             if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
-                if (_project == null)
+                var hydroInfo = await this.RefreshModelEvent.Invoke();
+                if (hydroInfo == null)
                 {
+                    TipFormHelper.ShowError("鍒锋柊澶辫触锛�");
                     return;
                 }
-                if (_projectSite == null)
-                {
-                    return;
-                }
-                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
-                Stopwatch sw = new Stopwatch();
-                sw.Start();
-                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
-                sw.Stop();
-                TimeSpan ts2 = sw.Elapsed;
-                Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-                _selectedVisual = null;
-                await _bimfaceCtrl?.ZoomAndSelectComponents(null);
-                ShowSelectedProperty();
-                TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+                _hydroInfo = hydroInfo;
+                SelectVisual(visual: null, eSimulationVisualSource.None);
+
+                ResetVisualList();
+                TipFormHelper.ShowSucceed("鍒锋柊鎴愬姛锛�");
+            }
+        }
+
+        #endregion 浜哄伐鍒锋柊
+
+        #region 鐩戞祴鐐�
+
+        //鐩戞祴鐐硅緟鍔╃被
+        private SimulationMonitorHelper _monitorHelper = null;
+
+        //鑾峰彇鐩戞祴鐐硅緟鍔╃被
+        private SimulationMonitorHelper GetMonitorHelper()
+        {
+            if (_monitorHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                _monitorHelper = new SimulationMonitorHelper(visualListHelper);
+            }
+            return _monitorHelper;
+        }
+
+        //鑾峰彇鐩戞祴鐐瑰垪琛�
+        private async Task<List<HydroMonitorVmo>> GetMonitorList()
+        {
+            var helper = GetMonitorHelper();
+            return await helper.GetAll();
+        }
+
+        #endregion
+
+        #region 鐩戞祴鍊�
+
+        //鐩戞祴鍊艰緟鍔╃被
+        private SimulationMonitorValueHelper _monitorValueHelper = null;
+
+        //鑾峰彇鐩戞祴鍊艰緟鍔╃被
+        private SimulationMonitorValueHelper GetMonitorValueHelper()
+        {
+            if (_monitorValueHelper == null)
+            {
+                var visualListHelper = GetVisualListHelper();
+                var monitorHelper = GetMonitorHelper();
+                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
+            }
+            return _monitorValueHelper;
+        }
+
+        //鑾峰彇鐩戞祴鍊煎垪琛�
+        private async Task<List<HydroMonitorValueViewModel>> GetMonitorValueList()
+        {
+            var helper = GetMonitorValueHelper();
+            return await helper.GetAll();
+        }
+
+        //閲嶇疆鐩戞祴鍊�
+        private void ResetMonitorValue()
+        {
+            var allWorkingList = GetWorkingList();
+            var working = allWorkingList?.LastOrDefault(x => !string.IsNullOrEmpty(x.MonitorInfo));
+            if (working != null)
+            {
+                var helper = GetMonitorValueHelper();
+                helper.Reset(working.MonitorInfo);
             }
         }
 
         #endregion
 
-        #region 姘存祦鍔ㄧ敾
+        #region 璁剧疆娴嬬偣
 
-        //姘存祦鍔ㄧ敾鏄惁鍙
-        private bool _isFlowEffectVisible = false;
-
-        //鎵�鏈夋按娴佸姩鐢诲垪琛�
-        private List<LogicFlowEffect> _allFlowEffectList = null;
-
-        //鑾峰彇娴佸悜鍒楄〃
-        private List<LogicFlowEffect> GetFlowEffectList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_allFlowEffectList == null)
-            {
-                _allFlowEffectList = new List<LogicFlowEffect>();
-                var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-                if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
-                {
-                    foreach (var parter in _hydroInfo.Pipes)
-                    {
-                        var flowEffect = new LogicFlowEffect();
-                        _allFlowEffectList.Add(flowEffect);
-                        flowEffect.Id = parter.Code;
-                        flowEffect.Rotation = 90;
-                        flowEffect.SpeedX = 0.1;
-                        if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
-                        {
-                            flowEffect.SpeedX = 0;
-                        }
-                        else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
-                        {
-                            flowEffect.SpeedX = 0.1;
-                        }
-                        else
-                        {
-                            flowEffect.SpeedX = -0.1;
-                        }
-
-                        if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
-                        {
-                            flowEffect.SpeedY = 0;
-                        }
-                        else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
-                        {
-                            flowEffect.SpeedY = 0.1;
-                        }
-                        else
-                        {
-                            flowEffect.SpeedY = -0.1;
-                        }
-
-                        var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
-                        if (calcuResult != null)
-                        {
-                            if (calcuResult.CalcuVelocity < 0)
-                            {
-                                flowEffect.SpeedX = -flowEffect.SpeedX;
-                            }
-                        }
-                    }
-                }
-            }
-            return _allFlowEffectList;
-        }
-
-        //鍔犺浇姘存祦鍔ㄧ敾
-        private async void LoadFlowEffect()
+        //璁剧疆娴嬬偣鍒楄〃
+        private async void SetMonitorList(HydroVisualInfo visual)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var allFlowEffectList = GetFlowEffectList();
-            await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
-        }
-
-        //鍗歌浇姘存祦鍔ㄧ敾
-        private async void UnloadFlowEffect()
-        {
-            if (_hydroInfo == null)
+            if (visual == null)
             {
                 return;
             }
-            await _bimfaceCtrl?.UnloadFlowEffect();
+            var monitorHelper = GetMonitorHelper();
+            var allMonitorList = await monitorHelper.GetAll();
+            var monitorValueHelper = GetMonitorValueHelper();
+            var allMonitorValueList = await monitorValueHelper.GetAll();
+            var dlg = new SetHydroMonitorListDlg();
+            dlg.ReloadDataEvent += async (list) =>
+            {
+                var monitorList = list?.Select(x => x.Vmo).ToList();
+                await monitorHelper.Update(visual.Code, monitorList);
+                await monitorValueHelper.Update(visual.Code, list);
+                var monitorMarkerHelper = await GetMonitorMarkerHelper();
+                monitorMarkerHelper.Set();
+            };
+            dlg.SetBindingData(_hydroInfo, visual, allMonitorList, allMonitorValueList);
+            dlg.ShowDialog();
         }
 
-        //璁剧疆姘村姏鍔ㄧ敾
-        private void SetFlowEffect()
+        //璁剧疆娴嬬偣鍒楄〃
+        private void barBtnSetMonitorList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_isFlowEffectVisible)
+            if (_visual == null)
             {
-                LoadFlowEffect();
-            }
-            else
-            {
-                UnloadFlowEffect();
-            }
-        }
-
-        //鏇存柊姘存祦鍔ㄧ敾
-        private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
-        {
-            if (_hydroInfo == null)
-            {
+                TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
                 return;
             }
-            var allFlowEffectList = GetFlowEffectList();
-            var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
-            if (flowEffect == null)
-            {
-                return;
-            }
-            if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedX = 0;
-            }
-            else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedX = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedX = -0.1;
-            }
-
-            if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
-            {
-                flowEffect.SpeedY = 0;
-            }
-            else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
-            {
-                flowEffect.SpeedY = 0.1;
-            }
-            else
-            {
-                flowEffect.SpeedY = -0.1;
-            }
-
-            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-            var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
-            if (calcuResult != null)
-            {
-                if (calcuResult.CalcuVelocity < 0)
-                {
-                    flowEffect.SpeedX = -flowEffect.SpeedX;
-                }
-            }
-            if (_isFlowEffectVisible)
-            {
-                await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
-            }
-        }
-
-        //姘存祦鍔ㄧ敾鏄惁鍙
-        private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            _isFlowEffectVisible = this.barCkFlowEffect.Checked;
-            SetFlowEffect();
+            SetMonitorList(_visual);
         }
 
         #endregion
 
-        #region 鏋勪欢鏄庣粏鎺т欢
+        #region 璁剧疆娴嬪��
 
-        //鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
+        //鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
 
-        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
+        //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
+        private HydroMonitorValueListCtrl GetMonitorValueListCtrl()
         {
-            if (_visualListCtrl == null)
+            if (_monitorValueListCtrl == null)
             {
-                _visualListCtrl = new HydroVisualListCtrl();
-                _visualListCtrl.Dock = DockStyle.Fill;
-                _visualListCtrl.HydroClickInfoEvent += async (visual) =>
+                _monitorValueListCtrl = new HydroMonitorValueListCtrl();
+                _monitorValueListCtrl.Dock = DockStyle.Fill;
+                _monitorValueListCtrl.HydroViewEvent += (code) =>
                 {
-                    ShowSelectedProperty(visual);
-                    await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
-                };
-                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
-                {
-                    UpdateMarkList(visualList);
-                    UpdateSelectedProperty();
-                    ApplyGradingResultList();
+                    var visual = GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Monitor);
                 };
             }
-            return _visualListCtrl;
+            return _monitorValueListCtrl;
         }
 
-        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
-        private bool IsVisualListCtrlVisible
+        //鐩戞祴鍊煎垪琛ㄦ帶浠舵槸鍚﹀彲瑙�
+        private bool IsMonitorValueListCtrlVisible
         {
             get
             {
@@ -2036,7 +2008,7 @@
                 {
                     if (this.controlContainerBottom.Controls.Count > 0)
                     {
-                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
+                        if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
                         {
                             return true;
                         }
@@ -2046,321 +2018,58 @@
             }
         }
 
-        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowVisualListCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (IsVisualListCtrlVisible)
-            {
-                return;
-            }
-
-            var visualListCtrl = GetVisualListCtrl();
-            var allVisualViewModelList = GetVisualViewModelList();
-            visualListCtrl.SetBindingData(allVisualViewModelList);
-            var allCalcuResultList = GetCalcuVisualResultList(Yw.EPAnet.CalcuMode.MinorLoss, false);
-            if (allCalcuResultList == null || allCalcuResultList.Count < 1)
-            {
-                visualListCtrl.SetNormalView();
-            }
-            else
-            {
-                visualListCtrl.SetCalcuView();
-            }
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(visualListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
-            this.docPnlBottom.Height = 350;
-        }
-
-        //鏇存柊鏋勪欢鏄庣粏鎺т欢
-        private void UpdateVisualListCtrl()
-        {
-            if (!IsVisualListCtrlVisible)
-            {
-                return;
-            }
-            _visualListCtrl?.UpdateBindingData();
-        }
-
-        //鏋勪欢鏄庣粏
-        private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowVisualListCtrl();
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍒楄〃
-
-        #region 娴嬬偣鍒楄〃
-
-        //鎵�鏈夌洃娴嬬偣鍒楄〃
-        private List<HydroMonitorVmo> _allMonitorList = null;
-
-        //鑾峰彇鐩戞祴鐐瑰垪琛�
-        private async Task<List<HydroMonitorVmo>> GetMonitorList()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_allMonitorList == null)
-            {
-                _allMonitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByModelID(_hydroInfo.ID);
-                if (_allMonitorList == null)
-                {
-                    _allMonitorList = new List<HydroMonitorVmo>();
-                }
-            }
-            return _allMonitorList;
-        }
-
-        //鏇存柊鐩戞祴鐐瑰垪琛�
-        private async void UpdateMonitorList(string code)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(code))
-            {
-                return;
-            }
-            var allMonitorList = await GetMonitorList();
-            allMonitorList.RemoveAll(x => x.Relation == code);
-            var monitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByRelation(_hydroInfo.ID, code);
-            if (monitorList != null && monitorList.Count > 0)
-            {
-                allMonitorList.AddRange(monitorList);
-            }
-            UpdateMonitorValueList(code, monitorList);
-            SetLogicMonitorList();
-        }
-
-        //璁剧疆閫夋嫨鏋勪欢鐩戞祴鐐瑰垪琛�
-        private async void SetSelectVisualMonitorList()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_selectedVisual == null)
-            {
-                return;
-            }
-            var allMonitorList = await GetMonitorList();
-            var dlg = new SetHydroVisualMonitorDlg();
-            dlg.SetBindingData(_hydroInfo, _selectedVisual, allMonitorList);
-            dlg.ReloadDataEvent += async (hydroInfo, visual, list) =>
-            {
-                if (hydroInfo == null)
-                {
-                    return;
-                }
-                if (visual == null)
-                {
-                    return;
-                }
-                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(hydroInfo.ID, visual.Code, list);
-                if (!bol)
-                {
-                    TipFormHelper.ShowError("璁剧疆澶辫触");
-                    return;
-                }
-                TipFormHelper.ShowSucceed("璁剧疆鎴愬姛");
-                UpdateMonitorList(visual.Code);
-            };
-            dlg.ShowDialog();
-        }
-
-        //璁剧疆鐩戞祴鐐�
-        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetSelectVisualMonitorList();
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍊煎垪琛�
-
-        //鎵�鏈夌洃娴嬪�煎垪琛�
-        private List<HydroVisualMonitorValueViewModel> _allMonitorValueList = null;
-
-        //鑾峰彇鐩戞祴鍊煎垪琛�
-        private async Task<List<HydroVisualMonitorValueViewModel>> GetMonitorValueList()
-        {
-            if (_allMonitorValueList == null)
-            {
-                _allMonitorValueList = new List<HydroVisualMonitorValueViewModel>();
-                var allMonitorList = await GetMonitorList();
-                var allVisualViewModelList = GetVisualViewModelList();
-                allMonitorList.ForEach(x =>
-                {
-                    var visual = allVisualViewModelList.Find(t => t.Code == x.Relation);
-                    if (visual != null)
-                    {
-                        var vm = new HydroVisualMonitorValueViewModel(visual.Vmo, x);
-                        _allMonitorValueList.Add(vm);
-                    }
-                });
-            }
-            return _allMonitorValueList;
-        }
-
-        //鏇存柊鐩戞祴鍊煎垪琛�
-        private async void UpdateMonitorValueList(string code, List<HydroMonitorVmo> monitorList)
-        {
-            if (string.IsNullOrEmpty(code))
-            {
-                return;
-            }
-            var visual = GetVisualViewModel(code)?.Vmo;
-            if (visual == null)
-            {
-                return;
-            }
-            var allMonitorValueList = await GetMonitorValueList();
-            var monitorValueList = allMonitorValueList.Where(x => x.Vmo.Relation == code).ToList();
-            monitorValueList?.ForEach(x =>
-            {
-                var result = monitorList?.Exists(t => t.Relation == x.Vmo.Relation && t.PropName == x.Vmo.PropName);
-                if (!(result.HasValue && result.Value))
-                {
-                    allMonitorValueList.Remove(x);
-                }
-            });
-            monitorList?.ForEach(x =>
-            {
-                var result = monitorValueList?.Exists(t => t.Vmo.Relation == x.Relation && t.Vmo.PropName == x.PropName);
-                if (!(result.HasValue && result.Value))
-                {
-                    var vm = new HydroVisualMonitorValueViewModel(visual, x);
-                    allMonitorValueList.Add(vm);
-                }
-            });
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍊煎垪琛ㄦ帶浠�
-
-        //鐩戞祴鍊煎垪琛ㄦ帶浠�
-        private HydroVisualMonitorValueListCtrl _monitorValueListCtrl = null;
-
-        //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
-        private HydroVisualMonitorValueListCtrl GetMonitorValueListCtrl()
-        {
-            if (_monitorValueListCtrl == null)
-            {
-                _monitorValueListCtrl = new HydroVisualMonitorValueListCtrl();
-                _monitorValueListCtrl.Dock = DockStyle.Fill;
-                _monitorValueListCtrl.HydroViewEvent += (code) =>
-                {
-                    _bimfaceCtrl?.ZoomToComponent(code);
-                };
-            }
-            return _monitorValueListCtrl;
-        }
-
         //鏄剧ず鐩戞祴鍊煎垪琛ㄦ帶浠�
         private async void ShowMonitorValueListCtrl()
         {
             var monitorValueListCtrl = GetMonitorValueListCtrl();
-            var allMonitorValueList = await GetMonitorValueList();
-            monitorValueListCtrl.SetBindingData(allMonitorValueList);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鐩戞祴鍊�";
-            this.docPnlBottom.Height = 350;
+            if (!IsMonitorValueListCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "璁剧疆娴嬪��";
+                this.docPnlBottom.Height = 350;
+            }
+            var allValueList = await GetMonitorValueList();
+            monitorValueListCtrl.SetBindingData(allValueList);
         }
 
-        //璁剧疆鐩戞祴鍊�
-        private void barBtnSetMonitorValue_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璁剧疆娴嬪��
+        private void barBtnSetMonitorValueList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             ShowMonitorValueListCtrl();
         }
 
-        #endregion
+        #endregion 
 
-        #region 鐩戞祴鍒楄〃鏄剧ず
+        #region 娴嬬偣鏍囪
 
-        //鐩戞祴鏄惁鏄剧ず
-        private bool _isMonitorVisible = false;
+        //鐩戞祴鏍囪杈呭姪绫�
+        private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
 
-        //鑾峰彇涓氬姟鐩戞祴鍒楄〃
-        private async Task<List<LogicMonitor>> GetLogicMonitorList()
+        //鑾峰彇鐩戞祴鏍囪杈呭姪绫�
+        private async Task<SimulationMonitorMarkerHelper> GetMonitorMarkerHelper()
         {
-            var allMonitorList = await GetMonitorList();
-            var allLogicMonitorList = allMonitorList.Select(x =>
+            if (_monitorMarkerHelper == null)
             {
-                var logicMonitor = new LogicMonitor();
-                logicMonitor.Id = x.Relation;
-                logicMonitor.PropName = x.PropName;
-                logicMonitor.Description = x.Description;
-                return logicMonitor;
-            }).ToList();
-            return allLogicMonitorList;
+                var monitorHelper = GetMonitorHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _monitorMarkerHelper = new SimulationMonitorMarkerHelper(monitorHelper, bimfaceCtrl);
+            }
+            return _monitorMarkerHelper;
         }
 
-        //璁剧疆涓氬姟鐩戞祴鍒楄〃
-        private async void SetLogicMonitorList()
+        //娴嬬偣鏄剧ず鐘舵�佹敼鍙�
+        private async void barCkMonitorVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_isMonitorVisible)
-            {
-                var allLogicMonitorList = await GetLogicMonitorList();
-                await _bimfaceCtrl?.SetLogicMonitors(allLogicMonitorList);
-            }
-            else
-            {
-                await _bimfaceCtrl?.ClearLogicMonitors();
-            }
-        }
-
-        //鏄剧ず鐘舵�佹敼鍙�
-        private void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            _isMonitorVisible = this.barCkMonitor.Checked;
-            SetLogicMonitorList();
-        }
-
-
-        #endregion
-
-        #endregion
-
-        #region 妫�鏌ョ粨鏋�
-
-        //妫�鏌ョ粨鏋滅紦瀛�
-        private HydroCheckResult _checkResult = null;
-
-        //鑾峰彇妫�鏌ョ粨鏋�
-        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
-        private HydroCheckResult GetCheckResult(bool needCheckAgain = false)
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (needCheckAgain)
-            {
-                _checkResult = _hydroInfo.Check();
-            }
-            if (_checkResult == null)
-            {
-                _checkResult = _hydroInfo.Check();
-            }
-            return _checkResult;
+            var monitorMarkerHelper = await GetMonitorMarkerHelper();
+            monitorMarkerHelper.Visible = this.barCkMonitorVisible.Checked;
+            monitorMarkerHelper.Set();
         }
 
         #endregion
 
-        #region 妫�鏌ユ帶浠�
+        #region 妯″瀷妫�鏌�
 
         //妫�鏌ユ帶浠�
         private HydroCheckResultCtrl _checkCtrl = null;
@@ -2368,59 +2077,98 @@
         //鑾峰彇妫�鏌ユ帶浠�
         private HydroCheckResultCtrl GetCheckCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
             if (_checkCtrl == null)
             {
                 _checkCtrl = new HydroCheckResultCtrl();
                 _checkCtrl.Dock = DockStyle.Fill;
-                _checkCtrl.HydroClickEvent += async (code) =>
+                _checkCtrl.HydroClickEvent += (code) =>
                 {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var elementIds = new List<string>();
-                    if (string.IsNullOrEmpty(code))
-                    {
-                        this.SelectedVisual = null;
-                    }
-                    else
-                    {
-                        var allVisualViewModelList = GetVisualViewModelList();
-                        this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
-                        if (this.SelectedVisual != null)
-                        {
-                            elementIds.Add(this.SelectedVisual.Code);
-                        }
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    ShowSelectedProperty();
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Check);
                 };
             }
             return _checkCtrl;
         }
 
-        //鏄剧ず妫�鏌ユ帶浠�
-        //needCheckAgain 鐢ㄤ簬纭畾鏄惁闇�瑕侀噸鏂版鏌�
-        private void ShowCheckCtrl(bool needCheckAgain = false)
+        //妫�鏌ユ帶浠舵槸鍚﹀彲瑙�
+        private bool IsCheckCtrlVisible
         {
-            var checkResult = GetCheckResult(needCheckAgain);
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCheckResultCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        //鏄剧ず妫�鏌ユ帶浠�
+        private void ShowCheckCtrl(HydroCheckResult checkResult)
+        {
             if (checkResult == null)
             {
                 return;
             }
             var checkCtrl = GetCheckCtrl();
+            if (!IsCheckCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(checkCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
+                this.docPnlBottom.Height = 350;
+            }
             checkCtrl.SetBindingData(checkResult);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(checkCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
-            this.docPnlBottom.Height = 350;
+        }
+
+        //鏄剧ず妫�鏌ユ帶浠�
+        private void ShowCheckCtrl()
+        {
+            var checkResult = GetCheckResult();
+            ShowCheckCtrl(checkResult);
         }
 
         //妫�鏌�
         private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowCheckCtrl(true);
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var checkResult = _hydroInfo.Check();
+            ShowCheckCtrl(checkResult);
+        }
+
+        #endregion 妯″瀷妫�鏌�
+
+        #region 妯″瀷璁$畻
+
+        #region 璁$畻缁撴灉
+
+        //璁$畻缁撴灉杈呭姪绫�
+        private SimulationCalcuResultHelper _calcuResultHelper = null;
+
+        //鑾峰彇璁$畻缁撴灉杈呭姪绫�
+        private SimulationCalcuResultHelper GetCalcuResultHelper()
+        {
+            if (_calcuResultHelper == null)
+            {
+                var workingHelper = GetWorkingHelper();
+                _calcuResultHelper = new SimulationCalcuResultHelper(workingHelper);
+            }
+            return _calcuResultHelper;
         }
 
         #endregion
@@ -2441,6 +2189,25 @@
             return _calcuFailedCtrl;
         }
 
+        //璁$畻澶辫触鎺т欢鏄惁鍙
+        private bool IsCalcuFailedCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCalcuFailedCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
         //鏄剧ず璁$畻澶辫触鎺т欢
         private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
         {
@@ -2456,96 +2223,122 @@
             {
                 return;
             }
-
             var calcuFailedCtrl = GetCalcuFailedCtrl();
+            if (!IsCalcuFailedCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
+                this.docPnlBottom.Height = 350;
+            }
             calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
-            this.docPnlBottom.Height = 350;
         }
 
-        //鏄剧ず璁$畻澶辫触鎺т欢
-        private void ShowCalcuFailedCtrl()
+        #endregion 璁$畻澶辫触
+
+        #region 璁$畻璀﹀憡
+
+        //璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl _calcuWarningCtrl = null;
+
+        //鑾峰彇璁$畻璀﹀憡鎺т欢
+        private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
         {
-            ShowCalcuFailedCtrl(_calcuResult);
+            if (_calcuWarningCtrl == null)
+            {
+                _calcuWarningCtrl = new HydroCalcuWarningCtrl();
+                _calcuWarningCtrl.Dock = DockStyle.Fill;
+                _calcuWarningCtrl.HydroClickEvent += (code) =>
+                {
+                    var visualListHelper = GetVisualListHelper();
+                    var visual = visualListHelper.GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Warning);
+                };
+            }
+            return _calcuWarningCtrl;
         }
 
-        #endregion
+        //璁$畻璀﹀憡鎺т欢鏄惁鍙
+        private bool IsCalcuWarningCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroCalcuWarningCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
 
-        #region 绠$綉淇
-
-        //淇绠$綉
-        private void Repair()
+        //鏄剧ず璁$畻璀﹀憡鎺т欢
+        private void ShowCalcuWarningCtrl(HydroCalcuResult calcuResult)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var checkResult = GetCheckResult(true);
-            if (checkResult == null)
-            {
-                return;
-            }
-            if (!checkResult.Succeed)
-            {
-                ShowCheckCtrl(false);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
-                return;
-            }
-            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
             if (calcuResult == null)
             {
                 return;
             }
             if (!calcuResult.Succeed)
             {
-                ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
                 return;
             }
-            var allLinks = _hydroInfo.GetAllLinks();
-            if (allLinks != null && allLinks.Count < 1)
+            var calcuWaringCtrl = GetCalcuWarningCtrl();
+            if (!IsCalcuWarningCtrlVisible)
             {
-                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
-                return;
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(calcuWaringCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "璁$畻璀﹀憡";
+                this.docPnlBottom.Height = 350;
             }
-            int count = 0;
-            foreach (var link in allLinks)
-            {
-                var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
-                if (calcuLink == null)
-                {
-                    continue;
-                }
-                if (!calcuLink.CalcuFlow.HasValue)
-                {
-                    continue;
-                }
-                if (calcuLink.CalcuFlow.Value < 0)
-                {
-                    var tempCode = link.StartCode;
-                    link.StartCode = link.EndCode;
-                    link.EndCode = tempCode;
-                    count++;
-                }
-            }
-            UpdateVisualViewModelProperty();
-            UpdateVisualListCtrl();
-            UpdateSelectedProperty();
-            TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
+            var visualListHelper = GetVisualListHelper();
+            var allVisualDict = visualListHelper.GetVisualDict();
+            calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
         }
 
-        //绠$綉淇
-        private void barBtnRepair_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        #endregion 璁$畻璀﹀憡
+
+        #region 璁$畻鏍囩
+
+        //璁$畻鏍囩杈呭姪绫�
+        private SimulationCalcuResultLabelHelper _calcuResultLabelHelper = null;
+
+        //鑾峰彇璁$畻鏍囩杈呭姪绫�
+        private async Task<SimulationCalcuResultLabelHelper> GetCalcuResultLabelHelper()
         {
-            Repair();
+            if (_calcuResultLabelHelper == null)
+            {
+                var calcuResultHelper = GetCalcuResultHelper();
+                var bimfaceCtrl = await GetBimfaceCtrl();
+                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(calcuResultHelper, bimfaceCtrl);
+            }
+            return _calcuResultLabelHelper;
         }
+
+        //璁剧疆璁$畻鏍囩鏄惁鏄剧ず
+        private async void barCkCalcu_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+            calcuResultLabelHelper.Visible = this.barCkCalcu.Checked;
+            calcuResultLabelHelper.Set();
+        }
+
+        #endregion 璁$畻鏍囩
 
         #endregion
 
-        #region 瀵煎嚭INP鏂囦欢
+        #region 瀵煎嚭INP
 
         //瀵煎嚭INP鏂囦欢
         private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -2565,12 +2358,12 @@
             TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
-        #endregion
+        #endregion 瀵煎嚭INP
 
-        #region 骞惰仈鍒嗘瀽
+        #region 姘存车鍒楄〃
 
-        //骞惰仈鍒嗘瀽
-        private void ParallelAnalysis()
+        //鎬ц兘鏇茬嚎
+        private void PumpFeat()
         {
             if (_hydroInfo == null)
             {
@@ -2582,376 +2375,1096 @@
                 XtraMessageBox.Show("鏃犳按娉典俊鎭�");
                 return;
             }
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in pumps)
+            var dlg = new SimulationPumpFeatDlg();
+            dlg.SaveEvent += async (list) =>
             {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
+                pumps.ForEach(x => x.UpdateWorkingInfo(list));
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+                SelectVisual(_visual, eSimulationVisualSource.None);
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+            };
+            dlg.SetBindingData(_hydroInfo);
+            dlg.ShowDialog();
+        }
 
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+        //鎬ц兘鏇茬嚎
+        private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            PumpFeat();
+        }
 
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
+        //骞惰仈妯℃嫙
+        private void PumpParallel()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
             }
-
-            var dlg = new PumpParallelAnalyDlg();
-            dlg.SetBindingData(vmList);
-            dlg.ReloadDataEvent += (list) =>
+            var pumps = _hydroInfo.Pumps;
+            if (pumps == null || pumps.Count < 1)
+            {
+                XtraMessageBox.Show("鏃犳按娉典俊鎭�");
+                return;
+            }
+            var dlg = new SimulationPumpParallelDlg();
+            dlg.SaveEvent += async (list) =>
             {
                 list?.ForEach(x =>
                 {
                     var pump = pumps.Find(t => t.Code == x.Code);
                     if (pump != null)
                     {
-                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
-                        pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
+                        pump.LinkStatus = x.LinkStatus;
+                        pump.SpeedRatio = x.SpeedRatio;
                     }
                 });
-                var codes = list?.Select(x => x.Code).ToList();
-                UpdateVisualViewModelProperty(codes);
-                ShowSelectedProperty();
-                UpdateVisualListCtrl();
-                return true;
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
+                SelectVisual(_visual, eSimulationVisualSource.None);
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+            };
+            dlg.SetBindingData(_hydroInfo);
+            dlg.ShowDialog();
+        }
+
+        //骞惰仈妯℃嫙
+        private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            PumpParallel();
+        }
+
+        #endregion 姘存车鍒楄〃
+
+        #region 鍘嬪姏鍒囨崲
+
+        //璁$畻鍘嬪姏鏄惁涓虹粷瀵瑰帇鍔�
+        private bool _calcuPressModeIsHead = false;
+
+        //璁$畻缁撴灉鍘嬪姏鍒囨崲
+        private void barToggleSwitchPress_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            _calcuPressModeIsHead = !this.barToggleSwitchPress.Checked;
+            this.barToggleSwitchPress.Caption = _calcuPressModeIsHead ? "缁濆鍘嬪姏" : "鑷敱鍘嬪姏";
+            var workingHelper = GetWorkingHelper();
+            workingHelper.ResetResult(_calcuPressModeIsHead);
+            UpdateVisualListCtrl();
+            UpdatePropertyCtrl();
+        }
+
+        #endregion 鍘嬪姏鍒囨崲
+
+        #region 璇勪环瑙勫垯
+
+        //璇勪环瑙勫垯杈呭姪绫�
+        private SimulationEvaluationHelper _evaluationHelper = null;
+
+        //鑾峰彇璇勪环瑙勫垯杈呭姪绫�
+        private SimulationEvaluationHelper GetEvaluationHelper()
+        {
+            if (_evaluationHelper == null)
+            {
+                _evaluationHelper = new SimulationEvaluationHelper(_hydroInfo.ID);
+            }
+            return _evaluationHelper;
+        }
+
+        //鑾峰彇璇勪环瑙勫垯鍒楄〃
+        private async Task<List<Yw.Vmo.HydroEvaluationVmo>> GetEvaluationList()
+        {
+            var helper = GetEvaluationHelper();
+            return await helper.GetEvaluationList();
+        }
+
+        //璁剧疆璇勪环瑙勫垯鍒楄〃
+        private void SetEvaluationList(List<Yw.Vmo.HydroEvaluationVmo> allEvaluationList)
+        {
+            var helper = GetEvaluationHelper();
+            helper.SetEvaluationList(allEvaluationList);
+        }
+
+        //鏄剧ず璇勪环绐椾綋
+        private void ShowEvaluationDlg()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var dlg = new SetHydroEvaluationModelDlg();
+            dlg.SetBindingData(_hydroInfo.ID);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                SetEvaluationList(rhs);
             };
             dlg.ShowDialog();
         }
 
-        //骞惰仈鍒嗘瀽
-        private void barBtnParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璇勪环瑙勫垯
+        private void barBtnEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ParallelAnalysis();
+            ShowEvaluationDlg();
         }
 
         #endregion
 
-        #region 宸ュ喌璁$畻
+        #region 姘村姏璁$畻
 
-        //鎵�鏈夊伐鍐靛厓缁勫垪琛�
-        private List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>> _allWorkingTupleList = new List<Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>>();
-
-        //鏄剧ず宸ュ喌璁$畻绐椾綋
-        private void ShowWorkingCalcuDlg()
+        //璁$畻
+        private async void Calcu()
         {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allWorkingList = workingCheckedListHelper.GetWorkingList();
+            var monitorValueHelper = GetMonitorValueHelper();
+            var allMonitorValueList = await monitorValueHelper.GetAll();
             var dlg = new SetHydroWorkingDlg();
-            dlg.HydroViewEvent += async (visual) =>
+            dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
+            dlg.HydroViewEvent += (visual) =>
             {
-                _selectedVisual = visual;
-                if (_selectedVisual != null)
-                {
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
-                }
-                ShowSelectedProperty();
+                SelectVisual(visual, eSimulationVisualSource.Calcu);
             };
-            dlg.HydroCalcuEvent += async (working) =>
+            dlg.HydroCalcuEvent += async (vm) =>
             {
-                if (_hydroInfo == null)
-                {
-                    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(vm.WorkingInfo);
+                allMonitorValueList.UpdateMonitorValue(vm.MonitorInfo);
 
-                _hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
-                //鏍¢獙
-                _checkResult = _hydroInfo.Check();
-                if (!_checkResult.Succeed)
+                var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+
+                var working = new HydroWorkingVmo();
+                working.ModelID = vm.ModelID;
+                working.Name = vm.Name;
+                working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo);
+                var useWorkingMonitorInfo = vm.MonitorInfo?.Where(x => x.PropValue.HasValue).ToList();
+                if (useWorkingMonitorInfo != null && useWorkingMonitorInfo.Count > 0)
                 {
-                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, null));
-                    ShowCheckCtrl();
-                    TipFormHelper.ShowWarn("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    working.MonitorInfo = JsonHelper.Object2Json(useWorkingMonitorInfo);
+                }
+                working.SortCode = vm.SortCode;
+                working.Description = vm.Description;
+
+                var workingHelper = GetWorkingHelper();
+                //鏍¢獙
+                var checkResult = _hydroInfo.Check();
+                if (!checkResult.Succeed)
+                {
+                    ShowCheckCtrl(checkResult);
+                    workingHelper.InitialData(hydroInfo, working, checkResult, null);
+                    TipFormHelper.ShowError("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
                     return;
                 }
+
+                var isHead = _calcuPressModeIsHead;
+                var allEvaluationList = await GetEvaluationList();
 
                 WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
-
-
-                //await Task.Delay(5000);
-                _calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
-
-
+                await Task.Delay(3000);
+                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, isHead, allEvaluationList);
                 WaitFormHelper.HideWaitForm();
-                if (_calcuResult.Succeed)
+                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
+                if (calcuResult.Succeed)
                 {
-                    _allWorkingTupleList.Add(new Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult>(vmo, _checkResult, _calcuResult));
-                    UpdateVisualViewModelProperty();
-                    UpdateVisualViewModelCalcuProperty();
-                    UpdateVisualListCtrl();
-                    UpdateSelectedProperty();
-                    await _bimfaceCtrl?.SetLogicCalcuCustomLabelsCalcuResult(_calcuResult);
+                    if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+                    {
+                        ShowCalcuWarningCtrl(calcuResult);
+                    }
+                    this.barBtnAddWorking.Enabled = true;
+                    this.barBtnExportWord.Enabled = true;
                     TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
                 }
                 else
                 {
-                    ShowCalcuFailedCtrl();
+                    ShowCalcuFailedCtrl(calcuResult);
                     TipFormHelper.ShowError("璁$畻澶辫触锛�");
                 }
-                ApplyGradingResultList(false);
+
+                #region 瑙嗗浘鍒楄〃
+
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateCalcuProperty(calcuResult);
+
+                #endregion 瑙嗗浘鍒楄〃
+
+                #region 褰撳墠鏋勪欢
+
+                SelectVisual(_visual, eSimulationVisualSource.Calcu);
+
+                #endregion 褰撳墠鏋勪欢
+
+                #region 鏋勪欢鏄庣粏
+
                 UpdateVisualListCtrl();
-                ShowSelectedProperty();
+
+                #endregion 鏋勪欢鏄庣粏
+
+                #region 棰滆壊鍒嗙骇
+
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+
+                #endregion 棰滆壊鍒嗙骇
+
+                #region 璁$畻鏍囩
+
+                var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+                calcuResultLabelHelper.Set();
+
+                #endregion 璁$畻鏍囩
             };
-            dlg.SetBindingData(_hydroInfo, _allWorkingList, _allMonitorValueList);
             dlg.ShowDialog();
         }
 
         //姘村姏璁$畻
-        private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void barBtnCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ShowWorkingCalcuDlg();
+            Calcu();
         }
 
-        #endregion
+        #endregion 姘村姏璁$畻
+
+        #region 瀵煎嚭鎶ュ憡
+
+        //鍒涘缓鎵撳嵃淇℃伅
+        private async Task<SimulationPrintViewModel> CreatePrintInfo()
+        {
+            if (_project == null)
+            {
+                return default;
+            }
+            if (_hydroInfo == null)
+            {
+                return default;
+            }
+
+            #region 宸ュ喌鍒楄〃
+
+            var allWorkingList = GetCheckedWorkingList();
+            if (allWorkingList == null || allWorkingList.Count < 1)
+            {
+                var working = GetWorking();
+                if (working == null)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楁垨閫夋嫨宸ュ喌鍚庨噸璇曪紒");
+                    return default;
+                }
+                allWorkingList = new List<HydroWorkingVmo>() { working };
+            }
+
+            #endregion 宸ュ喌鍒楄〃
+
+            #region 閫夋嫨鑺傜偣
+
+            var selectedNode = GetSelectNode();
+            if (selectedNode == null)
+            {
+                return default;
+            }
+
+            #endregion 閫夋嫨鑺傜偣
+
+            var vm = new SimulationPrintViewModel();
+
+            #region 椤圭洰
+
+            vm.Project = new SimulationPrintProjectViewModel(_project);
+            if (_hydroInfo == null)
+            {
+                return vm;
+            }
+
+            #endregion 椤圭洰
+
+            #region 姘存车鍒楄〃
+
+            vm.PumpList = _hydroInfo.Pumps?.Select(x =>
+                {
+                    var pump = new SimulationPrintPumpViewModel(x);
+                    return pump;
+                }).ToList();
+
+            #endregion 姘存车鍒楄〃
+
+            #region 闄勫姞淇℃伅
+
+            var allMonitorList = await GetMonitorList();
+            var allEvaluationList = await GetEvaluationList();
+
+            #endregion 闄勫姞淇℃伅
+
+            #region 鍩虹妯″瀷
+
+            var baseHydroInfo = _hydroInfo;
+            if (_scheme != null)
+            {
+                baseHydroInfo = await GetModelEvent?.Invoke(null);
+            }
+            var baseHydroInfoRhs = baseHydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+
+            #endregion 鍩虹妯″瀷
+
+            #region 閬嶅巻宸ュ喌
+
+            vm.WorkingList = new List<SimulationPrintWorkingViewModel>();
+            foreach (var working in allWorkingList)
+            {
+                baseHydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
+                var calcuResult = baseHydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
+
+                var printWorking = new SimulationPrintWorkingViewModel(working);
+                vm.WorkingList.Add(printWorking);
+
+                //绮惧害璇勪及
+                printWorking.Accuracy = HydroAccuracyHelper.Create(baseHydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                //姘存车鍒嗘瀽
+                printWorking.PumpAnaly = HydroPumpAnalyHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                //鐩戞祴鍒嗘瀽
+                printWorking.MonitorAnaly = HydroMonitorAnalyHelper.Create(baseHydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                //鑳借�楀垎鏋�
+                printWorking.EnergyAnaly = HydroEnergyAnalyHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                //鎹熷け缁熻
+                printWorking.LossStatistics = HydroLossStatisticsHelper.Create(baseHydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                //鎹熷け鏇茬嚎
+                printWorking.LossCurve = HydroLossCurveHelper.Create(baseHydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+            }
+
+            #endregion 閬嶅巻宸ュ喌
+
+            #region 鏂规澶勭悊
+
+            if (_scheme != null)
+            {
+                var hydroInfo = _hydroInfo;
+                var hydroInfoRhs = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+                vm.Scheme = new SimulationPrintSchemeViewModel(_scheme);
+                foreach (var working in allWorkingList)
+                {
+                    hydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
+                    var calcuResult = hydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
+
+                    var printWorking = new SimulationPrintWorkingViewModel(working);
+                    vm.Scheme.WorkingList.Add(printWorking);
+
+                    //绮惧害璇勪及
+                    printWorking.Accuracy = HydroAccuracyHelper.Create(hydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                    //姘存车鍒嗘瀽
+                    printWorking.PumpAnaly = HydroPumpAnalyHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                    //鐩戞祴鍒嗘瀽
+                    printWorking.MonitorAnaly = HydroMonitorAnalyHelper.Create(hydroInfoRhs, allMonitorList, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                    //鑳借�楀垎鏋�
+                    printWorking.EnergyAnaly = HydroEnergyAnalyHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                    //鎹熷け缁熻
+                    printWorking.LossStatistics = HydroLossStatisticsHelper.Create(hydroInfoRhs, working, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                    //鎹熷け鏇茬嚎
+                    printWorking.LossCurve = HydroLossCurveHelper.Create(hydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
+                }
+            }
+
+            #endregion 鏂规澶勭悊
+
+            return vm;
+        }
+
+        //瀵煎嚭word
+        private async void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var printInfo = await CreatePrintInfo();
+            var printDlg = new HStation.WinFrmUI.SimulationCommonReportDlg();
+            printDlg.SetBindingData(printInfo);
+            printDlg.ShowDialog();
+            /*    if (_visual == null)
+                {
+                    SelectInputSource();
+                    if (_visual == null)
+                    {
+                        TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+                        return;
+                    }
+                }
+                HydroVisualInfo visual = _visual;
+                if (_visual is HydroLinkInfo linkInfo)
+                {
+                    var visualListHelper = GetVisualListHelper();
+                    visual = visualListHelper.GetVisual(linkInfo.StartCode);
+                }
+
+                var allMonitorList = await GetMonitorList();
+                var working = GetWorking();
+                var calcuResult = GetCalcuResult();
+
+                var dlg = new SimulationWorkingReportDlg();
+                dlg.ReloadDataEvent += (vm) =>
+                {
+                    var fileName = FileDialogHelper.SaveWordDoc("瀵煎嚭Word鎶ュ憡");
+                    if (string.IsNullOrEmpty(fileName))
+                    {
+                        return;
+                    }
+                    var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
+                    reportHelper.Create(fileName, vm);
+                    TipFormHelper.ShowInfo("瀵煎嚭鎴愬姛锛�");
+                };
+                dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual);
+                dlg.ShowDialog();*/
+        }
+
+        #endregion 瀵煎嚭鎶ュ憡
 
         #region 褰撳墠宸ュ喌
 
-        //褰撳墠宸ュ喌
-        private Yw.Vmo.HydroWorkingVmo _currentWorking = null;
+        //宸ュ喌杈呭姪绫�
+        private SimulationWorkingHelper _workingHelper = null;
 
-        //鍒濆鍖栧綋鍓嶅伐鍐�
-        private void InitialCurrentWorking(List<HydroWorkingVmo> allWorkingList)
+        //鑾峰彇宸ュ喌杈呭姪绫�
+        private SimulationWorkingHelper GetWorkingHelper()
         {
-            this.repositoryItemImageComboBox1.Items.BeginUpdate();
-            this.repositoryItemImageComboBox1.Items.Clear();
-            if (allWorkingList != null && allWorkingList.Count > 0)
+            if (_workingHelper == null)
             {
-                allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
-                this.barEditCurrentWorking.EditValue = allWorkingList.Last();
+                _workingHelper = new SimulationWorkingHelper();
             }
-            this.repositoryItemImageComboBox1.Items.EndUpdate();
+            return _workingHelper;
         }
 
-        //澧炲姞褰撳墠宸ュ喌
-        private void AppendCurrentWorking(HydroWorkingVmo working)
+        //鑾峰彇宸ュ喌
+        private HydroWorkingVmo GetWorking()
         {
-            this.repositoryItemImageComboBox1.Items.BeginUpdate();
-            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
-            this.repositoryItemImageComboBox1.Items.EndUpdate();
-            this.barEditCurrentWorking.EditValue = working;
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.Working;
         }
 
-        //璁剧疆褰撳墠宸ュ喌
-        private void SetCurrentWorking(HydroWorkingVmo working)
+        //鑾峰彇妫�鏌ョ粨鏋�
+        private HydroCheckResult GetCheckResult()
         {
-            _currentWorking = working;
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.CheckResult;
         }
 
-        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
-        private void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
+        //鑾峰彇璁$畻缁撴灉
+        private HydroCalcuResult GetCalcuResult()
         {
-            var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
-            SetCurrentWorking(working);
+            var workingHelper = GetWorkingHelper();
+            return workingHelper.CalcuResult;
         }
 
-
-        #endregion
-
-        #region 宸ュ喌鍒楄〃
-
-        //鎵�鏈夊伐鍐靛垪琛�
-        private List<HydroWorkingVmo> _allWorkingList = null;
-
-        //鍒濆鍖栧伐鍐靛垪琛�
-        private async void InitialWorkingList()
+        //鏂板宸ュ喌
+        private void AddWorking()
         {
-            _allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(_hydroInfo.ID);
-            if (_allWorkingList == null)
+            var workingHelper = GetWorkingHelper();
+            if (workingHelper.Working == null)
             {
-                _allWorkingList = new List<HydroWorkingVmo>();
+                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
+                return;
+            }
+            var dlg = new AddHydroWorkingDlg();
+            dlg.SetBindingData(workingHelper.Working);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                this.barBtnAddWorking.Enabled = false;
+                workingHelper.ResetWorking(rhs);
+                UpdateWorkingCheckedList(rhs, false);
+                this.AppendWorkingEvent?.Invoke(rhs);
+            };
+            dlg.ShowDialog();
+        }
+
+        //澧炲姞宸ュ喌
+        private void barBtnAddWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            AddWorking();
+        }
+
+        #endregion 褰撳墠宸ュ喌
+
+        #region 閫夋嫨宸ュ喌
+
+        //宸ュ喌閫夋嫨鍒楄〃杈呭姪绫�
+        private SimulationWorkingCheckedListHelper _workingCheckedListHelper = null;
+
+        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
+        private SimulationWorkingCheckedListHelper GetWorkingCheckedListHelper()
+        {
+            if (_workingCheckedListHelper == null)
+            {
+                _workingCheckedListHelper = new SimulationWorkingCheckedListHelper();
+                _workingCheckedListHelper.InitialData(_allWorkingCheckedListDict);
+            }
+            return _workingCheckedListHelper;
+        }
+
+        //鑾峰彇宸ュ喌瀛楀吀
+        private Dictionary<HydroWorkingVmo, bool> GetWorkingDict()
+        {
+            var helper = GetWorkingCheckedListHelper();
+            return helper.GetWorkingDict();
+        }
+
+        //鑾峰彇宸ュ喌鍒楄〃
+        private List<HydroWorkingVmo> GetWorkingList()
+        {
+            var helper = GetWorkingCheckedListHelper();
+            return helper.GetWorkingList();
+        }
+
+        //鑾峰彇閫夋嫨宸ュ喌鍒楄〃
+        private List<HydroWorkingVmo> GetCheckedWorkingList()
+        {
+            var helper = GetWorkingCheckedListHelper();
+            return helper.GetCheckedWorkingList();
+        }
+
+        //鏇存柊宸ュ喌閫夋嫨鍒楄〃
+        public void UpdateWorkingCheckedList(HydroWorkingVmo working)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Update(working);
+        }
+
+        //鏇存柊宸ュ喌閫夋嫨鍒楄〃
+        public void UpdateWorkingCheckedList(HydroWorkingVmo working, bool hasChecked)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Update(working, hasChecked);
+        }
+
+        //绉婚櫎宸ュ喌閫夋嫨鍒楄〃
+        public void RemoveWorkingCheckedList(HydroWorkingVmo working)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.Remove(working);
+        }
+
+        /// <summary>
+        /// 閲嶈浇宸ュ喌閫夋嫨鍒楄〃
+        /// </summary>
+        public void ReloadWorkingCheckedList(Dictionary<HydroWorkingVmo, bool> dict)
+        {
+            var helper = GetWorkingCheckedListHelper();
+            helper.InitialData(dict);
+        }
+
+        //绠$悊宸ュ喌
+        private void barBtnMgrWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var dict = GetWorkingDict();
+            var dlg = new HydroWorkingMgrDlg();
+            dlg.ReloadDataEvent += (dict) =>
+            {
+                this.ReloadWorkingEvent?.Invoke(dict);
+            };
+            dlg.UpdateDataEvent += (rhs) =>
+            {
+                this.UpdateWorkingEvent?.Invoke(rhs);
+            };
+            dlg.ApplyDataEvent += async (rhs) =>
+            {
+                _hydroInfo.UpdateWorkingInfo(rhs.WorkingInfo);
+                var monitorValueHelper = GetMonitorValueHelper();
+                var allMonitorValueList = await monitorValueHelper.GetAll();
+                allMonitorValueList.UpdateMonitorValue(rhs.MonitorInfo);
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+            };
+            dlg.DeleteDataEvent += (rhs) =>
+            {
+                this.RemoveWorkingEvent?.Invoke(rhs);
+            };
+            dlg.SetBindingData(dict);
+            dlg.ShowDialog();
+        }
+
+        #endregion 閫夋嫨宸ュ喌
+
+        #region 鐩戞祴鍒嗘瀽
+
+        //鐩戞祴鍒嗘瀽鍒楄〃鎺т欢
+        private HydroMonitorAnalyListCtrl _monitorAnalyListCtrl = null;
+
+        //鑾峰彇鐩戞祴鍒嗘瀽鍒楄〃鎺т欢
+        private HydroMonitorAnalyListCtrl GetMonitorAnalyListCtrl()
+        {
+            if (_monitorAnalyListCtrl == null)
+            {
+                _monitorAnalyListCtrl = new HydroMonitorAnalyListCtrl();
+                _monitorAnalyListCtrl.Dock = DockStyle.Fill;
+                _monitorAnalyListCtrl.HydroViewEvent += (code) =>
+                {
+                    var visual = GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Monitor);
+                };
+            }
+            return _monitorAnalyListCtrl;
+        }
+
+        //鐩戞祴鍒嗘瀽鍒楄〃鎺т欢鏄惁鍙
+        private bool IsMonitorAnalyListCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroMonitorAnalyListCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
         }
 
-
-
-        ////鑾峰彇灞炴�ф帶浠�
-        //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)
+        //鏄剧ず鐩戞祴鍒嗘瀽鍒楄〃鎺т欢
+        private async void ShowMonitorAnalyListCtrl()
         {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var allWorkingList = GetCheckedWorkingList();
+            if (allWorkingList == null || allWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+            }
 
+            var monitorAnalyListCtrl = GetMonitorAnalyListCtrl();
+            if (!IsMonitorAnalyListCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(monitorAnalyListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鐩戞祴鍒嗘瀽";
+                this.docPnlBottom.Height = 350;
+            }
+
+            var allMonitorList = await GetMonitorList();
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            if (allWorkingList == null || allWorkingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                monitorAnalyListCtrl.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+            }
+            else
+            {
+                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMonitorList, allWorkingList, isHead, allEvaluationList);
+            }
+        }
+
+        //鐩戞祴鍒嗘瀽
+        private void barBtnWorkingMonitorAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowMonitorAnalyListCtrl();
         }
 
         #endregion
 
-        #region 宸ュ喌鎺т欢
+        #region 宸ュ喌鍒嗘瀽
 
-        //宸ュ喌鎺т欢
-        private HydroWorkingTreeCtrl _workingCtrl = null;
-
-        //鑾峰彇宸ュ喌鎺т欢
-        private HydroWorkingTreeCtrl GetWorkingCtrl()
+        //閫夋嫨杩涘彛姘存簮
+        private void SelectInputSource()
         {
-            if (_workingCtrl == null)
+            var sources = GetSourceList();
+            if (sources != null)
             {
-                _workingCtrl = new HydroWorkingTreeCtrl();
-                _workingCtrl.Dock = DockStyle.Fill;
+                if (sources.Count == 1)
+                {
+                    SelectVisual(sources[0], eSimulationVisualSource.None);
+                }
+                else
+                {
+                    var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.杩涘彛));
+                    if (source != null)
+                    {
+                        SelectVisual(source, eSimulationVisualSource.None);
+                    }
+                }
             }
-            return _workingCtrl;
+        }
+
+        //鑾峰彇閫夋嫨鑺傜偣
+        private HydroNodeInfo GetSelectNode()
+        {
+            if (_visual == null)
+            {
+                SelectInputSource();
+                if (_visual == null)
+                {
+                    TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+                    return null;
+                }
+            }
+            HydroVisualInfo visual = _visual;
+            if (_visual is HydroLinkInfo linkInfo)
+            {
+                var visualListHelper = GetVisualListHelper();
+                visual = visualListHelper.GetVisual(linkInfo.StartCode);
+            }
+            return visual as HydroNodeInfo;
+        }
+
+        //绮惧害璇勪及
+        private async void barBtnAccuracy_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+
+            var allMonitorList = await GetMonitorList();
+            if (allMonitorList == null || allMonitorList.Count < 1)
+            {
+                TipFormHelper.ShowWarn("璇疯缃洃娴嬬偣鍚庨噸璇曪紒");
+                return;
+            }
+
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var allMonitorValueList = await GetMonitorValueList();
+                allMonitorValueList = allMonitorValueList?.Where(x => x.PropValue.HasValue).ToList();
+                if (allMonitorValueList == null || allMonitorValueList.Count < 1)
+                {
+                    TipFormHelper.ShowWarn("璇疯缃洃娴嬪�煎悗锛岄噸鏂拌绠楋紒");
+                    return;
+                }
+
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new HydroAccuracyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
+            }
+
+            var workingDlg = new HydroAccuracyWorkingDlg();
+            workingDlg.SetBindingData(_hydroInfo, allMonitorList, workingList, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
+        }
+
+        //姘存车鍒嗘瀽
+        private async void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationPumpAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
+            }
+
+            var workingDlg = new SimulationPumpAnalyWorkingDlg();
+            workingDlg.SetBindingData(_hydroInfo, workingList, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
+        }
+
+        //鑳芥晥鍒嗘瀽
+        private async void barBtnEnergyAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationEnergyAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
+            }
+            var workingDlg = new SimulationEnergyAnalyWorkingDlg();
+            workingDlg.SetBindingData(_hydroInfo, workingList, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
+        }
+
+        //鎹熷け缁熻
+        private async void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new HydroLossStatisticsDlg();
+                dlg.SetBindingData(hydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
+            }
+
+            var workingDlg = new HydroLossStatisticsWorkingDlg();
+            workingDlg.SetBindingData(hydroInfo, workingList, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
+        }
+
+        //缁煎悎鍒嗘瀽
+        private async void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+
+            var selectNode = GetSelectNode();
+            if (selectNode == null)
+            {
+                return;
+            }
+
+            var allMonitorList = await GetMonitorList();
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                var dlg = new SimulationMultiAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, selectNode, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
+            }
+
+            var workingDlg = new SimulationMultiAnalyWorkingDlg();
+            workingDlg.SetBindingData(_hydroInfo, allMonitorList, workingList, selectNode, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
         }
 
         #endregion
 
+        #region 鎹熷け鏇茬嚎
 
+        //鎹熷け鏇茬嚎浜や簰鎺т欢
+        private HydroLossCurveInteropCtrl _lossCurveInteropCtrl = null;
 
+        //鑾峰彇鎹熷け鏇茬嚎浜や簰鎺т欢
+        private HydroLossCurveInteropCtrl GetLossCurveInteropCtrl()
+        {
+            if (_lossCurveInteropCtrl == null)
+            {
+                _lossCurveInteropCtrl = new HydroLossCurveInteropCtrl();
+                _lossCurveInteropCtrl.Dock = DockStyle.Fill;
+                _lossCurveInteropCtrl.HydroClickEvent += (code) =>
+                {
+                    var visual = GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.None);
+                };
+                _lossCurveInteropCtrl.HydroSpecialDisplayEvent += (list) =>
+                {
+                    _bimfaceCtrl?.SetLogicOutlineGlowEffect(list);
+                };
+                _lossCurveInteropCtrl.HydroCancelSpecialDisplayEvent += () =>
+                {
+                    _bimfaceCtrl?.RemoveLogicOutlineGlowEffect();
+                };
+            }
+            return _lossCurveInteropCtrl;
+        }
 
+        //鎹熷け鏇茬嚎鎺т欢鏄惁鍙
+        private bool IsLossCurveInteropCtrlVisible
+        {
+            get
+            {
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                {
+                    if (this.controlContainerBottom.Controls.Count > 0)
+                    {
+                        if (this.controlContainerBottom.Controls[0] is HydroLossCurveInteropCtrl)
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
 
+        //鏄剧ず鎹熷け鏇茬嚎鎺т欢
+        private void ShowLossCurveInteropCtrl
+            (
+                Yw.Model.HydroModelInfo hydroInfo,
+                HydroWorkingVmo working,
+                HydroNodeInfo node,
+                HydroCalcuResult calcuResult = null,
+                bool isHead = false,
+                List<HydroEvaluationVmo> allEvaluationList = null
+            )
+        {
+            var ctrl = GetLossCurveInteropCtrl();
+            if (!IsLossCurveInteropCtrlVisible)
+            {
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(ctrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鎹熷け鏇茬嚎";
+                this.docPnlBottom.Height = 350;
+            }
+            ctrl.SetBindingData(hydroInfo, working, node, calcuResult, isHead, allEvaluationList);
+        }
 
+        //鎹熷け鏇茬嚎
+        private async void barBtnLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var node = GetSelectNode();
+            if (node == null)
+            {
+                return;
+            }
+
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
+            {
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
+                ShowLossCurveInteropCtrl(workingHelper.HydroInfo, workingHelper.Working, node, workingHelper.CalcuResult, isHead, allEvaluationList);
+                return;
+            }
+
+            var dlg = new HydroLossCurveMultiWorkingDlg();
+            dlg.SetBindingData(_hydroInfo, workingList, node, _calcuPressModeIsHead, allEvaluationList);
+            dlg.ShowDialog();
+        }
+
+        #endregion 鎹熷け鏇茬嚎
+
+        #region 鏂规绠$悊
+
+        //鏇存柊鏂规
+        private void UpdateScheme()
+        {
+            if (_scheme == null)
+            {
+                return;
+            }
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+
+            var dlg = new EditXhsSchemeDlg();
+            dlg.SetBindingData(_scheme, _hydroInfo);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                _scheme = rhs;
+                this.PageTitle.Caption = $"妯℃嫙鏂规\r\n{_scheme.Name}";
+                UpdatePageTitle(this.PageGuid, this.PageTitle);
+                this.UpdateSchemeEvent?.Invoke(_scheme);
+            };
+            dlg.ShowDialog();
+        }
+
+        //缂栬緫鏂规
+        private void barBtnEditScheme_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            UpdateScheme();
+        }
+
+        //鍒犻櫎鏂规
+        private async void DeleteScheme()
+        {
+            var bol = XtraMessageBox.Show("璇烽棶鏄惁鍒犻櫎褰撳墠鏂规锛�", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes;
+            if (!bol)
+            {
+                return;
+            }
+            if (_scheme == null)
+            {
+                return;
+            }
+            var relation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, _scheme.ID, HStation.Xhs.Purpose.Simulation);
+            if (relation == null)
+            {
+                TipFormHelper.ShowError("姘村姏妯℃嫙鏂规鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
+                return;
+            }
+            if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(relation.ModelID))
+            {
+                TipFormHelper.ShowError("姘村姏妯℃嫙鏂规鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
+                return;
+            }
+
+            if (!await BLLFactory<HStation.BLL.XhsScheme>.Instance.DeleteByID(_scheme.ID))
+            {
+                TipFormHelper.ShowError("姘村姏妯℃嫙鏂规鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
+                return;
+            }
+            this.RemoveSchemeEvent?.Invoke(_scheme);
+            TipFormHelper.ShowSucceed("姘村姏妯℃嫙鏂规鍒犻櫎鎴愬姛锛�");
+            ClosePage(this.PageGuid);
+        }
+
+        //鍒犻櫎鏂规
+        private void barBtnDeleteScheme_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            DeleteScheme();
+        }
+
+        #endregion 鏂规绠$悊
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3