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 | 2852 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1,867 insertions(+), 985 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 dc08799..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,8 +1,9 @@
 锘縰sing DevExpress.Diagram.Core.Native;
 using DevExpress.Mvvm.Native;
-using HStation.WinFrmUI.PhartRelation;
-using NPOI.SS.Formula.Functions;
-using System.Diagnostics;
+using DevExpress.Pdf.Native;
+using Mapster;
+using Yw.EPAnet;
+using Yw.Hydro;
 using Yw.Model;
 using Yw.Vmo;
 
@@ -19,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}";
             }
         }
 
@@ -60,34 +114,220 @@
         public override void InitialDataSource()
         {
             base.InitialDataSource();
-            if (_project == null)
-            {
-                return;
-            }
-            this.PageTitle.Caption = $"{_project.Name}\r\n姘村姏妯℃嫙";
             ShowBimfaceCtrl();
             ShowQ3dCtrl();
             ShowPropertyCtrl();
+            InitialSvgImages();
         }
 
-        //鍒濆鍖朥I
-        private async void InitialUI()
+        //鍒濆鍖朣vg鍥剧墖
+        private void InitialSvgImages()
         {
-            var workingTupleHelper = GetWorkingTupleHelper();
-            var allWorkingList = await workingTupleHelper.GetWorkingList();
-            InitialUIWorkingList(allWorkingList);
-            var working = allWorkingList?.LastOrDefault();
-            SetUIWorking(working);
+            //鐩戞祴
+            this.barBtnSetMonitorList.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Docking;
+
+            //姘村簱
+            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)
             {
@@ -95,22 +335,21 @@
             }
             if (_bimfaceCtrl == null)
             {
-                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
+                _bimfaceCtrl = new SimulationBimfaceCtrl();
                 _bimfaceCtrl.Dock = DockStyle.Fill;
+                WaitFormHelper.ShowWaitForm(this.FindForm(), "姝e湪鍔犺浇妯″瀷锛岃绋嶅悗...");
                 await _bimfaceCtrl.InitialData(_project, _projectSite);
                 _bimfaceCtrl.LoadCompletedEvent += () =>
                 {//view鍔犺浇瀹屾垚浜嬩欢
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    InitialUI();
+                    WaitFormHelper.HideWaitForm();
+                    this.barCkDecorator.Checked = false;
+                    this.barCkGrading.Checked = true;
                 };
                 _bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
                 {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
                     var visualListHelper = GetVisualListHelper();
                     var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Bimface);
+                    SelectVisual(visual, eSimulationVisualSource.Bimface);
                 };
             }
             return _bimfaceCtrl;
@@ -124,7 +363,7 @@
             this.tabPageBimface.Controls.Add(bimfaceCtrl);
         }
 
-        #endregion
+        #endregion BIM鎺т欢
 
         #region Q3d鎺т欢
 
@@ -147,7 +386,7 @@
                 {
                     var visualListHelper = GetVisualListHelper();
                     var visuals = visualListHelper.GetVisualList(codes);
-                    SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
+                    SelectVisual(visuals?.LastOrDefault(), eSimulationVisualSource.Q3d);
                 };
             }
             return _q3dCtrl;
@@ -161,15 +400,15 @@
             this.tabPageQ3d.Controls.Add(q3dCtrl);
         }
 
-        #endregion
+        #endregion Q3d鎺т欢
 
         #region 灞炴�ф帶浠�
 
         //灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
+        private SimulationPropertyCtrl _propertyCtrl = null;
 
         //鑾峰彇灞炴�ф帶浠�
-        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
+        private async Task<SimulationPropertyCtrl> GetPropertyCtrl()
         {
             if (_hydroInfo == null)
             {
@@ -177,11 +416,16 @@
             }
             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) =>
                 {
-                    SelectVisual(visual, eVisualSource.Property);
+                    SelectVisual(visual, eSimulationVisualSource.Property);
                 };
                 _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
                 { //寮鸿皟杩炴帴鑺傜偣
@@ -203,7 +447,7 @@
                         {
                             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;
@@ -244,14 +488,6 @@
                     var gradingHelper = await GetGradingHelper();
                     gradingHelper.Set(visual);
                 };
-                _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
-                {
-                    //娴佸悜灞炴�у彂鐢熸敼鍙�
-                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    var flowEffectHelper = await GetFlowEffectHelper();
-                    flowEffectHelper.Set(visual);
-                };
-
             }
             return _propertyCtrl;
         }
@@ -265,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;
                         }
@@ -276,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;
@@ -297,6 +533,7 @@
             var visualVmListHelper = GetVisualVmListHelper();
             var vm = visualVmListHelper.GetVisual(visual);
             _propertyCtrl.SelectedObject = vm;
+            _propertyCtrl.UpdateRows();
         }
 
         //鏇存柊灞炴�ф帶浠�
@@ -305,116 +542,117 @@
             _propertyCtrl?.UpdateRows();
         }
 
-        //娓呯悊灞炴�ф帶浠�
-        private void ClearPropertyCtrl()
-        {
-            if (_propertyCtrl != null)
-            {
-                _propertyCtrl.SelectedObject = null;
-            }
-        }
-
-        #endregion
+        #endregion 灞炴�ф帶浠�
 
         #region 閫夋嫨鏋勪欢
-
-        //鍙鏉ユ簮
-        protected enum eVisualSource
-        {
-            None,
-            Bimface,
-            Q3d,
-            Property,
-            List,
-            Search,
-            Monitor,
-            Check,
-            Calcu,
-            Warning,
-        }
 
         //閫夋嫨鏋勪欢
         private Yw.Model.HydroVisualInfo _visual = null;
 
         //閫夋嫨鏋勪欢
