HStation/XHS.V1.0.git

			@@ -1,4 +1,5 @@
			using Castle.Core.Logging;
			using DevExpress.CodeParser;
			using DevExpress.Diagram.Core.Native;
			using DevExpress.Mvvm.Native;
			using DevExpress.Utils.MVVM;
			@@ -236,13 +237,13 @@
			}
			if (_bimfaceCtrl == null)
			{
			var overlay = this.ShowOverlay();
			_bimfaceCtrl = new SimulationBimfaceCtrl();
			_bimfaceCtrl.Dock = DockStyle.Fill;
			WaitFormHelper.ShowWaitForm(this.FindForm(), "正在加载模型，请稍后...");
			await _bimfaceCtrl.InitialData(_project, _projectSite);
			_bimfaceCtrl.LoadCompletedEvent += () =>
			{//view加载完成事件
			overlay.Close();
			WaitFormHelper.HideWaitForm();
			this.barCkDecorator.Checked = false;
			this.barCkGrading.Checked = true;
			};
			@@ -320,6 +321,7 @@
			_propertyCtrl = new SimulationPropertyCtrl();
			_propertyCtrl.Dock = DockStyle.Fill;
			_propertyCtrl.AllowEdit = true;
			_propertyCtrl.CalcuResult = () => GetCalcuResult();
			_propertyCtrl.HydroViewEvent += (visual) =>
			{
			SelectVisual(visual, eSimulationVisualSource.Property);
			@@ -809,6 +811,7 @@
			#region 一键显隐

			private List<string> _allDecoratorCodes = null;

			//获取装饰件code列表
			private async Task<List<string>> GetDecoratorCodes()
			{
			@@ -1751,7 +1754,7 @@
			return await helper.GetAnalyseList();
			}

			#endregion
			#endregion 监测点

			#region 监测值

			@@ -1804,7 +1807,7 @@
			}
			}

			#endregion
			#endregion 监测值

			#region 传感器测点

			@@ -1847,7 +1850,7 @@
			SetMonitorDockingList(_visual);
			}

			#endregion
			#endregion 传感器测点

			#region 传感器测值

			@@ -1912,7 +1915,7 @@
			ShowMonitorDockingValueListCtrl();
			}

			#endregion
			#endregion 传感器测值

			#region 分析测点

			@@ -1928,7 +1931,7 @@
			return;
			}
			var monitorHelper = GetMonitorHelper();
			var allMonitorList = await monitorHelper.GetAll();
			var allMonitorList = await monitorHelper.GetAnalyseList();
			var dlg = new SetHydroMonitorAnalyseListDlg();
			dlg.ReloadDataEvent += async (list) =>
			{
			@@ -1951,7 +1954,7 @@
			SetMonitorAnalyseList(_visual);
			}

			#endregion
			#endregion 分析测点

			#region 测点标记

			@@ -1978,7 +1981,7 @@
			monitorMarkerHelper.Set();
			}

			#endregion
			#endregion 测点标记

			#region 模型检查

			@@ -2247,7 +2250,7 @@

			#endregion 计算标签

			#endregion
			#endregion 模型计算

			#region 导出INP

			@@ -2495,7 +2498,7 @@
			{
			return;
			}
			var reportHelper = new SimulationWorkingReportHelper();
			var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
			reportHelper.Create(fileName, vm);
			TipFormHelper.ShowInfo("导出成功！");
			};
			@@ -2568,7 +2571,7 @@
			AddWorking();
			}

			#endregion
			#endregion 当前工况

			#region 选择工况

			@@ -2690,7 +2693,7 @@
			this.docPnlBottom.Text = "监测分析";
			this.docPnlBottom.Height = 350;
			}
			var allMontorList = await GetMonitorList();
			var allMontorList = await GetMonitorAnalyseList();
			if (allWorkingList == null \|\| allWorkingList.Count < 1)
			{
			monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, GetCalcuResult());
			@@ -2707,7 +2710,7 @@
			ShowMonitorAnalyListCtrl();
			}

			#endregion
			#endregion 监测分析

			#region 工况分析

			@@ -2810,8 +2813,6 @@
			}
			}



			//损失统计
			private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			@@ -2884,7 +2885,7 @@
			}
			}

			#endregion
			#endregion 工况分析

			#region 损失曲线

			@@ -2984,7 +2985,7 @@
			}
			}

			#endregion
			#endregion 损失曲线

			#region 方案管理

			@@ -3060,11 +3061,5 @@
			}

			#endregion 方案管理






			}
			}