HStation/XHS.V1.0.git

			@@ -268,11 +268,37 @@
			public double? CalcuQ { get; set; }

			/// <summary>
			/// 进口压力
			/// </summary>
			[Category("计算结果")]
			[DisplayName("进口压力")]
			[Display(Name = "进口压力(m)")]
			[PropertyOrder(11002)]
			[Browsable(true)]
			[DisplayUnit("m")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			public virtual double? CalcuPr1 { get; set; }

			/// <summary>
			/// 出口压力
			/// </summary>
			[Category("计算结果")]
			[DisplayName("出口压力")]
			[Display(Name = "出口压力(m)")]
			[PropertyOrder(11003)]
			[Browsable(true)]
			[DisplayUnit("m")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			public virtual double? CalcuPr2 { get; set; }

			/// <summary>
			/// 扬程
			/// </summary>
			[Category("计算结果")]
			[DisplayName("扬程")]
			[PropertyOrder(11002)]
			[PropertyOrder(11004)]
			[DisplayUnit("m")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			@@ -284,7 +310,7 @@
			/// </summary>
			[Category("计算结果")]
			[DisplayName("功率")]
			[PropertyOrder(11003)]
			[PropertyOrder(11005)]
			[DisplayUnit("kW")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			@@ -296,7 +322,7 @@
			/// </summary>
			[Category("计算结果")]
			[DisplayName("效率")]
			[PropertyOrder(11004)]
			[PropertyOrder(11006)]
			[DisplayUnit("%")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			@@ -376,6 +402,8 @@
			if (rhs is HydroCalcuPumpResult calcuPumpProperty)
			{
			this.CalcuQ = calcuPumpProperty.CalcuQ.HasValue ? Math.Round(calcuPumpProperty.CalcuQ.Value, 1) : null;
			this.CalcuPr1 = calcuPumpProperty.CalcuPr1.HasValue ? Math.Round(calcuPumpProperty.CalcuPr1.Value, 2) : null;
			this.CalcuPr2 = calcuPumpProperty.CalcuPr2.HasValue ? Math.Round(calcuPumpProperty.CalcuPr2.Value, 2) : null;
			this.CalcuH = calcuPumpProperty.CalcuH.HasValue ? Math.Round(calcuPumpProperty.CalcuH.Value, 2) : null;
			this.CalcuP = calcuPumpProperty.CalcuP.HasValue ? Math.Round(calcuPumpProperty.CalcuP.Value, 1) : null;
			this.CalcuE = calcuPumpProperty.CalcuE.HasValue ? Math.Round(calcuPumpProperty.CalcuE.Value, 1) : null;