-        private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
+        private void SelectVisual(HydroVisualInfo visual, eSimulationVisualSource source)
         {
             _visual = visual;
             switch (source)
             {
-                case eVisualSource.None:
+                case eSimulationVisualSource.None:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Bimface:
+
+                case eSimulationVisualSource.Bimface:
                     {
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Q3d:
+
+                case eSimulationVisualSource.Q3d:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Property:
+
+                case eSimulationVisualSource.Property:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                     }
                     break;
-                case eVisualSource.List:
+
+                case eSimulationVisualSource.List:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Search:
+
+                case eSimulationVisualSource.Set:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Monitor:
+
+                case eSimulationVisualSource.Search:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Check:
+
+                case eSimulationVisualSource.Monitor:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Calcu:
+
+                case eSimulationVisualSource.Check:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        this.barBtnSetMonitorList.Enabled = visual != null;
                         SetPropertyCtrl(visual);
                     }
                     break;
-                case eVisualSource.Warning:
+
+                case eSimulationVisualSource.Calcu:
                     {
                         _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
+                        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;
             }
         }
 
-        #endregion
+        //閫夋嫨鏋勪欢
+        private void SelectVisual(string code, eSimulationVisualSource source)
+        {
+            var visual = GetVisual(code);
+            SelectVisual(visual, source);
+        }
+
+        #endregion 閫夋嫨鏋勪欢
 
         #region 鏋勪欢鏄庣粏
 
@@ -434,7 +672,36 @@
             return _visualListHelper;
         }
 
-        #endregion
+        //閲嶇疆鍙鍒楄〃
+        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 瑙嗗浘鍒楄〃
 
@@ -457,7 +724,21 @@
             return _visualVmListHelper;
         }
 
-        #endregion
+        //鑾峰彇鍙瑙嗗浘鍒楄〃
+        private List<HydroVisualViewModel> GetVisualViewModelList()
+        {
+            var helper = GetVisualVmListHelper();
+            return helper.GetVisualList();
+        }
+
+        //鑾峰彇鍙瑙嗗浘
+        private HydroVisualViewModel GetVisualViewModel(string code)
+        {
+            var helper = GetVisualVmListHelper();
+            return helper.GetVisual(code);
+        }
+
+        #endregion 瑙嗗浘鍒楄〃
 
         #region 鏄庣粏鎺т欢
 
@@ -473,11 +754,11 @@
                 _visualListCtrl.Dock = DockStyle.Fill;
                 _visualListCtrl.HydroClickInfoEvent += (visual) =>
                 {
-                    SelectVisual(visual, eVisualSource.List);
+                    SelectVisual(visual, eSimulationVisualSource.List);
                 };
                 _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
                 {
-                    SelectVisual(_visual, eVisualSource.List);
+                    SelectVisual(_visual, eSimulationVisualSource.List);
                 };
             }
             return _visualListCtrl;
@@ -503,7 +784,7 @@
         }
 
         //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowVisualListCtrl()
+        private async void ShowVisualListCtrl()
         {
             if (_hydroInfo == null)
             {
@@ -519,8 +800,10 @@
                 this.docPnlBottom.Height = 350;
             }
             var visualVmListHelper = GetVisualVmListHelper();
+            var changeHelper = GetChangeHelper();
+            var propStatusHelper = await GetPropStatusHelper();
             var allVisualVmList = visualVmListHelper.GetVisualList();
-            visualListCtrl.SetBindingData(allVisualVmList);
+            visualListCtrl.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
             var calcuResult = GetCalcuResult();
             if (calcuResult != null && calcuResult.Succeed)
             {
@@ -540,6 +823,15 @@
                 return;
             }
             _visualListCtrl?.UpdateBindingData();
+            var calcuResult = GetCalcuResult();
+            if (calcuResult != null && calcuResult.Succeed)
+            {
+                _visualListCtrl.SetCalcuView();
+            }
+            else
+            {
+                _visualListCtrl.SetNormalView();
+            }
         }
 
         //鏋勪欢鏄庣粏
@@ -548,7 +840,7 @@
             ShowVisualListCtrl();
         }
 
-        #endregion
+        #endregion 鏄庣粏鎺т欢
 
         #region 鏋勪欢鏄剧ず
 
@@ -597,131 +889,36 @@
             SetVisualVisible();
         }
 
-        #endregion
+        #endregion 鏋勪欢鏄剧ず
 
