HStation/XHS.V1.0.git

			@@ -1,20 +1,10 @@
			global using Yw.EPAnet;
			using DevExpress.Diagram.Core.Native;
			using DevExpress.Mvvm.Native;
			using DevExpress.Office.Utils;
			using DevExpress.Utils.Extensions;
			using DevExpress.Xpo.Helpers;
			using DevExpress.XtraBars.Ribbon;
			using DevExpress.XtraRichEdit.Layout;
			using DevExpress.XtraSpreadsheet.Commands;
			using HStation.WinFrmUI.PhartRelation;
			using NPOI.SS.Formula.Functions;
			using System.Diagnostics;
			using System.Windows.Media;
			using System.Windows.Media.Media3D;
			using Yw.Hydro;
			using Yw.Pump;
			using Yw.Model;
			using Yw.Vmo;
			using Yw.WinFrmUI.Bimface;
			using Yw.WinFrmUI.Hydro;

			namespace HStation.WinFrmUI
			{
			@@ -78,11 +68,20 @@
			ShowBimfaceCtrl();
			ShowQ3dCtrl();
			ShowPropertyCtrl();
			}

			//初始化UI
			private async void InitialUI()
			{
			var workingTupleHelper = GetWorkingTupleHelper();
			var allWorkingList = await workingTupleHelper.GetWorkingList();
			InitialUIWorkingList(allWorkingList);
			var working = allWorkingList?.LastOrDefault();
			SetUIWorking(working);
			}


			#region Bimface
			#region BIM控件

			//bimface控件
			private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
			@@ -90,26 +89,28 @@
			//获取 bimface 控件
			private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_bimfaceCtrl == null)
			{
			_bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
			_bimfaceCtrl.Dock = DockStyle.Fill;
			await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
			await _bimfaceCtrl.InitialData(_project, _projectSite);
			_bimfaceCtrl.LoadCompletedEvent += () =>
			{//view加载完成事件
			if (_hydroInfo == null)
			{
			return;
			}
			InitialUI();
			};
			_bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
			_bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
			{//鼠标左键点击事件
			if (_hydroInfo == null)
			{
			return;
			}
			_selectedVisual = obj;
			ShowSelectedProperty();
			var visualListHelper = GetVisualListHelper();
			var visual = visualListHelper.GetVisual(code);
			SelectVisual(visual, eVisualSource.Bimface);
			};
			}
			return _bimfaceCtrl;
			@@ -123,14 +124,9 @@
			this.tabPageBimface.Controls.Add(bimfaceCtrl);
			}

			private void SelectBimfaceParter()
			{

			}

			#endregion

			#region Q3d
			#region Q3d控件

			//Q3d 控件
			private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
			@@ -138,20 +134,20 @@
			//获取 Q3d 控件
			private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_q3dCtrl == null)
			{
			_q3dCtrl = new XhsProjectSimulationQ3dCtrl();
			_q3dCtrl.Dock = DockStyle.Fill;
			_q3dCtrl.InitialData(() => _hydroInfo);
			_q3dCtrl.SelectedPartersChangedEvent += (obj) =>
			_q3dCtrl.SelectedPartersChangedEvent += (codes) =>
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allParterList = _hydroInfo.GetAllVisuals();
			_selectedVisual = allParterList?.Find(x => x.Code == obj?.FirstOrDefault());
			ShowSelectedProperty();
			var visualListHelper = GetVisualListHelper();
			var visuals = visualListHelper.GetVisualList(codes);
			SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
			};
			}
			return _q3dCtrl;
			@@ -175,44 +171,39 @@
			//获取属性控件
			private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_propertyCtrl == null)
			{
			_propertyCtrl = new XhsProjectSimulationPropertyCtrl();
			_propertyCtrl.Dock = DockStyle.Fill;
			_propertyCtrl.InitialData(() => _hydroInfo, () => GetCalcuResultList());
			_propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
			{ //强调连接组件
			if (string.IsNullOrEmpty(code))
			_propertyCtrl.HydroViewEvent += (visual) =>
			{
			SelectVisual(visual, eVisualSource.Property);
			};
			_propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
			{ //强调连接节点
			if (link == null)
			{
			return;
			}
			if (string.IsNullOrEmpty(linkCode))
			{
			return;
			}
			if (_hydroInfo == null)
			{
			return;
			}
			var allVisualList = _hydroInfo.GetAllVisuals();
			if (allVisualList == null \|\| allVisualList.Count < 1)
			{
			return;
			}
			var linkParter = allVisualList.Find(x => x.Code == linkCode);
			if (linkParter == null)
			var visualListHelper = GetVisualListHelper();
			var linkNode = visualListHelper.GetVisual(linkNodeCode);
			if (linkNode == null)
			{
			return;
			}
			var blinkCodes = new List<string>();
			if (linkParter.GetType() == typeof(Yw.Model.HydroJunctionInfo))
			if (linkNode.GetType() == typeof(HydroJunctionInfo))
			{
			var allLinkList = _hydroInfo.GetAllLinks();
			var allLinkList = visualListHelper.GetLinkList();
			if (allLinkList == null \|\| allLinkList.Count < 1)
			{
			return;
			}
			var linkList = allLinkList.Where(x => (x.StartCode == linkParter.Code \|\| x.EndCode == linkParter.Code) && x.Code != code).ToList();
			var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode \|\| x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
			if (linkList == null \|\| linkList.Count < 1)
			{
			return;
			@@ -221,47 +212,44 @@
			}
			else
			{
			blinkCodes.Add(linkCode);
			blinkCodes.Add(linkNodeCode);
			}

			await _bimfaceCtrl?.ClearBlinkComponents();
			await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
			await Task.Delay(5000);
			await _bimfaceCtrl?.ClearBlinkComponents();
			};

			_propertyCtrl.ViewParterEvent += (parter) =>
			{
			if (parter == null)
			{
			return;
			}
			_bimfaceCtrl?.ZoomToComponent(parter.Code);
			};
			_propertyCtrl.PropertyValueChangedEvent += (visual) =>
			_propertyCtrl.PropertyValueChangedEvent += async (visual) =>
			{
			if (visual == null)
			{
			return;
			}
			UpdateVisualListCtrl();
			ApplyGradingResultList(visual);
			var gradingHelper = await GetGradingHelper();
			gradingHelper.Set();
			};
			_propertyCtrl.MarkPropertyValueChangedEvent += (visual) =>
			_propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
			{
			//标注属性发生改变
			//判断当前是否有标注展示，若有则更新标注，最好是更新单个标注
			UpdateMark(visual);
			var markHelper = await GetMarkHelper();
			markHelper.Set(visual);
			};
			_propertyCtrl.GradingPropertyValueChangedEvent += (parter) =>
			_propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
			{
			//分级属性发生改变
			//判断当前是否有分级展示，若有则更新分级，最好是更新单个分级
			var gradingHelper = await GetGradingHelper();
			gradingHelper.Set(visual);
			};
			_propertyCtrl.FlowDirectionPropertyValueChangedEvent += (visual) =>
			_propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
			{
			//流向属性发生改变
			//判断流向是否加载，如果加载则更新流向，最好是更新单个流向
			UpdateFlowEffect(visual);
			var flowEffectHelper = await GetFlowEffectHelper();
			flowEffectHelper.Set(visual);
			};

			}
			@@ -302,42 +290,314 @@
			this.docPnlRight.Width = 300;
			}

			//显示选择属性
			private void ShowSelectedProperty()
			//设置属性控件
			private async void SetPropertyCtrl(HydroVisualInfo visual)
			{
			ShowSelectedProperty(_selectedVisual);
			ShowPropertyCtrl();
			var visualVmListHelper = await GetVisualVmListHelper();
			var vm = visualVmListHelper.GetVisual(visual);
			_propertyCtrl.SelectedObject = vm;
			}

			//显示选择属性
			private void ShowSelectedProperty(Yw.Model.HydroVisualInfo visual)
			//更新属性控件
			private void UpdatePropertyCtrl()
			{
			_propertyCtrl?.UpdateRows();
			}

			//清理属性控件
			private void ClearPropertyCtrl()
			{
			if (_propertyCtrl != null)
			{
			_propertyCtrl.SelectedObject = null;
			}
			}

			#endregion

			#region 选择构件

			//可见来源
			protected enum eVisualSource
			{
			None,
			Bimface,
			Q3d,
			Property,
			List,
			Search,
			Monitor,
			Check,
			Calcu,
			Warning,
			}

			//选择构件
			private Yw.Model.HydroVisualInfo _visual = null;

			//选择构件
			private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
			{
			_visual = visual;
			switch (source)
			{
			case eVisualSource.None:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Bimface:
			{
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Q3d:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Property:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			}
			break;
			case eVisualSource.List:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Search:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Monitor:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Check:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Calcu:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			case eVisualSource.Warning:
			{
			_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			this.barBtnSetMonitor.Enabled = visual != null;
			SetPropertyCtrl(visual);
			}
			break;
			default: break;
			}
			}

			#endregion

			#region 构件明细

			#region 可见列表

			//可见列表辅助类
			private SimulationVisualListHelper _visualListHelper = null;

			//获取可见列表辅助类
			private SimulationVisualListHelper GetVisualListHelper()
			{
			if (_visualListHelper == null)
			{
			_visualListHelper = new SimulationVisualListHelper();
			_visualListHelper.InitialData(_hydroInfo);
			}
			return _visualListHelper;
			}

			#endregion

			#region 视图列表

			//可见视图列表辅助类
			private SimulationVisualVmListHelper _visualVmListHelper = null;

			//获取可见视图列表辅助类
			private async Task<SimulationVisualVmListHelper> GetVisualVmListHelper()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_visualVmListHelper == null)
			{
			var visualListHelper = GetVisualListHelper();
			var calcuResultHelper = await GetCalcuResultHelper();
			_visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
			}
			return _visualVmListHelper;
			}

			#endregion

			#region 明细控件

			//构件明细控件
			private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;

			//获取构件明细控件
			private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
			{
			if (_visualListCtrl == null)
			{
			_visualListCtrl = new HydroVisualListCtrl();
			_visualListCtrl.Dock = DockStyle.Fill;
			_visualListCtrl.HydroClickInfoEvent += (visual) =>
			{

			};
			_visualListCtrl.HydroChangedInfoEvent += (visualList) =>
			{

			};
			}
			return _visualListCtrl;
			}

			//构件明细控件是否可见
			private bool IsVisualListCtrlVisible
			{
			get
			{
			if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
			{
			if (this.controlContainerBottom.Controls.Count > 0)
			{
			if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
			{
			return true;
			}
			}
			}
			return false;
			}
			}

			//显示构件明细控件
			private async void ShowVisualListCtrl()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			ShowPropertyCtrl();
			_selectedVisual = visual;
			if (_selectedVisual == null)
			var visualListCtrl = GetVisualListCtrl();
			if (!IsVisualListCtrlVisible)
			{
			_propertyCtrl.SelectedObject = null;
			return;
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(visualListCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "构件明细";
			this.docPnlBottom.Height = 350;
			}
			_propertyCtrl.SelectedObject = GetVisualViewModel(_selectedVisual);
			var visualVmListHelper = await GetVisualVmListHelper();
			var allVisualVmList = visualVmListHelper.GetVisualList();
			visualListCtrl.SetBindingData(allVisualVmList);
			var calcuResult = await GetCalcuResult();
			if (calcuResult != null && calcuResult.Succeed)
			{
			visualListCtrl.SetCalcuView();
			}
			else
			{
			visualListCtrl.SetNormalView();
			}
			}

			//更新选择属性
			private void UpdateSelectedProperty()
			//更新构件明细控件
			private void UpdateVisualListCtrl()
			{
			if (!IsPropertyCtrlVisible)
			if (!IsVisualListCtrlVisible)
			{
			return;
			}
			if (_selectedVisual == null)
			{
			return;
			}
			_propertyCtrl?.UpdateRows();
			_visualListCtrl?.UpdateBindingData();
			}

			//构件明细
			private void barBtnVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowVisualListCtrl();
			}

			#endregion

			#region 构件显示

			//构件可见辅助类
			private SimulationVisualVisibleHelper _visualVisibleHelper = null;

			//获取构件可见辅助类
			private async Task<SimulationVisualVisibleHelper> GetVisualVisibleHelper()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_visualVisibleHelper == null)
			{
			var visualListHelper = GetVisualListHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_visualVisibleHelper = new SimulationVisualVisibleHelper(visualListHelper, bimfaceCtrl);
			_visualVisibleHelper.InitialData(_hydroInfo);
			}
			return _visualVisibleHelper;
			}

			//设置构件可见性
			private async void SetVisualVisible()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var visualVisibleHelper = await GetVisualVisibleHelper();
			var allVisibleList = visualVisibleHelper.Items;
			var dlg = new SetHydroVisualVisibleDlg();
			dlg.SetBindingData(allVisibleList);
			dlg.ReloadDataEvent += (list) =>
			{
			visualVisibleHelper.Items = list;
			visualVisibleHelper.Set();
			};
			dlg.ShowDialog();
			}

			//设置构件显示
			private void barBtnSetVisualVisible_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			SetVisualVisible();
			}

			#endregion

			#endregion

			@@ -357,14 +617,14 @@
			return;
			}
			var allParterList = _hydroInfo.GetAllVisuals();
			_selectedVisual = allParterList?.Find(x => x.Code == code);
			_visual = allParterList?.Find(x => x.Code == code);
			var elementIds = new List<string>();
			if (_selectedVisual != null)
			if (_visual != null)
			{
			elementIds.Add(_selectedVisual.Code);
			elementIds.Add(_visual.Code);
			}
			await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
			ShowSelectedProperty();
			//ShowSelectedProperty();
			};
			_matchingListCtrl.ApplyMatchingEvent += (output) =>
			{
			@@ -390,7 +650,7 @@
			}
			this.controlContainerBottom.Controls.Clear();
			var matchingListCtrl = GetMatchingListCtrl();
			var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetCalcuResultList());
			var input = AssetsMatchingParasHelper.Create(_hydroInfo, null);
			matchingListCtrl.SetBindingData(input);
			this.controlContainerBottom.Controls.Add(matchingListCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			@@ -400,7 +660,7 @@

			#endregion

			#region 未匹配列表
			#region 未匹列表

			//获取未匹配列表控件
			private XhsProjectSimulationUnMatchingListCtrl GetUnMatchingListCtrl()
			@@ -420,17 +680,17 @@
			return;
			}
			var allParterList = _hydroInfo.GetAllVisuals();
			_selectedVisual = allParterList?.Find(x => x.Code == parter.Code);
			_visual = allParterList?.Find(x => x.Code == parter.Code);
			var elementIds = new List<string>() { parter.Code };
			await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
			ShowSelectedProperty();
			//ShowSelectedProperty();
			};
			_unMatchingListCtrl.ViewModelEvent += async (parters) =>//查看模型
			{
			var codes = parters?.Select(x => x.Code).Distinct().ToList();
			await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
			_selectedVisual = null;
			ShowSelectedProperty();
			_visual = null;
			//ShowSelectedProperty();
			};
			}
			return _unMatchingListCtrl;
			@@ -458,39 +718,27 @@

			#region 一键显隐

			//显隐编码列表
			private List<string> _fastShowHiddenCodeList = null;

			//一键显隐
			private async void FastShowHidden()
			//设置装饰件可见性
			private async void SetDecoratorVisible(bool isDecoratorVisible)
			{
			if (_hydroInfo == null)
			var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
			if (isDecoratorVisible)
			{
			return;
			}
			if (_hydroInfo.Decorators == null \|\| _hydroInfo.Decorators.Count < 1)
			{
			return;
			}
			if (_fastShowHiddenCodeList == null)
			{
			_fastShowHiddenCodeList = _hydroInfo.Decorators.Select(x => x.Code).ToList();
			await _bimfaceCtrl?.HideComponents(_fastShowHiddenCodeList);
			await _bimfaceCtrl?.ShowComponents(codes);
			}
			else
			{
			await _bimfaceCtrl?.ShowComponents(_fastShowHiddenCodeList);
			_fastShowHiddenCodeList = null;
			await _bimfaceCtrl?.HideComponents(codes);
			}
			}

			//触发一键显隐
			private void barBtnFastShowHidden_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			//设置
			private void barCkDecorator_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			FastShowHidden();
			SetDecoratorVisible(this.barCkDecorator.Checked);
			}

			#endregion
			#endregion

			#region 保存信息

			@@ -920,132 +1168,29 @@

			#endregion

			#region 并联分析

			//并联分析
			private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (_hydroInfo.Pumps == null \|\| _hydroInfo.Pumps.Count < 1)
			{
			return;
			}
			var allCalcuResultList = GetCalcuResultList();
			var vmList = new List<XhsSinglePumpViewModel>();
			foreach (var pump in _hydroInfo.Pumps)
			{
			if (!pump.RatedN.HasValue)
			{
			continue;
			}
			var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
			var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
			var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
			if (qh == null)
			{
			continue;
			}

			var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
			var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
			var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();

			var vm = new XhsSinglePumpViewModel();
			vmList.Add(vm);
			vm.ID = pump.ID;
			vm.Name = pump.Name;
			vm.Code = pump.Code;
			vm.IsBp = true;
			vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
			vm.RatedHz = pump.RatedHz;
			vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
			vm.RatedSpeed = pump.RatedN.Value;
			vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
			vm.CurveQH = qhPtList;
			vm.CurveQE = qePtList;
			vm.CurveQP = qpPtList;

			if (allCalcuResultList != null && allCalcuResultList.Count > 0)
			{
			var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
			if (calcuResult != null)
			{
			if (calcuResult.CalcuFlow.HasValue)
			{
			vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
			}

			var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
			var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
			if (calcuResultStart != null && calcuResultEnd != null)
			{
			if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
			{
			vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
			}
			}
			}
			}

			}

			var dlg = new PumpParallelAnalyDlg();
			dlg.SetBindingData(vmList);
			dlg.ReloadDataEvent += (list) =>
			{
			list?.ForEach(x =>
			{
			var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
			if (pump != null)
			{
			pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
			pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
			}
			});
			ShowSelectedProperty();
			return true;
			};
			dlg.ShowDialog();
			}

			#endregion

			#region 构件查询

			//查询组件
			private HydroVisualSearchListCtrl _searchCtrl = null;

			//获取查询组件
			private HydroVisualSearchListCtrl GetSearchCtrl()
			private async Task<HydroVisualSearchListCtrl> GetSearchCtrl()
			{
			if (_searchCtrl == null)
			{
			var visualVmListHelper = await GetVisualVmListHelper();
			var allVisualVmList = visualVmListHelper.GetVisualList();
			_searchCtrl = new HydroVisualSearchListCtrl();
			_searchCtrl.Dock = DockStyle.Fill;
			var allVisualViewModelList = GetVisualViewModelList();
			_searchCtrl.InitialData(allVisualViewModelList);
			_searchCtrl.HydroClickInfoEvent += async (visual) =>
			_searchCtrl.InitialData(allVisualVmList);
			_searchCtrl.HydroClickInfoEvent += (visual) =>
			{
			ShowSelectedProperty(visual);
			await _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
			SelectVisual(visual, eVisualSource.Check);
			};
			_searchCtrl.HydroSearchInfoEvent += async (list) =>
			_searchCtrl.HydroSearchInfoEvent += (list) =>
			{
			var elementIds = new List<string>();
			if (list != null && list.Count > 0)
			{
			_selectedVisual = list.First();
			list.ForEach(x => elementIds.Add(x.Code));
			}
			else
			{
			_selectedVisual = null;
			}
			ShowSelectedProperty();
			await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
			var visual = list?.FirstOrDefault();
			SelectVisual(visual, eVisualSource.Search);
			};
			}
			return _searchCtrl;
			@@ -1071,13 +1216,13 @@
			}

			//显示查询控件
			private void ShowSearchCtrl(string content)
			private async void ShowSearchCtrl(string content)
			{
			if (IsSearchCtrlVisible)
			{
			return;
			}
			var searchCtrl = GetSearchCtrl();
			var searchCtrl = await GetSearchCtrl();
			searchCtrl.SetBindingData(content);
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(searchCtrl);
			@@ -1116,118 +1261,35 @@

			#region 模型标注

			#region 标注设置
			//标注辅助类
			private SimulationMarkHelper _markHelper = null;

			//所有标注设置列表
			private List<HydroMarkSetViewModel> _allMarkSetList = null;

			//获取标注设置列表
			private List<HydroMarkSetViewModel> GetMarkSetList()
			//获取标注辅助类
			private async Task<SimulationMarkHelper> GetMarkHelper()
			{
			if (_hydroInfo == null)
			if (_markHelper == null)
			{
			return default;
			var visualListHelper = GetVisualListHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_markHelper = new SimulationMarkHelper(visualListHelper, bimfaceCtrl);
			}
			if (_allMarkSetList == null)
			{
			_allMarkSetList = HydroMarkHelper.GetSetList(_hydroInfo);
			}
			return _allMarkSetList;
			return _markHelper;
			}

			#endregion

			#region 标注结果

			//所有标注结果列表
			private List<HydroMarkResultViewModel> _allMarkResultList = null;

			//获取标注结果列表
			//UseCache 是否使用缓存
			private List<HydroMarkResultViewModel> GetMarkResultList(bool useCache = true)
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (!useCache)
			{
			var allSetList = GetMarkSetList();
			_allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
			}
			if (_allMarkResultList == null)
			{
			var allSetList = GetMarkSetList();
			_allMarkResultList = HydroMarkHelper.GetResultList(_hydroInfo, allSetList);
			}
			return _allMarkResultList;
			}

			#endregion

			#region 标注显示

			//标注是否显示
			private bool _isMarkVisible = false;

			//更新标注
			private async void UpdateMark(Yw.Model.HydroVisualInfo visual)
			{
			var allSetList = GetMarkSetList();
			var result = HydroMarkHelper.GetResult(visual, allSetList);
			if (result == null)
			{
			return;
			}
			var allResultList = GetMarkResultList(true);
			allResultList.Remove(x => x.Code == visual.Code);
			allResultList.Add(result);
			if (_isMarkVisible)
			{
			var leadLabel = new LogicMarkLeadLabel() { Id = result.Code, Text = result.Text, Distance = null };
			await _bimfaceCtrl?.UpdateLogicMarkLeadLabel(leadLabel);
			}
			}

			//更新标注列表
			private void UpdateMarkList(List<Yw.Model.HydroVisualInfo> visuals)
			{
			if (visuals == null \|\| visuals.Count < 1)
			{
			visuals.ForEach(x => UpdateMark(x));
			}
			}

			//应用标注列表
			//UseCache 是否使用缓存
			private async void ApplyMarkList(bool useCache = true)
			{
			if (_isMarkVisible)
			{
			var allResultList = GetMarkResultList(useCache);
			var leadLabels = allResultList?.Select(x => new LogicMarkLeadLabel(x.Code, x.Text, null)).ToList();
			await _bimfaceCtrl?.SetLogicMarkLeadLabels(leadLabels);
			}
			else
			{
			await _bimfaceCtrl?.ClearLogicMarkLeadLabels();
			}
			}

			//显示标注设置窗体
			private void ShowSetMarkDlg()
			//显示标注列表
			private async void ShowMarkList()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allMarkSetList = GetMarkSetList();
			var markHelper = await GetMarkHelper();
			var dlg = new SetHydroMarkDlg();
			dlg.SetBindingData(allMarkSetList);
			dlg.SetBindingData(markHelper.Sets);
			dlg.ReloadDataEvent += (list) =>
			{
			_allMarkSetList = list;
			ApplyMarkList(false);
			markHelper.Sets = list;
			markHelper.Set();
			};
			dlg.ShowDialog();
			}
			@@ -1235,251 +1297,98 @@
			//设置标注
			private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowSetMarkDlg();
			ShowMarkList();
			}

			//是否显示
			private void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			_isMarkVisible = this.barCkMark.Checked;
			ApplyMarkList(true);
			var markHelper = await GetMarkHelper();
			markHelper.Visible = this.barCkMark.Checked;
			markHelper.Set();
			}

			#endregion

			#endregion

			#region 颜色分级

			#region 颜色配置
			//颜色分级辅助类
			private SimulationGradingHelper _gradingHelper = null;

			//所有颜色分级配置列表
			private List<HydroGradingVmo> _allGradingList = null;

			//获取颜色分级配置列表
			private async Task<List<HydroGradingVmo>> GetGradingList()
			//获取颜色分级辅助类
			private async Task<SimulationGradingHelper> GetGradingHelper()
			{
			if (_hydroInfo == null)
			if (_gradingHelper == null)
			{
			return default;
			var visualListHelper = GetVisualListHelper();
			var calcuResultHelper = await GetCalcuResultHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
			}
			if (_allGradingList == null)
			{
			_allGradingList = await HydroGradingHelper.GetGradingList(_hydroInfo);
			}
			return _allGradingList;
			return _gradingHelper;
			}

			//显示颜色分级窗体
			private async void ShowGradingDlg()
			//设置颜色分级列表
			private async void SetGradingList()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allGradingList = await GetGradingList();
			var gradingHelper = await GetGradingHelper();
			var allGradingList = await gradingHelper.GetGradingList();
			var dlg = new SetHydroGradingTreeDlg();
			dlg.SetBindingData(_hydroInfo, allGradingList);
			dlg.ReloadDataEvent += (list) =>
			{
			_allGradingList = list;
			ApplyGradingResultList(false);
			gradingHelper.SetGradingList(list);
			gradingHelper.Set();
			};
			dlg.ApplyDataEvent += (catalog, propName) =>
			{
			UpdateGradingApplyList(catalog, propName);
			ApplyGradingResultList(false);
			gradingHelper.UpdateApply(catalog, propName);
			gradingHelper.Set();
			};
			dlg.ShowDialog();
			}

			//配置颜色分级
			private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private void barBtnSetGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowGradingDlg();
			SetGradingList();
			}

			#endregion

			#region 应用分级

			//颜色分级应用列表
			private List<HydroGradingApplyViewModel> _allGradingApplyList = null;

			//获取颜色分级应用列表
			private List<HydroGradingApplyViewModel> GetGradingApplyList()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_allGradingApplyList == null)
			{
			_allGradingApplyList = HydroGradingHelper.GetApplyList(_hydroInfo);
			}
			return _allGradingApplyList;
			}

			//更新颜色分级应用列表
			private void UpdateGradingApplyList(string catalog, string propName)
			{
			var allGradingApplyList = GetGradingApplyList();
			if (allGradingApplyList == null \|\| allGradingApplyList.Count < 1)
			{
			return;
			}
			var apply = allGradingApplyList.Find(x => x.Catalog == catalog);
			if (apply == null)
			{
			return;
			}
			apply.PropName = propName;
			}

			//显示颜色分级应用窗体
			private void ShowGradingApplyDlg()
			//应用颜色分级列表
			private async void ApplyGradingList()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allGradingApplyList = GetGradingApplyList();
			if (allGradingApplyList == null \|\| allGradingApplyList.Count < 1)
			{
			return;
			}
			var gradingHelper = await GetGradingHelper();
			var dlg = new ApplyHydroGradingDlg();
			dlg.SetBindingData(allGradingApplyList);
			dlg.ReloadDataEvent += (obj) =>
			dlg.SetBindingData(gradingHelper.Applies);
			dlg.ReloadDataEvent += (list) =>
			{
			_allGradingApplyList = obj;
			ApplyGradingResultList(false);
			gradingHelper.Applies = list;
			gradingHelper.Set();
			};
			dlg.ShowDialog();
			}

			//应用颜色分级
			private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private void barBtnApplyGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowGradingApplyDlg();
			}

			#endregion

			#region 应用结果

			//所有颜色分级结果列表
			private List<HydroGradingResultViewModel> _allGradingResultList = null;

			//获取颜色分级结果列表
			//UseCache是否使用缓存
			private async Task<List<HydroGradingResultViewModel>> GetGradingResultList(bool useCache = true)
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			var allGradingList = await GetGradingList();
			var allGradingApplyList = GetGradingApplyList();
			var allCalcuResultList = GetCalcuResultList();
			if (!useCache)
			{
			_allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
			}
			if (_allGradingResultList == null)
			{
			_allGradingResultList = HydroGradingHelper.GetResultList(_hydroInfo, allGradingList, allGradingApplyList, allCalcuResultList);
			}
			return _allGradingResultList;
			}

			#endregion

			#region 结果展示

			//颜色分级是否显示
			private bool _isGradingVisible = false;

			//应用颜色分级结果列表
			//UseCache是否使用缓存
			private async void ApplyGradingResultList(bool useCache = true)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allGradingResultList = await GetGradingResultList(useCache);
			if (allGradingResultList == null \|\| allGradingResultList.Count < 1)
			{
			return;
			}
			if (_isGradingVisible)
			{
			var groupList = allGradingResultList.GroupBy(x => x.Color).ToList();
			groupList.ForEach(async x => await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1));
			}
			else
			{
			var codes = allGradingResultList.Select(x => x.Code).Distinct().ToList();
			await _bimfaceCtrl?.RestoreComponentsColor(codes);
			}
			}

			//应用颜色分级结果列表
			private async void ApplyGradingResultList(Yw.Model.HydroVisualInfo visual)
			{
			if (visual == null)
			{
			return;
			}
			var allGradingList = await GetGradingList();
			var allGradingApplyList = GetGradingApplyList();
			var allGradingResultList = await GetGradingResultList(true);
			var allCalcuResultList = GetCalcuResultList(true);
			var oldResult = allGradingResultList?.Find(x => x.Code == visual.Code);
			if (oldResult != null)
			{
			allGradingResultList.Remove(oldResult);
			}
			var newResult = HydroGradingHelper.GetResult(visual, allGradingList, allGradingApplyList, allCalcuResultList);
			if (newResult != null)
			{
			allGradingResultList.Add(newResult);
			}
			if (_isGradingVisible)
			{
			if (newResult == null)
			{
			if (oldResult != null)
			{
			await _bimfaceCtrl?.RestoreComponentsColor(oldResult.Code);
			}
			}
			else
			{
			await _bimfaceCtrl?.OverrideComponentsColor(newResult.Code, newResult.Color, 1);
			}
			}
			}

			//应用颜色分级结果列表
			private void ApplyGradingResultList(List<Yw.Model.HydroVisualInfo> visualList)
			{
			if (visualList == null \|\| visualList.Count < 1)
			{
			return;
			}
			visualList.ForEach(x => ApplyGradingResultList(x));
			ApplyGradingList();
			}

			//颜色分级展示
			private void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			_isGradingVisible = this.barCkGrading.Checked;
			ApplyGradingResultList(true);
			var gradingHelper = await GetGradingHelper();
			gradingHelper.Visible = this.barCkGrading.Checked;
			gradingHelper.Set();
			}

			#endregion

			#endregion

			@@ -1506,10 +1415,13 @@
			sw.Stop();
			TimeSpan ts2 = sw.Elapsed;
			Console.WriteLine("Stopwatch总共花费{0}ms.", ts2.TotalMilliseconds);
			_selectedVisual = null;
			_visual = null;
			await _bimfaceCtrl?.ZoomAndSelectComponents(null);
			ShowSelectedProperty();
			//ShowSelectedProperty();
			TipFormHelper.ShowSucceed("数据已刷新");

			var visualListHelper = GetVisualListHelper();
			visualListHelper.InitialData(_hydroInfo);
			}
			}

			@@ -1517,357 +1429,139 @@

			#region 水流动画

			//水流动画是否可见
			private bool _isFlowEffectVisible = false;
			//水流动画辅助类
			private SimulationFlowEffectHelper _flowEffectHelper = null;

			//所有水流动画列表
			private List<LogicFlowEffect> _allFlowEffectList = null;

			//获取流向列表
			private List<LogicFlowEffect> GetFlowEffectList()
			//获取水流动画辅助类
			private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_allFlowEffectList == null)
			if (_flowEffectHelper == null)
			{
			_allFlowEffectList = new List<LogicFlowEffect>();
			var allCalcuResultList = GetCalcuResultList();
			if (_hydroInfo.Pipes != null && _hydroInfo.Pipes.Count > 0)
			{
			foreach (var parter in _hydroInfo.Pipes)
			{
			var flowEffect = new LogicFlowEffect();
			_allFlowEffectList.Add(flowEffect);
			flowEffect.Id = parter.Code;
			flowEffect.Rotation = 90;
			flowEffect.SpeedX = 0.1;
			if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.None)
			{
			flowEffect.SpeedX = 0;
			}
			else if (parter.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
			{
			flowEffect.SpeedX = 0.1;
			}
			else
			{
			flowEffect.SpeedX = -0.1;
			}

			if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.None)
			{
			flowEffect.SpeedY = 0;
			}
			else if (parter.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
			{
			flowEffect.SpeedY = 0.1;
			}
			else
			{
			flowEffect.SpeedY = -0.1;
			}

			var calcuResult = allCalcuResultList?.Find(x => x.Code == parter.Code) as HydroCalcuLinkResult;
			if (calcuResult != null)
			{
			if (calcuResult.CalcuVelocity < 0)
			{
			flowEffect.SpeedX = -flowEffect.SpeedX;
			}
			}
			}
			}
			var visualListHelper = GetVisualListHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
			var calcuResult = await GetCalcuResult();
			_flowEffectHelper.InitialData(calcuResult);
			}
			return _allFlowEffectList;
			}

			//加载水流动画
			private async void LoadFlowEffect()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allFlowEffectList = GetFlowEffectList();
			await _bimfaceCtrl?.LoadFlowEffect(allFlowEffectList);
			}

			//卸载水流动画
			private async void UnloadFlowEffect()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			await _bimfaceCtrl?.UnloadFlowEffect();
			}

			//设置水力动画
			private void SetFlowEffect()
			{
			if (_isFlowEffectVisible)
			{
			LoadFlowEffect();
			}
			else
			{
			UnloadFlowEffect();
			}
			}

			//更新水流动画
			private async void UpdateFlowEffect(Yw.Model.HydroVisualInfo visual)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var allFlowEffectList = GetFlowEffectList();
			var flowEffect = _allFlowEffectList?.Find(x => x.Id == visual.Code);
			if (flowEffect == null)
			{
			return;
			}
			if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.None)
			{
			flowEffect.SpeedX = 0;
			}
			else if (visual.FlowDirectionX == Yw.Hydro.FlowDirection.Positive)
			{
			flowEffect.SpeedX = 0.1;
			}
			else
			{
			flowEffect.SpeedX = -0.1;
			}

			if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.None)
			{
			flowEffect.SpeedY = 0;
			}
			else if (visual.FlowDirectionY == Yw.Hydro.FlowDirection.Positive)
			{
			flowEffect.SpeedY = 0.1;
			}
			else
			{
			flowEffect.SpeedY = -0.1;
			}

			var allCalcuResultList = GetCalcuResultList();
			var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code) as HydroCalcuLinkResult;
			if (calcuResult != null)
			{
			if (calcuResult.CalcuVelocity < 0)
			{
			flowEffect.SpeedX = -flowEffect.SpeedX;
			}
			}
			if (_isFlowEffectVisible)
			{
			await _bimfaceCtrl?.UpdateFlowEffect(flowEffect);
			}
			return _flowEffectHelper;
			}

			//水流动画是否可见
			private void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			_isFlowEffectVisible = this.barCkFlowEffect.Checked;
			SetFlowEffect();
			var flowEffectHelper = await GetFlowEffectHelper();
			flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
			flowEffectHelper.Set();
			}

			#endregion

			#region 选择构件
			#region 监测列表

			//选择构件
			private Yw.Model.HydroVisualInfo _selectedVisual = null;
			#region 监测点

			//选择构件
			private Yw.Model.HydroVisualInfo SelectedVisual
			{
			get { return _selectedVisual; }
			set
			{
			_selectedVisual = value;
			if (_selectedVisual == null)
			{
			this.barBtnSetMonitor.Enabled = false;
			}
			else
			{
			this.barBtnSetMonitor.Enabled = true;
			}
			}
			}
			//监测点辅助类
			private SimulationMonitorHelper _monitorHelper = null;

			#endregion

			#region 构件明细

			#region 构件列表

			//所有构件视图列表
			private List<HydroVisualViewModel> _allVisualViewModelList = null;

			//获取构件视图列表
			private List<HydroVisualViewModel> GetVisualViewModelList()
			//获取监测点辅助类
			private SimulationMonitorHelper GetMonitorHelper()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_allVisualViewModelList == null)
			if (_monitorHelper == null)
			{
			_allVisualViewModelList = new List<HydroVisualViewModel>();
			var allVisualList = _hydroInfo.GetAllVisuals();
			if (allVisualList != null && allVisualList.Count > 0)
			{
			var allCalcuResultList = GetCalcuResultList();
			allVisualList.ForEach(x =>
			{
			var vm = HydroVisualViewModelBuilder.CreateVisualViewModel(x, _hydroInfo);
			var calcuResult = allCalcuResultList?.Find(x => x.Code == x.Code);
			if (calcuResult != null)
			{
			vm.UpdateCalcuProperty(calcuResult);
			}
			_allVisualViewModelList.Add(vm);
			});
			}
			_monitorHelper = new SimulationMonitorHelper(_hydroInfo.ID);
			}
			return _allVisualViewModelList;
			return _monitorHelper;
			}

			//更新可见视图属性
			private void UpdateVisualViewModelProperty()
			//设置监测点列表
			private async void SetMonitorList(HydroVisualInfo visual)
			{
			var allVisualViewModelList = GetVisualViewModelList();
			if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
			{
			allVisualViewModelList.ForEach(x =>
			{
			x.UpdateProperty();
			});
			}
			}

			//更新可见视图属性
			private void UpdateVisualViewModelProperty(List<string> codes)
			{
			if (codes == null \|\| codes.Count < 1)
			if (_hydroInfo == null)
			{
			return;
			}
			var allVisualViewModelList = GetVisualViewModelList();
			if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
			var monitorHelper = GetMonitorHelper();
			var allMonitorList = await monitorHelper.Get();
			var dlg = new SetHydroMonitorListDlg();
			dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
			dlg.ReloadDataEvent += async (list) =>
			{
			allVisualViewModelList.ForEach(x =>
			var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
			if (!bol)
			{
			if (codes.Contains(x.Code))
			{
			x.UpdateProperty();
			}
			});
			}
			}

			//更新可见视图属性
			private void UpdateVisualViewModelProperty(List<Yw.Model.HydroVisualInfo> visualList)
			{
			if (visualList == null \|\| visualList.Count < 1)
			{
			return;
			}
			var allVisualViewModelList = GetVisualViewModelList();
			if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
			{
			allVisualViewModelList.ForEach(x =>
			{
			if (visualList.Exists(t => t.Code == x.Code))
			{
			x.UpdateProperty();
			}
			});
			}
			}

			//更新可见视图计算属性
			private void UpdateVisualViewModelCalcuProperty()
			{
			var allVisualViewModelList = GetVisualViewModelList();
			if (allVisualViewModelList != null && allVisualViewModelList.Count > 0)
			{
			var allCalcuResultList = GetCalcuResultList();
			if (allCalcuResultList != null && allCalcuResultList.Count > 0)
			{
			allVisualViewModelList.ForEach(x =>
			{
			var calcuResult = allCalcuResultList.Find(t => t.Code == x.Code);
			if (calcuResult != null)
			{
			x.UpdateCalcuProperty(calcuResult);
			}
			});
			TipFormHelper.ShowError("设置失败！");
			return;
			}
			}
			TipFormHelper.ShowSucceed("设置成功！");
			var monitorList = await monitorHelper.Update(visual.Code);
			var monitorValueHelper = GetMonitorValueHelper();
			monitorValueHelper.Update(visual.Code, monitorList);
			var monitorMarkerHelper = await GetMonitorMarkerHelper();
			monitorMarkerHelper.Update(visual.Code, monitorList);
			monitorMarkerHelper.Set();
			};
			dlg.ShowDialog();
			}

			//获取构件视图
			private HydroVisualViewModel GetVisualViewModel(string code)
			//设置监测点
			private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			if (string.IsNullOrEmpty(code))
			{
			return default;
			}
			var allVisualViewModelList = GetVisualViewModelList();
			return allVisualViewModelList?.Find(x => x.Code == code);
			}

			//获取可见视图
			private HydroVisualViewModel GetVisualViewModel(Yw.Model.HydroVisualInfo visual)
			{
			if (visual == null)
			{
			return default;
			}
			var allVisualViewModelList = GetVisualViewModelList();
			return allVisualViewModelList?.Find(x => x.Code == visual.Code);
			SetMonitorList(_visual);
			}

			#endregion

			#region 构件明细控件
			#region 监测值

			//构件明细控件
			private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
			//监测值辅助类
			private SimulationMonitorValueHelper _monitorValueHelper = null;

			//获取构件明细控件
			private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
			//获取监测值辅助类
			private SimulationMonitorValueHelper GetMonitorValueHelper()
			{
			if (_visualListCtrl == null)
			if (_monitorValueHelper == null)
			{
			_visualListCtrl = new HydroVisualListCtrl();
			_visualListCtrl.Dock = DockStyle.Fill;
			_visualListCtrl.HydroClickInfoEvent += async (visual) =>
			{
			ShowSelectedProperty(visual);
			await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedVisual?.Code);
			};
			_visualListCtrl.HydroChangedInfoEvent += (visualList) =>
			{
			UpdateMarkList(visualList);
			UpdateSelectedProperty();
			ApplyGradingResultList();
			};
			var visualListHelper = GetVisualListHelper();
			var monitorHelper = GetMonitorHelper();
			_monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
			}
			return _visualListCtrl;
			return _monitorValueHelper;
			}

			//构件明细控件是否可见
			private bool IsVisualListCtrlVisible
			#endregion

			#region 监测值控件

			//监测值列表控件
			private HydroMonitorValueListCtrl _monitorValueListCtrl = null;

			//获取监测值列表控件
			private HydroMonitorValueListCtrl GetMonitorValueListCtrl()
			{
			if (_monitorValueListCtrl == null)
			{
			_monitorValueListCtrl = new HydroMonitorValueListCtrl();
			_monitorValueListCtrl.Dock = DockStyle.Fill;
			_monitorValueListCtrl.HydroViewEvent += (code) =>
			{
			var visualListHelper = GetVisualListHelper();
			var visual = visualListHelper.GetVisual(code);
			SelectVisual(visual, eVisualSource.Monitor);
			};
			}
			return _monitorValueListCtrl;
			}

			//监测值列表控件是否可见
			private bool IsMonitorValueListCtrlVisible
			{
			get
			{
			@@ -1875,7 +1569,7 @@
			{
			if (this.controlContainerBottom.Controls.Count > 0)
			{
			if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
			if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
			{
			return true;
			}
			@@ -1885,240 +1579,21 @@
			}
			}

			//显示构件明细控件
			private void ShowVisualListCtrl()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (IsVisualListCtrlVisible)
			{
			return;
			}

			var visualListCtrl = GetVisualListCtrl();
			var allVisualViewModelList = GetVisualViewModelList();
			visualListCtrl.SetBindingData(allVisualViewModelList);
			var allCalcuResultList = GetCalcuResultList();
			if (allCalcuResultList == null \|\| allCalcuResultList.Count < 1)
			{
			visualListCtrl.SetNormalView();
			}
			else
			{
			visualListCtrl.SetCalcuView();
			}
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(visualListCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "构件明细";
			this.docPnlBottom.Height = 350;
			}

			//更新构件明细控件
			private void UpdateVisualListCtrl()
			{
			if (!IsVisualListCtrlVisible)
			{
			return;
			}
			_visualListCtrl?.UpdateBindingData();
			}

			//构件明细
			private void barBtnHydroVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowVisualListCtrl();
			}

			#endregion

			#endregion

			#region 监测列表

			#region 测点列表

			//所有监测点列表
			private List<HydroMonitorVmo> _allMonitorList = null;

			//获取监测点列表
			private async Task<List<HydroMonitorVmo>> GetMonitorList()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_allMonitorList == null)
			{
			_allMonitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByModelID(_hydroInfo.ID);
			if (_allMonitorList == null)
			{
			_allMonitorList = new List<HydroMonitorVmo>();
			}
			}
			return _allMonitorList;
			}

			//更新监测点列表
			private async void UpdateMonitorList(string code)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (string.IsNullOrEmpty(code))
			{
			return;
			}
			var allMonitorList = await GetMonitorList();
			allMonitorList.RemoveAll(x => x.Relation == code);
			var monitorList = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.GetByRelation(_hydroInfo.ID, code);
			if (monitorList != null && monitorList.Count > 0)
			{
			allMonitorList.AddRange(monitorList);
			}
			UpdateMonitorValueList(code, monitorList);
			SetLogicMonitorList();
			}

			//设置选择构件监测点列表
			private async void SetSelectVisualMonitorList()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (_selectedVisual == null)
			{
			return;
			}
			var allMonitorList = await GetMonitorList();
			var dlg = new SetHydroVisualMonitorDlg();
			dlg.SetBindingData(_hydroInfo, _selectedVisual, allMonitorList);
			dlg.ReloadDataEvent += async (hydroInfo, visual, list) =>
			{
			if (hydroInfo == null)
			{
			return;
			}
			if (visual == null)
			{
			return;
			}
			var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(hydroInfo.ID, visual.Code, list);
			if (!bol)
			{
			TipFormHelper.ShowError("设置失败");
			return;
			}
			TipFormHelper.ShowSucceed("设置成功");
			UpdateMonitorList(visual.Code);
			};
			dlg.ShowDialog();
			}

			//设置监测点
			private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			SetSelectVisualMonitorList();
			}

			#endregion

			#region 监测值列表

			//所有监测值列表
			private List<HydroVisualMonitorValueViewModel> _allMonitorValueList = null;

			//获取监测值列表
			private async Task<List<HydroVisualMonitorValueViewModel>> GetMonitorValueList()
			{
			if (_allMonitorValueList == null)
			{
			_allMonitorValueList = new List<HydroVisualMonitorValueViewModel>();
			var allMonitorList = await GetMonitorList();
			var allVisualViewModelList = GetVisualViewModelList();
			allMonitorList.ForEach(x =>
			{
			var visual = allVisualViewModelList.Find(t => t.Code == x.Relation);
			if (visual != null)
			{
			var vm = new HydroVisualMonitorValueViewModel(visual.Vmo, x);
			_allMonitorValueList.Add(vm);
			}
			});
			}
			return _allMonitorValueList;
			}

			//更新监测值列表
			private async void UpdateMonitorValueList(string code, List<HydroMonitorVmo> monitorList)
			{
			if (string.IsNullOrEmpty(code))
			{
			return;
			}
			var visual = GetVisualViewModel(code)?.Vmo;
			if (visual == null)
			{
			return;
			}
			var allMonitorValueList = await GetMonitorValueList();
			var monitorValueList = allMonitorValueList.Where(x => x.Vmo.Relation == code).ToList();
			monitorValueList?.ForEach(x =>
			{
			var result = monitorList?.Exists(t => t.Relation == x.Vmo.Relation && t.PropName == x.Vmo.PropName);
			if (!(result.HasValue && result.Value))
			{
			allMonitorValueList.Remove(x);
			}
			});
			monitorList?.ForEach(x =>
			{
			var result = monitorValueList?.Exists(t => t.Vmo.Relation == x.Relation && t.Vmo.PropName == x.PropName);
			if (!(result.HasValue && result.Value))
			{
			var vm = new HydroVisualMonitorValueViewModel(visual, x);
			allMonitorValueList.Add(vm);
			}
			});
			}

			#endregion

			#region 监测值列表控件

			//监测值列表控件
			private HydroVisualMonitorValueListCtrl _monitorValueListCtrl = null;

			//获取监测值列表控件
			private HydroVisualMonitorValueListCtrl GetMonitorValueListCtrl()
			{
			if (_monitorValueListCtrl == null)
			{
			_monitorValueListCtrl = new HydroVisualMonitorValueListCtrl();
			_monitorValueListCtrl.Dock = DockStyle.Fill;
			_monitorValueListCtrl.HydroViewEvent += (code) =>
			{
			_bimfaceCtrl?.ZoomToComponent(code);
			};
			}
			return _monitorValueListCtrl;
			}

			//显示监测值列表控件
			private async void ShowMonitorValueListCtrl()
			{
			var monitorValueListCtrl = GetMonitorValueListCtrl();
			var allMonitorValueList = await GetMonitorValueList();
			if (!IsMonitorValueListCtrlVisible)
			{
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "监测值";
			this.docPnlBottom.Height = 350;
			}
			var monitorValueHelper = GetMonitorValueHelper();
			var allMonitorValueList = await monitorValueHelper.Get();
			monitorValueListCtrl.SetBindingData(allMonitorValueList);
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "监测值";
			this.docPnlBottom.Height = 350;
			}

			//设置监测值
			@@ -2129,81 +1604,36 @@

			#endregion

			#region 监测列表显示
			#region 监测点标记

			//监测是否显示
			private bool _isMonitorVisible = false;
			//监测标记辅助类
			private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;

			//获取业务监测列表
			private async Task<List<LogicMonitor>> GetLogicMonitorList()
			//获取监测标记辅助类
			private async Task<SimulationMonitorMarkerHelper> GetMonitorMarkerHelper()
			{
			var allMonitorList = await GetMonitorList();
			var allLogicMonitorList = allMonitorList.Select(x =>
			if (_monitorMarkerHelper == null)
			{
			var logicMonitor = new LogicMonitor();
			logicMonitor.Id = x.Relation;
			logicMonitor.PropName = x.PropName;
			logicMonitor.Description = x.Description;
			return logicMonitor;
			}).ToList();
			return allLogicMonitorList;
			}

			//设置业务监测列表
			private async void SetLogicMonitorList()
			{
			if (_isMonitorVisible)
			{
			var allLogicMonitorList = await GetLogicMonitorList();
			await _bimfaceCtrl?.SetLogicMonitors(allLogicMonitorList);
			var monitorHelper = GetMonitorHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_monitorMarkerHelper = new SimulationMonitorMarkerHelper(monitorHelper, bimfaceCtrl);
			}
			else
			{
			await _bimfaceCtrl?.ClearLogicMonitors();
			}
			return _monitorMarkerHelper;
			}

			//显示状态改变
			private void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			_isMonitorVisible = this.barCkMonitor.Checked;
			SetLogicMonitorList();
			}


			#endregion

			#endregion

			#region 水力检查

			#region 检查结果

			//检查结果缓存
			private HydroCheckResult _checkResult = null;

			//获取检查结果
			//needCheckAgain 用于确定是否需要重新检查
			private HydroCheckResult GetCheckResult(bool needCheckAgain = false)
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (needCheckAgain)
			{
			_checkResult = _hydroInfo.Check();
			}
			if (_checkResult == null)
			{
			_checkResult = _hydroInfo.Check();
			}
			return _checkResult;
			var monitorMarkerHelper = await GetMonitorMarkerHelper();
			monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
			monitorMarkerHelper.Set();
			}

			#endregion

			#region 检查控件
			#endregion

			#region 模型检查

			//检查控件
			private HydroCheckResultCtrl _checkCtrl = null;
			@@ -2211,90 +1641,99 @@
			//获取检查控件
			private HydroCheckResultCtrl GetCheckCtrl()
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_checkCtrl == null)
			{
			_checkCtrl = new HydroCheckResultCtrl();
			_checkCtrl.Dock = DockStyle.Fill;
			_checkCtrl.HydroClickEvent += async (code) =>
			_checkCtrl.HydroClickEvent += (code) =>
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var elementIds = new List<string>();
			if (string.IsNullOrEmpty(code))
			{
			this.SelectedVisual = null;
			}
			else
			{
			var allVisualViewModelList = GetVisualViewModelList();
			this.SelectedVisual = allVisualViewModelList?.Find(x => x.Code == code)?.Vmo;
			if (this.SelectedVisual != null)
			{
			elementIds.Add(this.SelectedVisual.Code);
			}
			}
			await _bimfaceCtrl?.ZoomAndSelectComponents(elementIds);
			ShowSelectedProperty();
			var visualListHelper = GetVisualListHelper();
			var visual = visualListHelper.GetVisual(code);
			SelectVisual(visual, eVisualSource.Check);
			};
			}
			return _checkCtrl;
			}

			//显示检查控件
			//needCheckAgain 用于确定是否需要重新检查
			private void ShowCheckCtrl(bool needCheckAgain = false)
			//检查控件是否可见
			private bool IsCheckCtrlVisible
			{
			var checkResult = GetCheckResult(needCheckAgain);
			get
			{
			if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
			{
			if (this.controlContainerBottom.Controls.Count > 0)
			{
			if (this.controlContainerBottom.Controls[0] is HydroCheckResultCtrl)
			{
			return true;
			}
			}
			}
			return false;
			}
			}

			//显示检查控件
			private void ShowCheckCtrl(HydroCheckResult checkResult)
			{
			if (checkResult == null)
			{
			return;
			}
			var checkCtrl = GetCheckCtrl();
			if (!IsCheckCtrlVisible)
			{
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(checkCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "检查结果";
			this.docPnlBottom.Height = 350;
			}
			checkCtrl.SetBindingData(checkResult);
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(checkCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "检查结果";
			this.docPnlBottom.Height = 350;
			}

			#endregion
			//显示检查控件
			private async void ShowCheckCtrl()
			{
			var checkResult = await GetCheckResult();
			ShowCheckCtrl(checkResult);
			}

			//检查
			private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowCheckCtrl(true);
			if (_hydroInfo == null)
			{
			return;
			}
			var checkResult = _hydroInfo.Check();
			ShowCheckCtrl(checkResult);
			}

			#endregion

			#region EPA计算结果
			#region 模型计算

			//EPA计算结果
			private Yw.EPAnet.CalcuResult _epaCalcuResult = null;
			#region 计算结果

			//获取EPA计算结果
			//CalcuMode 在 Yw.EPANet.Calcu.Core 中定义
			//NeedCalcuAgain 是否需要重新计算
			private Yw.EPAnet.CalcuResult GetEpaCalcuResult(string calcuMode, bool needCalcuAgain = false)
			//计算结果辅助类
			private SimulationCalcuResultHelper _calcuResultHelper = null;

			//获取计算结果辅助类
			private async Task<SimulationCalcuResultHelper> GetCalcuResultHelper()
			{
			if (_hydroInfo == null)
			if (_calcuResultHelper == null)
			{
			return default;
			_calcuResultHelper = new SimulationCalcuResultHelper();
			var calcuResult = await GetCalcuResult();
			_calcuResultHelper.InitialData(calcuResult);
			}
			if (needCalcuAgain)
			{
			var network = _hydroInfo.ToNetwork();
			_epaCalcuResult = network.Calcu(calcuMode);
			}
			if (_epaCalcuResult == null)
			{
			var network = _hydroInfo.ToNetwork();
			_epaCalcuResult = network.Calcu(calcuMode);
			}
			return _epaCalcuResult;
			return _calcuResultHelper;
			}

			#endregion
			@@ -2315,8 +1754,27 @@
			return _calcuFailedCtrl;
			}

			//计算失败控件是否可见
			private bool IsCalcuFailedCtrlVisible
			{
			get
			{
			if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
			{
			if (this.controlContainerBottom.Controls.Count > 0)
			{
			if (this.controlContainerBottom.Controls[0] is HydroCalcuFailedCtrl)
			{
			return true;
			}
			}
			}
			return false;
			}
			}

			//显示计算失败控件
			private void ShowCalcuFailedCtrl(Yw.EPAnet.CalcuResult calcuResult)
			private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
			{
			if (_hydroInfo == null)
			{
			@@ -2331,66 +1789,164 @@
			return;
			}
			var calcuFailedCtrl = GetCalcuFailedCtrl();
			if (!IsCalcuFailedCtrlVisible)
			{
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "计算失败原因";
			this.docPnlBottom.Height = 350;
			}
			calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "计算失败原因";
			this.docPnlBottom.Height = 350;
			}

			//显示计算失败控件
			private void ShowCalcuFailedCtrl()
			#endregion

			#region 计算警告

			//计算警告控件
			private HydroCalcuWarningCtrl _calcuWarningCtrl = null;

			//获取计算警告控件
			private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
			{
			ShowCalcuFailedCtrl(_epaCalcuResult);
			if (_calcuWarningCtrl == null)
			{
			_calcuWarningCtrl = new HydroCalcuWarningCtrl();
			_calcuWarningCtrl.Dock = DockStyle.Fill;
			_calcuWarningCtrl.HydroClickEvent += (code) =>
			{
			var visualListHelper = GetVisualListHelper();
			var visual = visualListHelper.GetVisual(code);
			SelectVisual(visual, eVisualSource.Warning);
			};
			}
			return _calcuWarningCtrl;
			}

			//计算警告控件是否可见
			private bool IsCalcuWarningCtrlVisible
			{
			get
			{
			if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
			{
			if (this.controlContainerBottom.Controls.Count > 0)
			{
			if (this.controlContainerBottom.Controls[0] is HydroCalcuWarningCtrl)
			{
			return true;
			}
			}
			}
			return false;
			}
			}

			//显示计算警告控件
			private void ShowCalcuWarningCtrl(HydroCalcuResult calcuResult)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (calcuResult == null)
			{
			return;
			}
			if (!calcuResult.Succeed)
			{
			return;
			}
			var calcuWaringCtrl = GetCalcuWarningCtrl();
			if (!IsCalcuWarningCtrlVisible)
			{
			this.controlContainerBottom.Controls.Clear();
			this.controlContainerBottom.Controls.Add(calcuWaringCtrl);
			this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlBottom.Text = "计算警告";
			this.docPnlBottom.Height = 350;
			}
			var visualListHelper = GetVisualListHelper();
			var allVisualDict = visualListHelper.GetVisualDict();
			calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
			}

			#endregion

			#region 计算标签

			//计算标签辅助类
			private SimulationCalcuResultLabelHelper _calcuResultLabelHelper = null;

			//获取计算标签辅助类
			private async Task<SimulationCalcuResultLabelHelper> GetCalcuResultLabelHelper()
			{
			if (_calcuResultLabelHelper == null)
			{
			var visualListHelper = GetVisualListHelper();
			var calcuResultHelper = await GetCalcuResultHelper();
			var bimfaceCtrl = await GetBimfaceCtrl();
			_calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
			}
			return _calcuResultLabelHelper;
			}

			//设置计算标签是否显示
			private async void barCkCalcu_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
			calcuResultLabelHelper.Visible = this.barCkCalcu.Checked;
			calcuResultLabelHelper.Set();
			}

			#endregion

			#endregion

			#region 管网修复

			//修复管网
			private void Repair()
			private async void Repair()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var checkResult = GetCheckResult(true);
			if (checkResult == null)
			{
			return;
			}
			var checkResult = _hydroInfo.Check();
			if (!checkResult.Succeed)
			{
			ShowCheckCtrl(false);
			TipFormHelper.ShowWarn("检查失败导致无法进行试算，停止修复！");
			ShowCheckCtrl(checkResult);
			TipFormHelper.ShowWarn("检查失败导致无法进行试算，停止管网修复！");
			return;
			}
			var calcuResult = GetEpaCalcuResult(Yw.EPAnet.CalcuMode.Simple, true);
			if (calcuResult == null \|\| !calcuResult.Succeed)
			var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
			if (!calcuResult.Succeed)
			{
			ShowCalcuFailedCtrl(calcuResult);
			TipFormHelper.ShowWarn("试算失败，停止修复！");
			TipFormHelper.ShowWarn("试算失败，停止管网修复！");
			return;
			}

			var allLinks = _hydroInfo.GetAllLinks();
			if (allLinks != null && allLinks.Count < 1)
			var visualListHelper = GetVisualListHelper();
			var allLinkList = visualListHelper.GetLinkList();
			if (allLinkList != null && allLinkList.Count < 1)
			{
			TipFormHelper.ShowError("模型中未包含管段信息，停止修复！");
			TipFormHelper.ShowError("模型中未包含管段信息，停止管网修复！");
			return;
			}
			int count = 0;
			foreach (var link in allLinks)
			foreach (var link in allLinkList)
			{
			var calcuLink = calcuResult.LinkList?.Find(x => x.Id == link.Code);
			var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
			if (calcuLink == null)
			{
			continue;
			}
			if (calcuLink.Flow < 0)
			if (!calcuLink.CalcuFlow.HasValue)
			{
			continue;
			}
			if (calcuLink.CalcuFlow.Value < 0)
			{
			var tempCode = link.StartCode;
			link.StartCode = link.EndCode;
			@@ -2398,9 +1954,10 @@
			count++;
			}
			}
			UpdateVisualViewModelProperty();
			var visualVmListHelper = await GetVisualVmListHelper();
			visualVmListHelper.UpdateProperty();
			UpdateVisualListCtrl();
			UpdateSelectedProperty();
			UpdatePropertyCtrl();
			TipFormHelper.ShowSucceed($"修复完成，共修复管段({count})个！");
			}

			@@ -2412,7 +1969,7 @@

			#endregion

			#region 导出INP文件
			#region 导出INP

			//导出INP文件
			private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			@@ -2434,7 +1991,7 @@

			#endregion

			#region 并联分析
			#region 并联计算

			//并联分析
			private void ParallelAnalysis()
			@@ -2499,8 +2056,8 @@
			}
			});
			var codes = list?.Select(x => x.Code).ToList();
			UpdateVisualViewModelProperty(codes);
			ShowSelectedProperty();
			//UpdateVisualViewModelProperty(codes);
			//ShowSelectedProperty();
			UpdateVisualListCtrl();
			return true;
			};
			@@ -2517,269 +2074,452 @@

			#region 工况计算

			//所有工况元组列表
			private Tuple<HydroWorkingVmo, HydroCheckResult, HydroCalcuResult> _allWorkingTupleList = null;
			//工况元组辅助类
			private SimulationWorkingTupleHelper _workingTupleHelper = null;







			#region 工况


			//显示工况计算窗体
			private void ShowWorkingCalcuDlg()
			//获取工况元组辅助类
			private SimulationWorkingTupleHelper GetWorkingTupleHelper()
			{
			if (_workingTupleHelper == null)
			{
			var visualListHelper = GetVisualListHelper();
			_workingTupleHelper = new SimulationWorkingTupleHelper(visualListHelper);
			}
			return _workingTupleHelper;
			}

			//设置工况窗体
			private async void CalcuWorking()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			var workingTupleHelper = GetWorkingTupleHelper();
			var allWorkingList = await workingTupleHelper.GetWorkingList();
			var monitorValueHelper = GetMonitorValueHelper();
			var allMonitorValueList = await monitorValueHelper.Get();
			var dlg = new SetHydroWorkingDlg();
			dlg.HydroViewEvent += async (parter) =>
			dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
			dlg.HydroViewEvent += (visual) =>
			{
			_selectedVisual = parter as Yw.Model.HydroVisualInfo;
			if (_selectedVisual != null)
			{
			await _bimfaceCtrl?.ZoomAndSelectComponents(new List<string>() { _selectedVisual.Code });
			}
			ShowSelectedProperty();
			SelectVisual(visual, eVisualSource.Calcu);
			};
			dlg.HydroCalcuEvent += async (hydroInfo, workingInfo) =>
			dlg.HydroCalcuEvent += async (working) =>
			{
			if (_hydroInfo == null)
			var vmo = new HydroWorkingVmo();
			vmo.ModelID = _hydroInfo.ID;
			vmo.Name = working.Name;
			vmo.WorkingInfo = JsonHelper.Object2Json(working.WorkingInfo);
			vmo.MonitorInfo = JsonHelper.Object2Json(working.MonitorInfo);
			vmo.SortCode = allWorkingList.Count < 1 ? 1 : allWorkingList.Max(x => x.SortCode) + 1;
			vmo.Description = working.Description;
			vmo.ID = await BLLFactory<Yw.BLL.HydroWorking>.Instance.Insert(vmo);
			if (vmo.ID < 1)
			{
			TipFormHelper.ShowError("创建工况失败，计算取消！");
			return;
			}
			_hydroInfo.UpdateWorkingInfo(workingInfo);

			_hydroInfo.UpdateWorkingInfo(working.WorkingInfo);

			//校验
			_checkResult = _hydroInfo.Check();
			if (!_checkResult.Succeed)
			var checkResult = _hydroInfo.Check();
			if (!checkResult.Succeed)
			{
			ShowCheckCtrl();
			TipFormHelper.ShowWarn("校验失败，请检查后重试");
			return;
			}

			WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");


			//await Task.Delay(5000);

			var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
			_epaCalcuResult = netWork.CalcuMinorLoss();

			WaitFormHelper.HideWaitForm();
			if (_epaCalcuResult.Succeed)
			{
			GetCalcuResultList(false);
			UpdateVisualViewModelProperty();
			UpdateVisualViewModelCalcuProperty();
			UpdateVisualListCtrl();
			UpdateSelectedProperty();
			await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_epaCalcuResult);
			TipFormHelper.ShowSucceed("计算成功！");
			var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
			await _bimfaceCtrl?.ZoomAndSelectComponents(codes);
			ShowCheckCtrl(checkResult);
			workingTupleHelper.AppendTuple(vmo, checkResult, null);
			SetUIWorking(vmo);
			TipFormHelper.ShowError("校验失败，请检查后重试");
			}
			else
			{
			ShowCalcuFailedCtrl();
			TipFormHelper.ShowError("计算失败！");
			WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");
			//await Task.Delay(3000);
			var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
			WaitFormHelper.HideWaitForm();
			workingTupleHelper.AppendTuple(vmo, checkResult, calcuResult);
			if (calcuResult.Succeed)
			{
			if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
			{
			ShowCalcuWarningCtrl(calcuResult);
			}
			TipFormHelper.ShowSucceed("计算成功！");
			}
			else
			{
			ShowCalcuFailedCtrl(calcuResult);
			TipFormHelper.ShowError("计算失败！");
			}
			}
			ApplyGradingResultList(false);
			UpdateVisualListCtrl();
			ShowSelectedProperty();
			AppendUIWorking(vmo);
			SetUIWorking(vmo);
			};
			dlg.SetBindingData(_hydroInfo);

			dlg.ShowDialog();
			}

			//工况计算
			private void barBtnWorkingCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			CalcuWorking();
			}

			#endregion

			#region 工况分析

			#region 当前工况

			//当前工况
			private Yw.Vmo.HydroWorkingVmo _working = null;

			//获取检查结果
			private async Task<HydroCheckResult> GetCheckResult()
			{
			var workingTupleHelper = GetWorkingTupleHelper();
			return await workingTupleHelper.GetCheckResult(_working);
			}

			//获取计算结果
			private async Task<HydroCalcuResult> GetCalcuResult()
			{
			var workingTupleHelper = GetWorkingTupleHelper();
			return await workingTupleHelper.GetCalcuResult(_working);
			}

			//初始化UI工况列表
			private void InitialUIWorkingList(List<HydroWorkingVmo> allWorkingList)
			{
			this.repositoryItemImageComboBox1.Items.BeginUpdate();
			this.repositoryItemImageComboBox1.Items.Clear();
			if (allWorkingList != null && allWorkingList.Count > 0)
			{
			allWorkingList.ForEach(x => this.repositoryItemImageComboBox1.Items.Add(x.Name, x, -1));
			}
			this.repositoryItemImageComboBox1.Items.EndUpdate();
			}

			//增加UI工况
			private void AppendUIWorking(HydroWorkingVmo working)
			{
			this.repositoryItemImageComboBox1.Items.BeginUpdate();
			this.repositoryItemImageComboBox1.Items.Add(working.Name, working, -1);
			this.repositoryItemImageComboBox1.Items.EndUpdate();
			}

			//设置UI工况
			private void SetUIWorking(HydroWorkingVmo working)
			{
			this.barEditCurrentWorking.EditValue = working;
			}

			//当前工况发生改变
			private async void barEditCurrentWorking_EditValueChanged(object sender, EventArgs e)
			{
			_working = this.barEditCurrentWorking.EditValue as HydroWorkingVmo;
			var calcuResult = await GetCalcuResult();

			//计算结果辅助类
			var calcuResultHelper = await GetCalcuResultHelper();
			calcuResultHelper.InitialData(calcuResult);

			//工况控件
			UpdateWorkingCtrl();
			SelectWorkingCtrl(_working);

			//可见视图列表
			var visualVmListHelper = await GetVisualVmListHelper();
			visualVmListHelper.UpdateCalcuProperty(calcuResult);

			//计算标签
			var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
			calcuResultLabelHelper.Set();

			}

			#endregion

			#region 工况控件

			//工况控件
			private HydroWorkingTreeCtrl _workingCtrl = null;

			//获取工况控件
			private HydroWorkingTreeCtrl GetWorkingCtrl()
			{
			if (_workingCtrl == null)
			{
			_workingCtrl = new HydroWorkingTreeCtrl();
			_workingCtrl.Dock = DockStyle.Fill;
			_workingCtrl.HydroClickEvent += (working) =>
			{
			SetUIWorking(working);
			};
			}
			return _workingCtrl;
			}

			//工况控件是否可见
			private bool IsWorkingCtrlVisible
			{
			get
			{
			if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
			{
			if (this.controlContainerRight.Controls.Count > 0)
			{
			if (this.controlContainerRight.Controls[0] is HydroWorkingTreeCtrl)
			{
			return true;
			}
			}
			}
			return false;
			}
			}

			//显示工况控件
			private async void ShowWorkingCtrl()
			{
			var workingCtrl = GetWorkingCtrl();
			if (!IsWorkingCtrlVisible)
			{
			this.controlContainerRight.Controls.Clear();
			this.controlContainerRight.Controls.Add(workingCtrl);
			this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlRight.Text = "工况";
			this.docPnlRight.Width = 300;
			}
			var workingTupleHelper = GetWorkingTupleHelper();
			var allWorkingList = await workingTupleHelper.GetWorkingList();
			workingCtrl.SetBindingData(allWorkingList);
			}

			//更新工况控件
			private async void UpdateWorkingCtrl()
			{
			if (!IsWorkingCtrlVisible)
			{
			return;
			}
			var workingTupleHelper = GetWorkingTupleHelper();
			var allWorkingList = await workingTupleHelper.GetWorkingList();
			var workingCtrl = GetWorkingCtrl();
			workingCtrl.SetBindingData(allWorkingList);
			}

			//选择工况控件
			private void SelectWorkingCtrl(HydroWorkingVmo working)
			{
			if (IsWorkingCtrlVisible)
			{
			var workingCtrl = GetWorkingCtrl();
			workingCtrl.Select(working);
			}
			}

			//工况列表点击
			private void barBtnWorkingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowWorkingCtrl();
			}

			#endregion

			#region 工况评估

			//评估
			private async void Evaluate()
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (_working == null)
			{
			TipFormHelper.ShowWarn("尚未计算，请计算后重试！");
			return;
			}
			var workingTupleHelper = GetWorkingTupleHelper();
			var checkResult = await workingTupleHelper.GetCheckResult(_working);
			if (checkResult == null)
			{
			return;
			}
			if (!checkResult.Succeed)
			{
			ShowCheckCtrl(checkResult);
			TipFormHelper.ShowWarn("检查失败，停止评估！");
			return;
			}
			var calcuResult = await workingTupleHelper.GetCalcuResult(_working);
			if (calcuResult == null)
			{
			return;
			}
			if (!calcuResult.Succeed)
			{
			ShowCalcuFailedCtrl(calcuResult);
			TipFormHelper.ShowWarn("计算失败，停止评估！");
			return;
			}
			if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
			{
			ShowCalcuWarningCtrl(calcuResult);
			TipFormHelper.ShowWarn("请关注警告信息！");
			}
			var visualListHelper = GetVisualListHelper();
			var allVisualDict = visualListHelper.GetVisualDict();
			var monitorHelper = GetMonitorHelper();
			var allMonitorList = await monitorHelper.Get();
			var allWorkingMonitorList = JsonHelper.Json2Object<List<HydroWorkingMonitorViewModel>>(_working.MonitorInfo);
			var allCalcuResultDict = calcuResult.GetVisualDict();
			var dlg = new HydroWorkingEvaluationDlg();
			dlg.SetBindingData(allVisualDict, allMonitorList, allWorkingMonitorList, allCalcuResultDict);
			dlg.ShowDialog();
			}

			//精度评估
			private void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			Evaluate();
			}

			#endregion

			#region 工况并联

			//并联分析
			private async void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			if (_hydroInfo == null)
			{
			return;
			}
			if (_hydroInfo.Pumps == null \|\| _hydroInfo.Pumps.Count < 1)
			{
			return;
			}

			var calcuResultHelper = await GetCalcuResultHelper();
			var vmList = new List<XhsSinglePumpViewModel>();
			foreach (var pump in _hydroInfo.Pumps)
			{
			if (!pump.RatedN.HasValue)
			{
			continue;
			}
			var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
			var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
			var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
			if (qh == null)
			{
			continue;
			}

			var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
			var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
			var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();

			var vm = new XhsSinglePumpViewModel();
			vmList.Add(vm);
			vm.ID = pump.ID;
			vm.Name = pump.Name;
			vm.Code = pump.Code;
			vm.IsBp = true;
			vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
			vm.RatedHz = pump.RatedHz;
			vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
			vm.RatedSpeed = pump.RatedN.Value;
			vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
			vm.CurveQH = qhPtList;
			vm.CurveQE = qePtList;
			vm.CurveQP = qpPtList;

			var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
			if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
			{
			//var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
			//if (calcuResult != null)
			//{
			// if (calcuResult.CalcuFlow.HasValue)
			// {
			// vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
			// }

			// var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
			// var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
			// if (calcuResultStart != null && calcuResultEnd != null)
			// {
			// if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
			// {
			// vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
			// }
			// }
			//}
			}

			}

			var dlg = new PumpParallelAnalyDlg();
			dlg.SetBindingData(vmList);
			dlg.ReloadDataEvent += (list) =>
			{
			list?.ForEach(x =>
			{
			var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
			if (pump != null)
			{
			pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
			pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
			}
			});
			//ShowSelectedProperty();
			return true;
			};
			dlg.ShowDialog();
			}

			#endregion

			#region 工况能效


			#region 计算结果

			//所有计算结果列表
			private List<HydroCalcuVisualResult> _allCalcuResultList = null;

			//获取计算结果
			//true 使用缓存，false 不使用缓存
			private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
			private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			if (_hydroInfo == null)
			{
			return default;
			}
			if (_epaCalcuResult == null)
			{
			return default;
			}
			if (!_epaCalcuResult.Succeed)
			{
			return default;
			}
			if (isCache)
			{
			return _allCalcuResultList;
			}

			_allCalcuResultList = new List<HydroCalcuVisualResult>();

			//节点
			var allNodeList = _hydroInfo.GetAllNodes();
			if (allNodeList != null && allNodeList.Count > 0)
			{
			foreach (var node in allNodeList)
			{
			var calcuNode = _epaCalcuResult.NodeList?.Find(x => x.Id == node.Code);
			if (calcuNode != null)
			{
			var calcuResult = new HydroCalcuNodeResult()
			{
			Code = node.Code,
			CalcuPress = calcuNode.Press,
			CalcuHead = calcuNode.Head,
			CalcuDemand = calcuNode.Demand
			};
			_allCalcuResultList.Add(calcuResult);
			}
			}
			}

			//管段
			var allLinkList = _hydroInfo.GetAllLinks();
			if (allLinkList != null && allLinkList.Count > 0)
			{
			foreach (var link in allLinkList)
			{
			var calcuLink = _epaCalcuResult.LinkList?.Find(x => x.Id == link.Code);
			if (calcuLink != null)
			{
			var calcuResult = new HydroCalcuLinkResult()
			{
			Code = link.Code,
			CalcuFlow = calcuLink.Flow,
			CalcuVelocity = calcuLink.Velocity,
			CalcuHeadLoss = calcuLink.Headloss
			};
			_allCalcuResultList.Add(calcuResult);
			}
			}
			}

			//流量计
			var allFlowmeterList = _hydroInfo.Flowmeters;
			if (allFlowmeterList != null && allFlowmeterList.Count > 0)
			{
			foreach (var flowmeter in allFlowmeterList)
			{
			var calcuFlowmeterResult = _allCalcuResultList.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
			if (calcuFlowmeterResult != null)
			{
			var calcuFlowmeterNewResult = new HydroCalcuFlowmeterResult(calcuFlowmeterResult);
			var calcuFlowmeterLinkResultList = new List<HydroCalcuLinkResult>();
			var flowmeterLinkList = allLinkList?.Where(x => x.StartCode == flowmeter.Code \|\| x.EndCode == flowmeter.Code).ToList();
			if (flowmeterLinkList != null && flowmeterLinkList.Count > 0)
			{
			foreach (var flowmeterLink in flowmeterLinkList)
			{
			var calcuFlowmeterLinkResult = _allCalcuResultList.Find(x => x.Code == flowmeterLink.Code) as HydroCalcuLinkResult;
			if (calcuFlowmeterLinkResult != null)
			{
			calcuFlowmeterLinkResultList.Add(calcuFlowmeterLinkResult);
			}
			}
			}
			if (calcuFlowmeterLinkResultList.Exists(x => x.CalcuFlow.HasValue))
			{
			calcuFlowmeterNewResult.CalcuQ = calcuFlowmeterLinkResultList.Where(x => x.CalcuFlow.HasValue).Average(x => x.CalcuFlow.Value);
			}
			_allCalcuResultList.Remove(calcuFlowmeterResult);
			_allCalcuResultList.Add(calcuFlowmeterNewResult);
			}
			}
			}

			//压力表
			var allPressmeterList = _hydroInfo.Pressmeters;
			if (allPressmeterList != null && allPressmeterList.Count > 0)
			{
			foreach (var pressmeter in allPressmeterList)
			{
			var calcuPressmeterResult = _allCalcuResultList.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
			if (calcuPressmeterResult != null)
			{
			var calcuPressmeterNewResult = new HydroCalcuPressmeterResult(calcuPressmeterResult);
			calcuPressmeterNewResult.CalcuPr = calcuPressmeterResult.CalcuPress;
			_allCalcuResultList.Remove(calcuPressmeterResult);
			_allCalcuResultList.Add(calcuPressmeterNewResult);
			}
			}
			}

			//水泵
			var allPumpList = _hydroInfo.Pumps;
			if (allPumpList != null && allPumpList.Count > 0)
			{
			foreach (var pump in allPumpList)
			{
			var calcuPumpResult = _allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
			if (calcuPumpResult != null)
			{
			var calcuPumpNewResult = new HydroCalcuPumpResult(calcuPumpResult);
			calcuPumpNewResult.CalcuQ = calcuPumpResult.CalcuFlow;
			if (calcuPumpNewResult.CalcuQ.HasValue)
			{
			var calcuNodeStartResult = _allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
			var calcuNodeEndResult = _allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
			if (calcuNodeStartResult != null && calcuNodeEndResult != null)
			{
			if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
			{
			calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
			}
			if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
			{
			var curveqp = _hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
			if (curveqp != null)
			{
			if (curveqp.CurveData != null && curveqp.CurveData.Count > 3)
			{
			var point2dList = curveqp.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
			var point2dSimularList = point2dList.GetQPPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
			var pumpCurveQp = new Yw.Pump.CurveQP(eFeatType.Cubic, point2dSimularList);
			calcuPumpNewResult.CalcuP = pumpCurveQp.FeatCurve.GetPointY(calcuPumpNewResult.CalcuQ.Value);
			}
			}
			}
			if (calcuPumpNewResult.CalcuH.HasValue && calcuPumpNewResult.CalcuP.HasValue)
			{
			calcuPumpNewResult.CalcuE = Yw.Pump.CalculationHelper.CalcuE(calcuPumpNewResult.CalcuQ.Value, calcuPumpNewResult.CalcuH.Value, calcuPumpNewResult.CalcuP.Value);
			}
			}
			}
			_allCalcuResultList.Remove(calcuPumpResult);
			_allCalcuResultList.Add(calcuPumpNewResult);
			}
			}
			}

			return _allCalcuResultList;
			XtraMessageBox.Show("正在开发中，敬请期待！");
			}

			#endregion

			//水力计算
			private void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			#region 损失曲线

			private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			ShowWorkingCalcuDlg();
			XtraMessageBox.Show("正在开发中，敬请期待！");
			}

			#endregion

			#region 损失比例

			private void barBtnWorkingLossScale_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			XtraMessageBox.Show("正在开发中，敬请期待！");
			}

			#endregion

			#region 综合分析
			private void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			XtraMessageBox.Show("正在开发中，敬请期待！");
			}

			#endregion

			#endregion