HStation/XHS.V1.0.git

			@@ -3,7 +3,7 @@
			/// <summary>
			///
			/// </summary>
			public class HydroPumpViewModel : HydroLinkViewModel
			public class HydroPumpViewModel : HydroLinkViewModel, IHydroCalcuPumpResult
			{
			/// <summary>
			///
			@@ -35,7 +35,7 @@
			/// <summary>
			///
			/// </summary>
			public HydroPumpViewModel(Yw.Model.HydroPumpInfo rhs, Yw.WinFrmUI.HydroCalcuLinkResult calcuResult) : base(rhs, calcuResult)
			public HydroPumpViewModel(Yw.Model.HydroPumpInfo rhs, Yw.WinFrmUI.HydroCalcuPumpResult calcuResult) : base(rhs, calcuResult)
			{
			this.RatedP = rhs.RatedP;
			this.RatedQ = rhs.RatedQ;
			@@ -52,6 +52,14 @@
			this.PricePattern = rhs.PricePattern;

			this.Vmo = rhs;

			if (calcuResult != null)
			{
			this.CalcuQ = calcuResult.CalcuQ.HasValue ? Math.Round(calcuResult.CalcuQ.Value, 1) : null;
			this.CalcuH = calcuResult.CalcuH.HasValue ? Math.Round(calcuResult.CalcuH.Value, 2) : null;
			this.CalcuP = calcuResult.CalcuP.HasValue ? Math.Round(calcuResult.CalcuP.Value, 1) : null;
			this.CalcuE = calcuResult.CalcuE.HasValue ? Math.Round(calcuResult.CalcuE.Value, 1) : null;
			}
			}

			/// <summary>
			@@ -159,6 +167,48 @@
			[DisplayName("价格模式")]
			public string PricePattern { get; set; }

			/// <summary>
			/// 计算流量（m³/h）
			/// </summary>
			[DisplayName("计算流量(m³/h)")]
			public override double? CalcuFlow { get; set; }

			/// <summary>
			/// 计算流速（m/s）
			/// </summary>
			[DisplayName("计算流速(m/s)")]
			public override double? CalcuVelocity { get; set; }

			/// <summary>
			/// 计算水头损失（m）
			/// </summary>
			[DisplayName("计算水头损失(m)")]
			public override double? CalcuHeadLoss { get; set; }

			/// <summary>
			/// 计算流量（m³/h）
			/// </summary>
			[DisplayName("计算流量(m³/h)")]
			public double? CalcuQ { get; set; }

			/// <summary>
			/// 计算扬程（m）
			/// </summary>
			[DisplayName("计算扬程(m)")]
			public double? CalcuH { get; set; }

			/// <summary>
			/// 计算功率（kW）
			/// </summary>
			[DisplayName("计算功率(kW)")]
			public double? CalcuP { get; set; }

			/// <summary>
			/// 计算效率（%）
			/// </summary>
			[DisplayName("计算效率(%)")]
			public double? CalcuE { get; set; }


			/// <summary>
			///