-        #endregion
-
-        #region 鑷姩鍖归厤
-
-        //鑾峰彇鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl GetMatchingListCtrl()
-        {
-            if (_matchingListCtrl == null)
-            {
-                _matchingListCtrl = new XhsProjectSimulationMatchingListCtrl();
-                _matchingListCtrl.Dock = DockStyle.Fill;
-                _matchingListCtrl.HydroClickEvent += async (code) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _visual = allParterList?.Find(x => x.Code == code);
-                    var elementIds = new List<string>();
-                    if (_visual != null)
-                    {
-                        elementIds.Add(_visual.Code);
-                    }
-                    await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
-                    //ShowSelectedProperty();
-                };
-                _matchingListCtrl.ApplyMatchingEvent += (output) =>
-                {
-                    if (_hydroInfo == null)
-                    {
-                        return false;
-                    }
-                    return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
-                };
-            }
-            return _matchingListCtrl;
-        }
-
-        //鍖归厤鍒楄〃鎺т欢
-        private XhsProjectSimulationMatchingListCtrl _matchingListCtrl = null;
-
-        //鑷姩鍖归厤
-        private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            this.controlContainerBottom.Controls.Clear();
-            var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo, null);
-            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)
-            {
-                _unMatchingListCtrl = new XhsProjectSimulationUnMatchingListCtrl();
-                _unMatchingListCtrl.Dock = DockStyle.Fill;
-                _unMatchingListCtrl.HydroClickEvent += async (parter) =>//琛岀偣鍑�
-                {
-                    if (parter == null)
-                    {
-                        return;
-                    }
-                    if (_hydroInfo == null)
-                    {
-                        return;
-                    }
-                    var allParterList = _hydroInfo.GetAllVisuals();
-                    _visual = 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);
-                    _visual = null;
-                    //ShowSelectedProperty();
-                };
-            }
-            return _unMatchingListCtrl;
-        }
-
-        private XhsProjectSimulationUnMatchingListCtrl _unMatchingListCtrl = null;//鏈尮閰嶅垪琛�
-
-        //鏈尮閰嶅垪琛�
-        private void barBtnUnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            this.controlContainerBottom.Controls.Clear();
-            var unMatchingListCtrl = GetUnMatchingListCtrl();
-            unMatchingListCtrl.SetBindingData(_hydroInfo);
-            this.controlContainerBottom.Controls.Add(unMatchingListCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏈尮閰嶅垪琛�";
-            this.docPnlBottom.Height = 350;
-        }
-
-        #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 = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
+            var codes = await GetDecoratorCodes();
             if (isDecoratorVisible)
             {
                 await _bimfaceCtrl?.ShowComponents(codes);
@@ -738,9 +935,14 @@
             SetDecoratorVisible(this.barCkDecorator.Checked);
         }
 
-        #endregion   
+        #endregion 涓�閿樉闅�
 
         #region 淇濆瓨淇℃伅
+
+        //淇濆瓨閿佸畾瀵硅薄
+        private object _locker_save = new();
+
+        private bool _isSaving = false;//姝e湪淇濆瓨
 
         //淇濆瓨
         private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -749,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 鎵归噺閰嶇疆
 
@@ -777,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)
@@ -1032,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;
             }
 
             //闂峰ご
@@ -1124,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)
             {
@@ -1164,9 +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
+        #endregion 鎵归噺閰嶇疆
 
         #region 鏋勪欢鏌ヨ
 
@@ -1185,12 +1637,12 @@
                 _searchCtrl.InitialData(allVisualVmList);
                 _searchCtrl.HydroClickInfoEvent += (visual) =>
                 {
-                    SelectVisual(visual, eVisualSource.Check);
+                    SelectVisual(visual, eSimulationVisualSource.Check);
                 };
                 _searchCtrl.HydroSearchInfoEvent += (list) =>
                 {
                     var visual = list?.FirstOrDefault();
-                    SelectVisual(visual, eVisualSource.Search);
+                    SelectVisual(visual, eSimulationVisualSource.Search);
                 };
             }
             return _searchCtrl;
@@ -1257,7 +1709,7 @@
             ShowSearchDlg();
         }
 
-        #endregion
+        #endregion 鏋勪欢鏌ヨ
 
         #region 妯″瀷鏍囨敞
 
@@ -1270,8 +1722,9 @@
             if (_markHelper == null)
             {
                 var visualListHelper = GetVisualListHelper();
+                var calcuResultHelper = GetCalcuResultHelper();
                 var bimfaceCtrl = await GetBimfaceCtrl();
-                _markHelper = new SimulationMarkHelper(visualListHelper, bimfaceCtrl);
+                _markHelper = new SimulationMarkHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
             }
             return _markHelper;
         }
@@ -1308,7 +1761,7 @@
             markHelper.Set();
         }
 
-        #endregion
+        #endregion 妯″瀷鏍囨敞
 
         #region 棰滆壊鍒嗙骇
 
@@ -1397,70 +1850,27 @@
         //鍒锋柊
         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);
-                _visual = null;
-                await _bimfaceCtrl?.ZoomAndSelectComponents(null);
-                //ShowSelectedProperty();
-                TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
+                _hydroInfo = hydroInfo;
+                SelectVisual(visual: null, eSimulationVisualSource.None);
 
-                var visualListHelper = GetVisualListHelper();
-                visualListHelper.InitialData(_hydroInfo);
+                ResetVisualList();
+                TipFormHelper.ShowSucceed("鍒锋柊鎴愬姛锛�");
             }
         }
 
-        #endregion
-
-        #region 姘存祦鍔ㄧ敾
-
-        //姘存祦鍔ㄧ敾杈呭姪绫�
-        private SimulationFlowEffectHelper _flowEffectHelper = null;
-
-        //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
-        private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_flowEffectHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
-                var calcuResult = GetCalcuResult();
-                _flowEffectHelper.InitialData(calcuResult);
-            }
-            return _flowEffectHelper;
-        }
-
-        //姘存祦鍔ㄧ敾鏄惁鍙
-        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var flowEffectHelper = await GetFlowEffectHelper();
-            flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
-            flowEffectHelper.Set();
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍒楄〃
+        #endregion 浜哄伐鍒锋柊
 
         #region 鐩戞祴鐐�
 
@@ -1470,51 +1880,19 @@
         //鑾峰彇鐩戞祴鐐硅緟鍔╃被
         private SimulationMonitorHelper GetMonitorHelper()
         {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
             if (_monitorHelper == null)
             {
-                _monitorHelper = new SimulationMonitorHelper(_hydroInfo.ID);
+                var visualListHelper = GetVisualListHelper();
+                _monitorHelper = new SimulationMonitorHelper(visualListHelper);
             }
             return _monitorHelper;
         }
 
