HStation/XHS.V1.0.git

			@@ -3,7 +3,7 @@
			/// <summary>
			/// 阀门视图
			/// </summary>
			public class HydroValveViewModel : HydroLinkViewModel
			public class HydroValveViewModel : HydroLinkViewModel, IHydroCalcuValveResult
			{
			/// <summary>
			///
			@@ -173,6 +173,45 @@
			public override double? CalcuFrictionLoss { get; set; }

			/// <summary>
			/// 流量
			/// </summary>
			[Category("计算结果")]
			[DisplayName("流量")]
			[Display(Name = "流量(m³/h)")]
			[PropertyOrder(11001)]
			[Browsable(true)]
			[DisplayUnit("m³/h")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			public virtual 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>
			[Browsable(false)]
			@@ -229,6 +268,20 @@
			this.Vmo.UpdatePropStatus(nameof(this.Vmo.ValveSetting), this, nameof(this.ValveSetting));
			}

			/// <summary>
			/// 更新计算属性
			/// </summary>
			public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
			{
			base.UpdateCalcuProperty(rhs);
			if (rhs is HydroCalcuValveResult calcuValveProperty)
			{
			this.CalcuQ = calcuValveProperty.CalcuQ.HasValue ? Math.Round(calcuValveProperty.CalcuQ.Value, 1) : null;
			this.CalcuPr1 = calcuValveProperty.CalcuPr1.HasValue ? Math.Round(calcuValveProperty.CalcuPr1.Value, 2) : null;
			this.CalcuPr2 = calcuValveProperty.CalcuPr2.HasValue ? Math.Round(calcuValveProperty.CalcuPr2.Value, 2) : null;
			}
			}

			//更新阀门设置
			//使用vmo更新自身属性时，再度更新阀门设置的其他属性
			private void UpdateValveSetting()