HStation/XHS.V1.0.git

			@@ -1156,11 +1156,11 @@
			#region 计算结果

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

			//获取计算结果
			//true 使用缓存，false 不使用缓存
			private List<HydroCalcuResult> GetCalcuResultList(bool isCache = true)
			private List<HydroCalcuVisualResult> GetCalcuResultList(bool isCache = true)
			{
			if (_hydroInfo == null)
			{
			@@ -1179,7 +1179,7 @@
			return _allCalcuResultList;
			}

			_allCalcuResultList = new List<HydroCalcuResult>();
			_allCalcuResultList = new List<HydroCalcuVisualResult>();

			//节点
			var allNodeList = _hydroInfo.GetAllNodes();
			@@ -2075,7 +2075,7 @@
			{
			Code = Yw.Hydro.ParterCatalog.Pipe,
			Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe),
			PropName = HydroCalcuProp.CalcuFlow
			PropName = HydroVisualCalcuProp.CalcuFlow
			});
			}
			}
			@@ -2142,9 +2142,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2167,9 +2167,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2192,9 +2192,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2249,9 +2249,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2274,9 +2274,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2299,9 +2299,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2338,9 +2338,9 @@
			{
			switch (x.PropName)
			{
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2363,9 +2363,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2388,9 +2388,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = allCatalogGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			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);
			@@ -2496,9 +2496,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2521,9 +2521,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2546,9 +2546,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2603,9 +2603,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2628,9 +2628,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2653,9 +2653,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2692,9 +2692,9 @@
			{
			switch (propName)
			{
			case HydroCalcuProp.CalcuFlow:
			case HydroVisualCalcuProp.CalcuFlow:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuFlow).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2717,9 +2717,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuVelocity:
			case HydroVisualCalcuProp.CalcuVelocity:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuVelocity).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);
			@@ -2742,9 +2742,9 @@
			}
			}
			break;
			case HydroCalcuProp.CalcuHeadLoss:
			case HydroVisualCalcuProp.CalcuHeadLoss:
			{
			var gradingList = currentGradingList.Where(x => x.PropName == HydroCalcuProp.CalcuHeadLoss).OrderBy(t => t.SortCode).ToList();
			var gradingList = currentGradingList.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);