-        //璁剧疆鐩戞祴鐐瑰垪琛�
-        private async void SetMonitorList(HydroVisualInfo visual)
+        //鑾峰彇鐩戞祴鐐瑰垪琛�
+        private async Task<List<HydroMonitorVmo>> GetMonitorList()
         {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var monitorHelper = GetMonitorHelper();
-            var allMonitorList = await monitorHelper.Get();
-            var dlg = new SetHydroMonitorListDlg();
-            dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
-            dlg.ReloadDataEvent += async (list) =>
-            {
-                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
-                if (!bol)
-                {
-                    TipFormHelper.ShowError("璁剧疆澶辫触锛�");
-                    return;
-                }
-                TipFormHelper.ShowSucceed("璁剧疆鎴愬姛锛�");
-                var monitorList = await monitorHelper.Update(visual.Code);
-                var monitorValueHelper = GetMonitorValueHelper();
-                monitorValueHelper.Update(visual.Code, monitorList);
-                var monitorMarkerHelper = await GetMonitorMarkerHelper();
-                monitorMarkerHelper.Update(visual.Code, monitorList);
-                monitorMarkerHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //璁剧疆鐩戞祴鐐�
-        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetMonitorList(_visual);
+            var helper = GetMonitorHelper();
+            return await helper.GetAll();
         }
 
         #endregion
@@ -1536,9 +1914,71 @@
             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 async void SetMonitorList(HydroVisualInfo visual)
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            if (visual == null)
+            {
+                return;
+            }
+            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 barBtnSetMonitorList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            if (_visual == null)
+            {
+                TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
+                return;
+            }
+            SetMonitorList(_visual);
+        }
+
+        #endregion
+
+        #region 璁剧疆娴嬪��
 
         //鐩戞祴鍊煎垪琛ㄦ帶浠�
         private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
@@ -1552,9 +1992,8 @@
                 _monitorValueListCtrl.Dock = DockStyle.Fill;
                 _monitorValueListCtrl.HydroViewEvent += (code) =>
                 {
-                    var visualListHelper = GetVisualListHelper();
-                    var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Monitor);
+                    var visual = GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Monitor);
                 };
             }
             return _monitorValueListCtrl;
@@ -1588,23 +2027,22 @@
                 this.controlContainerBottom.Controls.Clear();
                 this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
                 this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "鐩戞祴鍊�";
+                this.docPnlBottom.Text = "璁剧疆娴嬪��";
                 this.docPnlBottom.Height = 350;
             }
-            var monitorValueHelper = GetMonitorValueHelper();
-            var allMonitorValueList = await monitorValueHelper.Get();
-            monitorValueListCtrl.SetBindingData(allMonitorValueList);
+            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 SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
@@ -1621,15 +2059,13 @@
             return _monitorMarkerHelper;
         }
 
-        //鏄剧ず鐘舵�佹敼鍙�
-        private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //娴嬬偣鏄剧ず鐘舵�佹敼鍙�
+        private async void barCkMonitorVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var monitorMarkerHelper = await GetMonitorMarkerHelper();
-            monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
+            monitorMarkerHelper.Visible = this.barCkMonitorVisible.Checked;
             monitorMarkerHelper.Set();
         }
-
-        #endregion
 
         #endregion
 
@@ -1653,7 +2089,7 @@
                 {
                     var visualListHelper = GetVisualListHelper();
                     var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Check);
+                    SelectVisual(visual, eSimulationVisualSource.Check);
                 };
             }
             return _checkCtrl;
@@ -1715,7 +2151,7 @@
             ShowCheckCtrl(checkResult);
         }
 
-        #endregion
+        #endregion 妯″瀷妫�鏌�
 
         #region 妯″瀷璁$畻
 
@@ -1731,8 +2167,6 @@
             {
                 var workingHelper = GetWorkingHelper();
                 _calcuResultHelper = new SimulationCalcuResultHelper(workingHelper);
-                var calcuResult = GetCalcuResult();
-                _calcuResultHelper.InitialData();
             }
             return _calcuResultHelper;
         }
@@ -1801,7 +2235,7 @@
             calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
         }
 
-        #endregion
+        #endregion 璁$畻澶辫触
 
         #region 璁$畻璀﹀憡
 
@@ -1819,7 +2253,7 @@
                 {
                     var visualListHelper = GetVisualListHelper();
                     var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Warning);
+                    SelectVisual(visual, eSimulationVisualSource.Warning);
                 };
             }
             return _calcuWarningCtrl;
@@ -1873,7 +2307,7 @@
             calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
         }
 
-        #endregion
+        #endregion 璁$畻璀﹀憡
 
         #region 璁$畻鏍囩
 
@@ -1885,10 +2319,9 @@
         {
             if (_calcuResultLabelHelper == null)
             {
-                var visualListHelper = GetVisualListHelper();
                 var calcuResultHelper = GetCalcuResultHelper();
                 var bimfaceCtrl = await GetBimfaceCtrl();
-                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
+                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(calcuResultHelper, bimfaceCtrl);
             }
             return _calcuResultLabelHelper;
         }
@@ -1901,72 +2334,7 @@
             calcuResultLabelHelper.Set();
         }
 
