HStation/XHS.V1.0.git

			@@ -21,8 +21,6 @@
			this.UpdatePropStatus(nameof(this.EndCode), rhs, nameof(rhs.EndCode));
			this.LinkStatus = HydroLinkStatusHelper.GetStatusName(rhs.LinkStatus);
			this.UpdatePropStatus(nameof(this.LinkStatus), rhs, nameof(rhs.LinkStatus));

			this.Vmo = rhs;
			}

			/// <summary>
			@@ -32,8 +30,8 @@
			[DisplayName("Y流向")]
			[HydroFlowDirectionPro]
			[PropertyOrder(102)]
			[Browsable(false)]
			[TypeConverter(typeof(HydroFlowDirectionConverter))]
			[Browsable(false)]
			public override string FlowDirectionY { get; set; }

			/// <summary>
			@@ -64,7 +62,7 @@
			[Category("数据")]
			[DisplayName("管段状态")]
			[PropertyOrder(1003)]
			[Browsable(true)]
			[Browsable(false)]
			public virtual string LinkStatus { get; set; }

			/// <summary>
			@@ -72,46 +70,75 @@
			/// </summary>
			[Category("计算结果")]
			[DisplayName("流量")]
			[DisplayUnit("m³/h")]
			[Display(Name = "流量(m³/h)")]
			[PropertyOrder(10001)]
			[Browsable(true)]
			[DisplayUnit("m³/h")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(false)]
			public virtual double? CalcuFlow { get; set; }

			/// <summary>
			/// 流速
			/// </summary>
			[Category("计算结果")]
			[DisplayName("流速")]
			[Display(Name = "流速(m/s)")]
			[PropertyOrder(10002)]
			[Browsable(true)]
			[DisplayUnit("m/s")]
			[HydroCalcuPro]
			[ShowEditor(false)]
			public virtual double? CalcuVelocity { get; set; }

			/// <summary>
			/// 水头损失
			/// </summary>
			[Category("计算结果")]
			[DisplayName("水头损失")]
			[Display(Name = "水头损失(m)")]
			[PropertyOrder(10003)]
			[Browsable(true)]
			[DisplayUnit("m")]
			[Display(Name = "水头损失(m)")]
			[PropertyOrder(10002)]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(false)]
			public virtual double? CalcuHeadLoss { get; set; }

			/// <summary>
			/// 流速
			/// </summary>
			[Category("计算结果")]
			[DisplayName("流速")]
			[DisplayUnit("m/s")]
			[Display(Name = "流速(m/s)")]
			[PropertyOrder(19007)]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(false)]
			public virtual double? CalcuVelocity { get; set; }

			/// <summary>
			/// Vmo
			/// 局部损失
			/// </summary>
			[Category("计算结果")]
			[DisplayName("局部损失")]
			[DisplayUnit("m")]
			[Display(Name = "局部损失(m)")]
			[PropertyOrder(19008)]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(false)]
			public virtual double? CalcuMinorLoss { get; set; }

			/// <summary>
			/// 沿程损失
			/// </summary>
			[Category("计算结果")]
			[DisplayName("沿程损失")]
			[DisplayUnit("m")]
			[Display(Name = "沿程损失(m)")]
			[PropertyOrder(19009)]
			[HydroCalcuPro]
			[ShowEditor(false)]
			[Browsable(false)]
			public virtual double? CalcuFrictionLoss { get; set; }

			/// <summary>
			///
			/// </summary>
			[Browsable(false)]
			public new Yw.Model.HydroLinkInfo Vmo { get; set; }
			public new Yw.Model.HydroLinkInfo Vmo
			{
			get { return _vmo as Yw.Model.HydroLinkInfo; }
			set { _vmo = value; }
			}

			/// <summary>
			///
			@@ -144,7 +171,6 @@
			/// <summary>
			/// 更新计算属性
			/// </summary>
			/// <param name="rhs"></param>
			public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
			{
			base.UpdateCalcuProperty(rhs);
			@@ -153,6 +179,8 @@
			this.CalcuFlow = calcuLinkProperty.CalcuFlow.HasValue ? Math.Round(calcuLinkProperty.CalcuFlow.Value, 1) : null;
			this.CalcuVelocity = calcuLinkProperty.CalcuVelocity.HasValue ? Math.Round(calcuLinkProperty.CalcuVelocity.Value, 2) : null;
			this.CalcuHeadLoss = calcuLinkProperty.CalcuHeadLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuHeadLoss.Value, 2) : null;
			this.CalcuMinorLoss = calcuLinkProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuMinorLoss.Value, 4) : null;
			this.CalcuFrictionLoss = calcuLinkProperty.CalcuFrictionLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuFrictionLoss.Value, 4) : null;
			}
			}