HStation/XHS.V1.0.git

			@@ -5,12 +5,12 @@
			/// <summary>
			/// 节点属性视图
			/// </summary>
			public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeProperty
			public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeResult
			{
			/// <summary>
			///
			/// </summary>
			public HydroNodePropertyViewModel() { }
			public HydroNodePropertyViewModel() : base() { }

			/// <summary>
			///
			@@ -18,6 +18,7 @@
			public HydroNodePropertyViewModel(Yw.Model.HydroNodeInfo rhs) : base(rhs)
			{
			this.Quality = rhs.Quality;
			this.UpdatePropStatus(nameof(this.Quality), rhs, nameof(rhs.Quality));
			}

			/// <summary>
			@@ -35,6 +36,9 @@
			[Category("计算结果")]
			[DisplayName("自由压力")]
			[PropertyOrder(10001)]
			[DisplayUnit("m")]
			[IsHydroCalcuPro(true)]
			[ShowEditor(false)]
			[Browsable(true)]
			public double? CalcuPress { get; set; }

			@@ -44,6 +48,9 @@
			[Category("计算结果")]
			[DisplayName("绝对压力")]
			[PropertyOrder(10002)]
			[DisplayUnit("m")]
			[IsHydroCalcuPro(true)]
			[ShowEditor(false)]
			[Browsable(true)]
			public double? CalcuHead { get; set; }

			@@ -53,6 +60,9 @@
			[Category("计算结果")]
			[DisplayName("需水量")]
			[PropertyOrder(10003)]
			[DisplayUnit("m³/h")]
			[IsHydroCalcuPro(true)]
			[ShowEditor(false)]
			[Browsable(true)]
			public double? CalcuDemand { get; set; }

			@@ -67,6 +77,7 @@
			if (rhs is Yw.Model.HydroNodeInfo hydroNodeInfo)
			{
			this.Quality = hydroNodeInfo.Quality;
			this.UpdatePropStatus(nameof(this.Quality), rhs, nameof(hydroNodeInfo.Quality));
			}
			}

			@@ -74,14 +85,14 @@
			/// 更新计算属性
			/// </summary>
			/// <param name="rhs"></param>
			public override void UpdateCalcuProperty(IHydroCalcuProperty rhs)
			public override void UpdateCalcuProperty(IHydroCalcuResult rhs)
			{
			base.UpdateCalcuProperty(rhs);
			if (rhs is IHydroCalcuNodeProperty calcuNodeProperty)
			if (rhs is IHydroCalcuNodeResult calcuNodeProperty)
			{
			this.CalcuPress = calcuNodeProperty.CalcuPress;
			this.CalcuHead = calcuNodeProperty.CalcuHead;
			this.CalcuDemand = calcuNodeProperty.CalcuDemand;
			this.CalcuPress = calcuNodeProperty.CalcuPress.HasValue ? Math.Round(calcuNodeProperty.CalcuPress.Value, 2) : null;
			this.CalcuHead = calcuNodeProperty.CalcuHead.HasValue ? Math.Round(calcuNodeProperty.CalcuHead.Value, 2) : null;
			this.CalcuDemand = calcuNodeProperty.CalcuDemand.HasValue ? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1) : null;
			}
			}