-        #endregion
-
-        #endregion
-
-        #region 绠$綉淇
-
-        //淇绠$綉
-        private void Repair()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var checkResult = _hydroInfo.Check();
-            if (!checkResult.Succeed)
-            {
-                ShowCheckCtrl(checkResult);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
-                return;
-            }
-            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
-            if (!calcuResult.Succeed)
-            {
-                ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
-                return;
-            }
-            var visualListHelper = GetVisualListHelper();
-            var allLinkList = visualListHelper.GetLinkList();
-            if (allLinkList != null && allLinkList.Count < 1)
-            {
-                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
-                return;
-            }
-            int count = 0;
-            foreach (var link in allLinkList)
-            {
-                var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
-                if (calcuLink == null)
-                {
-                    continue;
-                }
-                if (!calcuLink.CalcuFlow.HasValue)
-                {
-                    continue;
-                }
-                if (calcuLink.CalcuFlow.Value < 0)
-                {
-                    var tempCode = link.StartCode;
-                    link.StartCode = link.EndCode;
-                    link.EndCode = tempCode;
-                    count++;
-                }
-            }
-            var visualVmListHelper = GetVisualVmListHelper();
-            visualVmListHelper.UpdateProperty();
-            UpdateVisualListCtrl();
-            UpdatePropertyCtrl();
-            TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
-        }
-
-        //绠$綉淇
-        private void barBtnRepair_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            Repair();
-        }
+        #endregion 璁$畻鏍囩
 
         #endregion
 
@@ -1990,12 +2358,12 @@
             TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
         }
 
-        #endregion
+        #endregion 瀵煎嚭INP
 
-        #region 骞惰仈璁$畻
+        #region 姘存车鍒楄〃
 
-        //骞惰仈鍒嗘瀽
-        private void ParallelAnalysis()
+        //鎬ц兘鏇茬嚎
+        private void PumpFeat()
         {
             if (_hydroInfo == null)
             {
@@ -2007,169 +2375,443 @@
                 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 barBtnParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //骞惰仈妯℃嫙
+        private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            ParallelAnalysis();
+            PumpParallel();
         }
 
-        #endregion
+        #endregion 姘存车鍒楄〃
 
-        #region 宸ュ喌璁$畻
+        #region 鍘嬪姏鍒囨崲
 
-        //宸ュ喌鍏冪粍杈呭姪绫�
-        private SimulationWorkingTupleHelper _workingTupleHelper = null;
+        //璁$畻鍘嬪姏鏄惁涓虹粷瀵瑰帇鍔�
+        private bool _calcuPressModeIsHead = false;
 
-        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
-        private SimulationWorkingTupleHelper GetWorkingTupleHelper()
+        //璁$畻缁撴灉鍘嬪姏鍒囨崲
+        private void barToggleSwitchPress_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_workingTupleHelper == null)
+            _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)
             {
-                var visualListHelper = GetVisualListHelper();
-                _workingTupleHelper = new SimulationWorkingTupleHelper(visualListHelper);
+                _evaluationHelper = new SimulationEvaluationHelper(_hydroInfo.ID);
             }
-            return _workingTupleHelper;
+            return _evaluationHelper;
         }
 
-        //璁剧疆宸ュ喌绐椾綋
-        private async void CalcuWorking()
+        //鑾峰彇璇勪环瑙勫垯鍒楄〃
+        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 workingTupleHelper = GetWorkingTupleHelper();
-            var allWorkingList = await workingTupleHelper.GetWorkingList();
+            var dlg = new SetHydroEvaluationModelDlg();
+            dlg.SetBindingData(_hydroInfo.ID);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                SetEvaluationList(rhs);
+            };
+            dlg.ShowDialog();
+        }
+
+        //璇勪环瑙勫垯
+        private void barBtnEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowEvaluationDlg();
+        }
+
+        #endregion
+
+        #region 姘村姏璁$畻
+
+        //璁$畻
+        private async void Calcu()
+        {
+            if (_hydroInfo == null)
+            {
+                return;
+            }
+            var workingCheckedListHelper = GetWorkingCheckedListHelper();
+            var allWorkingList = workingCheckedListHelper.GetWorkingList();
             var monitorValueHelper = GetMonitorValueHelper();
-            var allMonitorValueList = await monitorValueHelper.Get();
+            var allMonitorValueList = await monitorValueHelper.GetAll();
             var dlg = new SetHydroWorkingDlg();
             dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
             dlg.HydroViewEvent += (visual) =>
             {
-                SelectVisual(visual, eVisualSource.Calcu);
+                SelectVisual(visual, eSimulationVisualSource.Calcu);
             };
-            dlg.HydroCalcuEvent += async (working) =>
+            dlg.HydroCalcuEvent += async (vm) =>
             {
-                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)
+                _hydroInfo.UpdateWorkingInfo(vm.WorkingInfo);
+                allMonitorValueList.UpdateMonitorValue(vm.MonitorInfo);
+
+                var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
+
+                var working = new HydroWorkingVmo();
+                working.ModelID = vm.ModelID;
+                working.Name = vm.Name;
+                working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo);
+                var useWorkingMonitorInfo = vm.MonitorInfo?.Where(x => x.PropValue.HasValue).ToList();
+                if (useWorkingMonitorInfo != null && useWorkingMonitorInfo.Count > 0)
                 {
-                    TipFormHelper.ShowError("鍒涘缓宸ュ喌澶辫触锛岃绠楀彇娑堬紒");
-                    return;
+                    working.MonitorInfo = JsonHelper.Object2Json(useWorkingMonitorInfo);
                 }
+                working.SortCode = vm.SortCode;
+                working.Description = vm.Description;
 
