HStation/XHS.V1.0.git

			@@ -144,7 +144,7 @@
			{
			Catalog = Yw.Hydro.ParterCatalog.Pressmeter,
			CatalogName = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pressmeter),
			PropName = HydroVisualCalcuProp.CalcuQ
			PropName = HydroVisualCalcuProp.CalcuPr
			});
			}
			//管道
			@@ -218,7 +218,7 @@
			Yw.Model.HydroModelInfo hydroInfo,
			List<HydroGradingVmo> allGradingList,
			List<HydroGradingApplyViewModel> allApplyList,
			List<HydroCalcuVisualResult> allCalcuResultList
			Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict
			)
			{
			if (hydroInfo == null)
			@@ -233,7 +233,7 @@
			var list = new List<HydroGradingResultViewModel>();
			allVisualList.ForEach(x =>
			{
			var result = GetResult(x, allGradingList, allApplyList, allCalcuResultList);
			var result = GetResult(x, allGradingList, allApplyList, allCalcuResultVisualDict);
			if (result != null)
			{
			list.Add(result);
			@@ -250,7 +250,7 @@
			Yw.Model.HydroVisualInfo visual,
			List<HydroGradingVmo> allGradingList,
			List<HydroGradingApplyViewModel> allApplyList,
			List<HydroCalcuVisualResult> allCalcuResultList
			Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict
			)
			{
			if (visual == null)
			@@ -312,7 +312,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuFlow.HasValue)
			@@ -338,7 +338,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuVelocity.HasValue)
			@@ -364,7 +364,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pump.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pump.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuHeadLoss.HasValue)
			@@ -421,7 +421,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuFlow.HasValue)
			@@ -447,7 +447,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuVelocity.HasValue)
			@@ -473,7 +473,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == valve.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(valve.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuHeadLoss.HasValue)
			@@ -511,7 +511,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuFlow.HasValue)
			@@ -537,7 +537,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuVelocity.HasValue)
			@@ -563,7 +563,7 @@
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroVisualCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			if (gradingList != null && gradingList.Count > 0)
			{
			var calcuResult = allCalcuResultList?.Find(t => t.Code == pipe.Code);
			var calcuResult = allCalcuResultVisualDict?.GetValue(pipe.Code);
			if (calcuResult is HydroCalcuLinkResult calcuLinkResult)
			{
			if (calcuLinkResult.CalcuHeadLoss.HasValue)