HStation/XHS.V1.0.git

			@@ -61,6 +61,22 @@

			var allCalcuLabels = new List<LogicCalcuCustomLabel>();

			#region 水池

			_calcuResultHelper.HydroInfo.GetAllTanks()?.ForEach(x =>
			{
			var calcuTankResult = allCalcuResultVisualDict.GetValue(x.Code) as HydroCalcuTankResult;
			var customLabel = new LogicCalcuCustomLabel();
			customLabel.Id = x.Code;
			customLabel.Distance = 50000;
			customLabel.Data = new List<LogicCalcuCustomLabelItem>()
			{
			new LogicCalcuCustomLabelItem(){ Name="水位",Value=Math.Round(calcuTankResult.CalcuL.Value,2).ToString(),Unit="m"},
			};
			allCalcuLabels.Add(customLabel);
			});

			#endregion

			#region 水泵

			@@ -87,6 +103,26 @@

			#endregion

			#region 阀门

			//_calcuResultHelper.HydroInfo.Valves?.ForEach(x =>
			//{
			// var calcuResult = allCalcuResultVisualDict.GetValue(x.Code) as HydroCalcuValveResult;
			// var customLabel = new LogicCalcuCustomLabel();
			// customLabel.Id = x.Code;
			// customLabel.Distance = 50000;
			// customLabel.Data = new List<LogicCalcuCustomLabelItem>()
			// {
			// new LogicCalcuCustomLabelItem(){ Name="流量",Value=Math.Round(calcuResult.CalcuQ.Value,1).ToString(),Unit="m³/h"},
			// new LogicCalcuCustomLabelItem(){ Name="进口压力",Value=Math.Round(calcuResult.CalcuPr1.Value,2).ToString(),Unit="m"},
			// new LogicCalcuCustomLabelItem(){ Name="出口压力",Value=Math.Round(calcuResult.CalcuPr2.Value,2).ToString(),Unit="m"},
			// new LogicCalcuCustomLabelItem(){ Name="阀门开度",Value=Math.Round(x.OpeningDegree,0).ToString(),Unit="°"}
			// };
			// allCalcuLabels.Add(customLabel);
			//});

			#endregion

			#region 扩散器

			_calcuResultHelper.HydroInfo.GetAllEmitters()?.ForEach(x =>
			@@ -105,6 +141,25 @@

			#endregion

			#region 水力阻件

			//_calcuResultHelper.HydroInfo.GetAllResistances()?.ForEach(x =>
			//{
			// var calcuResistanceResult = allCalcuResultVisualDict.GetValue(x.Code) as HydroCalcuResistanceResult;
			// var resistanceCustomLabel = new LogicCalcuCustomLabel();
			// resistanceCustomLabel.Id = x.Code;
			// resistanceCustomLabel.Distance = 50000;
			// resistanceCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
			// {
			// new LogicCalcuCustomLabelItem(){ Name="流量",Value=Math.Round(calcuResistanceResult.CalcuQ.Value,1).ToString(),Unit="m³/h"},
			// new LogicCalcuCustomLabelItem(){ Name="进口压力",Value=Math.Round(calcuResistanceResult.CalcuPr1.Value,2).ToString(),Unit="m"},
			// new LogicCalcuCustomLabelItem(){ Name="出口压力",Value=Math.Round(calcuResistanceResult.CalcuPr2.Value,2).ToString(),Unit="m"}
			// };
			// allCalcuLabels.Add(resistanceCustomLabel);
			//});

			#endregion


			return allCalcuLabels;