-                _hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
-
+                var workingHelper = GetWorkingHelper();
                 //鏍¢獙
                 var checkResult = _hydroInfo.Check();
                 if (!checkResult.Succeed)
                 {
                     ShowCheckCtrl(checkResult);
-                    workingTupleHelper.AppendTuple(vmo, checkResult, null);
-                    SetUIWorking(vmo);
+                    workingHelper.InitialData(hydroInfo, working, checkResult, null);
                     TipFormHelper.ShowError("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
+                    return;
+                }
+
+                var isHead = _calcuPressModeIsHead;
+                var allEvaluationList = await GetEvaluationList();
+
+                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
+                await Task.Delay(3000);
+                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, isHead, allEvaluationList);
+                WaitFormHelper.HideWaitForm();
+                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
+                if (calcuResult.Succeed)
+                {
+                    if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+                    {
+                        ShowCalcuWarningCtrl(calcuResult);
+                    }
+                    this.barBtnAddWorking.Enabled = true;
+                    this.barBtnExportWord.Enabled = true;
+                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
                 }
                 else
                 {
-                    WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
-                    //await Task.Delay(3000);
-                    var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
-                    WaitFormHelper.HideWaitForm();
-                    workingTupleHelper.AppendTuple(vmo, checkResult, calcuResult);
-                    if (calcuResult.Succeed)
-                    {
-                        if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
-                        {
-                            ShowCalcuWarningCtrl(calcuResult);
-                        }
-                        TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                    }
-                    else
-                    {
-                        ShowCalcuFailedCtrl(calcuResult);
-                        TipFormHelper.ShowError("璁$畻澶辫触锛�");
-                    }
+                    ShowCalcuFailedCtrl(calcuResult);
+                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
                 }
-                AppendUIWorking(vmo);
-                SetUIWorking(vmo);
-            };
 
+                #region 瑙嗗浘鍒楄〃
+
+                var visualVmListHelper = GetVisualVmListHelper();
+                visualVmListHelper.UpdateCalcuProperty(calcuResult);
+
+                #endregion 瑙嗗浘鍒楄〃
+
+                #region 褰撳墠鏋勪欢
+
+                SelectVisual(_visual, eSimulationVisualSource.Calcu);
+
+                #endregion 褰撳墠鏋勪欢
+
+                #region 鏋勪欢鏄庣粏
+
+                UpdateVisualListCtrl();
+
+                #endregion 鏋勪欢鏄庣粏
+
+                #region 棰滆壊鍒嗙骇
+
+                var gradingHelper = await GetGradingHelper();
+                gradingHelper.Set();
+
+                #endregion 棰滆壊鍒嗙骇
+
+                #region 璁$畻鏍囩
+
+                var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
+                calcuResultLabelHelper.Set();
+
+                #endregion 璁$畻鏍囩
+            };
             dlg.ShowDialog();
         }
 
-        //宸ュ喌璁$畻
-        private void barBtnWorkingCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //姘村姏璁$畻
+        private void barBtnCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            CalcuWorking();
+            Calcu();
         }
 
-        #endregion
+        #endregion 姘村姏璁$畻
 
-        #region 宸ュ喌鍒嗘瀽
+        #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 褰撳墠宸ュ喌
 
@@ -2207,133 +2849,165 @@
             return workingHelper.CalcuResult;
         }
 
-        //鍒濆鍖朥I宸ュ喌鍒楄〃
-        private void InitialUIWorkingList(List<HydroWorkingVmo> allWorkingList)
+        //鏂板宸ュ喌
+        private void AddWorking()
         {
-            this.repositoryItemImageComboBox1.Items.BeginUpdate();
-            this.repositoryItemImageComboBox1.Items.Clear();
-            if (allWorkingList != null && allWorkingList.Count > 0)
-            {
-                allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
-            }
-            this.repositoryItemImageComboBox1.Items.EndUpdate();
-        }
-
-        //澧炲姞UI宸ュ喌
-        private void AppendUIWorking(HydroWorkingVmo working)
-        {
-            this.repositoryItemImageComboBox1.Items.BeginUpdate();
-            this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
-            this.repositoryItemImageComboBox1.Items.EndUpdate();
-        }
-
-        //璁剧疆UI宸ュ喌
-        private void SetUIWorking(HydroWorkingVmo working)
-        {
-            this.barEditCurrentWorking.EditValue = working;
-        }
-
-        //褰撳墠宸ュ喌鍙戠敓鏀瑰彉
-        private async void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
-            if (working == null)
-            {
-                return;
-            }
-
-            #region 宸ュ喌鍏冪粍
-
-            var workingTupleHelper = GetWorkingTupleHelper();
-            var workingTuple = await workingTupleHelper.GetTuple(working);
-            if (workingTuple == null)
-            {
-                return;
-            }
-
-            #endregion
-
-            #region 褰撳墠宸ュ喌
-
             var workingHelper = GetWorkingHelper();
