HStation/XHS.V1.0.git

			@@ -20,13 +20,12 @@
			this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
			this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
			this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
			this.assetsMainChoicePage1.FormRowClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
			this.xhsProjectSimulationMatchingListCtrl1.FormRowClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
			}

			private HStation.Vmo.XhsProjectVmo _project = null;//项目
			private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//项目站
			private Yw.Model.HydroModelInfo _hydroInfo = null;//水力信息


			private Yw.Model.HydroParterInfo _parter = null;
			private Yw.EPAnet.CheckResult _checkResult = null;
			@@ -82,10 +81,6 @@
			{
			return _hydroInfo;
			}





			//水力计算
			private async void barBtnHydroCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			@@ -151,18 +146,6 @@
			TipFormHelper.ShowSucceed("导出成功");
			}













			//水力构件明细面板点击事件
			private async void hydroParterListCtrl1_HydroClickEvent(Yw.Model.HydroParterInfo parter)
			{
			@@ -219,12 +202,12 @@
			await this.xhsProjectSimulationBimfaceCtrl1.SetLinkComponentsColor(elementIds);
			}

			#endregion
			#endregion Bimface

			#region 自动匹配

			//自动匹配
			private void barBtnAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private void barBtnMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			if (_hydroInfo == null)
			{
			@@ -237,17 +220,14 @@
			this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;

			var input = AssetsMatchingParasHelper.Create(_hydroInfo);
			this.assetsMainChoicePage1.SetBindingData(input);
			this.assetsMainChoicePage1.RelaodEvent += (output) =>
			this.xhsProjectSimulationMatchingListCtrl1.SetBindingData(input);
			this.xhsProjectSimulationMatchingListCtrl1.RelaodEvent += (output) =>
			{

			AssetsMatchingParasHelper.Apply(_hydroInfo, output);
			return true;
			return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
			};
			this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
			this.docPnlMatchingList.Height = 350;
			}


			#endregion

			@@ -279,6 +259,7 @@
			var elementIds = new List<string>() { _parter.Code };
			await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
			ShowProperty();
			SetBimfaceLinkColor();
			}

			//未匹配列表查看模型
			@@ -289,7 +270,6 @@
			_parter = null;
			ShowProperty();
			}


			#endregion

			@@ -366,8 +346,6 @@

			#endregion



			#region 保存水力信息

			//保存
			@@ -386,7 +364,6 @@
			_hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
			TipFormHelper.ShowSucceed("保存成功！");
			}


			#endregion

			@@ -442,15 +419,17 @@
			}
			}

			#endregion 业务方法

			#region 配置


			//显示RadialMenu
			private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			this.rmSet.ShowPopup(MousePosition, true);
			}

			#endregion






			}