-            workingHelper.InitialData(workingTuple.Item1, workingTuple.Item2, workingTuple.Item3);
-
-            #endregion
-
-            #region 姘村姏淇℃伅
-
-            var workingInfo = JsonHelper.Json2Object<HydroWorkingInfoViewModel>(working.WorkingInfo);
-            _hydroInfo.UpdateWorkingInfo(workingInfo);
-
-
-            #endregion
-
-            #region 宸ュ喌鎺т欢
-
-            UpdateWorkingCtrl();
-            SelectWorkingCtrl(working);
-
-            #endregion
-
-            #region 璁$畻缁撴灉
-
-            var calcuResultHelper = GetCalcuResultHelper();
-            calcuResultHelper.InitialData();
-
-            #endregion
-
-            #region 瑙嗗浘鍒楄〃
-
-            var visualVmListHelper = GetVisualVmListHelper();
-            visualVmListHelper.UpdateCalcuProperty(workingHelper.CalcuResult);
-
-            #endregion
-
-            #region 璁$畻鏍囩
-
-            var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
-            calcuResultLabelHelper.Set();
-
-            #endregion
-
+            if (workingHelper.Working == null)
+            {
+                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
+                return;
+            }
+            var dlg = new AddHydroWorkingDlg();
+            dlg.SetBindingData(workingHelper.Working);
+            dlg.ReloadDataEvent += (rhs) =>
+            {
+                this.barBtnAddWorking.Enabled = false;
+                workingHelper.ResetWorking(rhs);
+                UpdateWorkingCheckedList(rhs, false);
+                this.AppendWorkingEvent?.Invoke(rhs);
+            };
+            dlg.ShowDialog();
         }
 
-        #endregion
-
-        #region 宸ュ喌鎺т欢
-
-        //宸ュ喌鎺т欢
-        private HydroWorkingTreeCtrl _workingCtrl = null;
-
-        //鑾峰彇宸ュ喌鎺т欢
-        private HydroWorkingTreeCtrl GetWorkingCtrl()
+        //澧炲姞宸ュ喌
+        private void barBtnAddWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            if (_workingCtrl == null)
+            AddWorking();
+        }
+
+        #endregion 褰撳墠宸ュ喌
+
+        #region 閫夋嫨宸ュ喌
+
+        //宸ュ喌閫夋嫨鍒楄〃杈呭姪绫�
+        private SimulationWorkingCheckedListHelper _workingCheckedListHelper = null;
+
+        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
+        private SimulationWorkingCheckedListHelper GetWorkingCheckedListHelper()
+        {
+            if (_workingCheckedListHelper == null)
             {
-                _workingCtrl = new HydroWorkingTreeCtrl();
-                _workingCtrl.Dock = DockStyle.Fill;
-                _workingCtrl.HydroClickEvent += (working) =>
+                _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) =>
                 {
-                    SetUIWorking(working);
+                    var visual = GetVisual(code);
+                    SelectVisual(visual, eSimulationVisualSource.Monitor);
                 };
             }
-            return _workingCtrl;
+            return _monitorAnalyListCtrl;
         }
 
-        //宸ュ喌鎺т欢鏄惁鍙
-        private bool IsWorkingCtrlVisible
+        //鐩戞祴鍒嗘瀽鍒楄〃鎺т欢鏄惁鍙
+        private bool IsMonitorAnalyListCtrlVisible
         {
             get
             {
-                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
+                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
                 {
-                    if (this.controlContainerRight.Controls.Count > 0)
+                    if (this.controlContainerBottom.Controls.Count > 0)
                     {
-                        if (this.controlContainerRight.Controls[0] is HydroWorkingTreeCtrl)
+                        if (this.controlContainerBottom.Controls[0] is HydroMonitorAnalyListCtrl)
                         {
                             return true;
                         }
@@ -2343,246 +3017,454 @@
             }
         }
 
-        //鏄剧ず宸ュ喌鎺т欢
-        private async void ShowWorkingCtrl()
-        {
-            var workingCtrl = GetWorkingCtrl();
-            if (!IsWorkingCtrlVisible)
-            {
-                this.controlContainerRight.Controls.Clear();
-                this.controlContainerRight.Controls.Add(workingCtrl);
-                this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlRight.Text = "宸ュ喌";
-                this.docPnlRight.Width = 300;
-            }
-            var workingTupleHelper = GetWorkingTupleHelper();
-            var allWorkingList = await workingTupleHelper.GetWorkingList();
-            workingCtrl.SetBindingData(allWorkingList);
-        }
-
-        //鏇存柊宸ュ喌鎺т欢
-        private async void UpdateWorkingCtrl()
-        {
-            if (!IsWorkingCtrlVisible)
-            {
-                return;
-            }
-            var workingTupleHelper = GetWorkingTupleHelper();
-            var allWorkingList = await workingTupleHelper.GetWorkingList();
-            var workingCtrl = GetWorkingCtrl();
-            workingCtrl.SetBindingData(allWorkingList);
-        }
-
-        //閫夋嫨宸ュ喌鎺т欢
-        private void SelectWorkingCtrl(HydroWorkingVmo working)
-        {
-            if (IsWorkingCtrlVisible)
-            {
-                var workingCtrl = GetWorkingCtrl();
-                workingCtrl.Select(working);
-            }
-        }
-
-        //宸ュ喌鍒楄〃鐐瑰嚮
-        private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowWorkingCtrl();
-        }
-
-        #endregion
-
-        #region 宸ュ喌璇勪及
-
-        //璇勪及
-        private async void Evaluate()
+        //鏄剧ず鐩戞祴鍒嗘瀽鍒楄〃鎺т欢
+        private async void ShowMonitorAnalyListCtrl()
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            var working = GetWorking();
-            if (working == null)
+            var allWorkingList = GetCheckedWorkingList();
+            if (allWorkingList == null || allWorkingList.Count < 1)
             {
-                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
-                return;
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
+                {
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
+                }
             }
-            var checkResult = GetCheckResult();
-            if (checkResult == null)
+
+            var monitorAnalyListCtrl = GetMonitorAnalyListCtrl();
+            if (!IsMonitorAnalyListCtrlVisible)
             {
-                return;
+                this.controlContainerBottom.Controls.Clear();
+                this.controlContainerBottom.Controls.Add(monitorAnalyListCtrl);
+                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+                this.docPnlBottom.Text = "鐩戞祴鍒嗘瀽";
+                this.docPnlBottom.Height = 350;
             }
-            if (!checkResult.Succeed)
+
+            var allMonitorList = await GetMonitorList();
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            if (allWorkingList == null || allWorkingList.Count < 1)
             {
-                ShowCheckCtrl(checkResult);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ワ紝鍋滄璇勪及锛�");
-                return;
+                var workingHelper = GetWorkingHelper();
+                monitorAnalyListCtrl.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
             }
-            var calcuResult = GetCalcuResult();
-            if (!calcuResult.Succeed)
+            else
             {
-                ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璁$畻澶辫触锛屽仠姝㈣瘎浼帮紒");
-                return;
+                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMonitorList, allWorkingList, isHead, allEvaluationList);
             }
-            if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
+        }
+
+        //鐩戞祴鍒嗘瀽
+        private void barBtnWorkingMonitorAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ShowMonitorAnalyListCtrl();
+        }
+
+        #endregion
+
+        #region 宸ュ喌鍒嗘瀽
+
+        //閫夋嫨杩涘彛姘存簮
+        private void SelectInputSource()
+        {
+            var sources = GetSourceList();
+            if (sources != null)
             {
-                ShowCalcuWarningCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇峰叧娉ㄨ鍛婁俊鎭紒");
+                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);
+                    }
+                }
             }
-            var visualListHelper = GetVisualListHelper();
-            var allVisualDict = visualListHelper.GetVisualDict();
-            var monitorHelper = GetMonitorHelper();
-            var allMonitorList = await monitorHelper.Get();
-            var allWorkingMonitorList = JsonHelper.Json2Object<List<HydroWorkingMonitorViewModel>>(working.MonitorInfo);
-            var allCalcuResultDict = calcuResult.GetVisualDict();
-            var dlg = new HydroWorkingEvaluationDlg();
-            dlg.SetBindingData(allVisualDict, allMonitorList, allWorkingMonitorList, allCalcuResultDict);
-            dlg.ShowDialog();
+        }
+
+        //鑾峰彇閫夋嫨鑺傜偣
+        private 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 void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            Evaluate();
-        }
-
-        #endregion
-
-        #region 宸ュ喌骞惰仈
-
-        //骞惰仈鍒嗘瀽
-        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private async void barBtnAccuracy_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
+
+            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 calcuResultHelper = GetCalcuResultHelper();
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in _hydroInfo.Pumps)
+            var isHead = _calcuPressModeIsHead;
+            var allEvaluationList = await GetEvaluationList();
+
+            var workingList = GetCheckedWorkingList();
+            if (workingList == null || workingList.Count < 1)
             {
-                if (!pump.RatedN.HasValue)
+                var workingHelper = GetWorkingHelper();
+                if (!workingHelper.Initialized)
                 {
-                    continue;
+                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
+                    return;
                 }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-                var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
-                if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
-                {
-                    //var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    //if (calcuResult != null)
-                    //{
-                    //    if (calcuResult.CalcuFlow.HasValue)
-                    //    {
-                    //        vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
-                    //    }
-
-                    //    var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                    //    var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                    //    if (calcuResultStart != null && calcuResultEnd != null)
-                    //    {
-                    //        if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
-                    //        {
-                    //            vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
-                    //        }
-                    //    }
-                    //}
-                }
-
+                var dlg = new SimulationEnergyAnalyDlg();
+                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
+                dlg.ShowDialog();
+                return;
             }
-
-            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();
+            var workingDlg = new SimulationEnergyAnalyWorkingDlg();
+            workingDlg.SetBindingData(_hydroInfo, workingList, isHead, allEvaluationList);
+            workingDlg.ShowDialog();
         }
 
-        #endregion
-
-        #region 宸ュ喌鑳芥晥
-
-        private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鎹熷け缁熻
+        private async void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            XtraMessageBox.Show("姝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 void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鎹熷け鏇茬嚎浜や簰鎺т欢
+        private HydroLossCurveInteropCtrl _lossCurveInteropCtrl = null;
+
+        //鑾峰彇鎹熷け鏇茬嚎浜や簰鎺т欢
+        private HydroLossCurveInteropCtrl GetLossCurveInteropCtrl()
         {
-            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+            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;
         }
 
-        #endregion
-
-        #region 鎹熷け姣斾緥
-
-        private void barBtnWorkingLossScale_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鎹熷け鏇茬嚎鎺т欢鏄惁鍙
+        private bool IsLossCurveInteropCtrlVisible
         {
-            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+            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;
+            }
         }
 
-        #endregion
-
-        #region 缁煎悎鍒嗘瀽
-        private void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //鏄剧ず鎹熷け鏇茬嚎鎺т欢
+        private void ShowLossCurveInteropCtrl
+            (
+                Yw.Model.HydroModelInfo hydroInfo,
+                HydroWorkingVmo working,
+                HydroNodeInfo node,
+                HydroCalcuResult calcuResult = null,
+                bool isHead = false,
+                List<HydroEvaluationVmo> allEvaluationList = null
+            )
         {
-            XtraMessageBox.Show("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰咃紒");
+            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);
         }
 
-        #endregion 
+        //鎹熷け鏇茬嚎
+        private async void barBtnLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            var node = GetSelectNode();
+            if (node == null)
+            {
+                return;
+            }
 
-        #endregion
+            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