HStation/XHS.V1.0.git

			@@ -35,6 +35,8 @@
			this.UpdatePropStatus(nameof(this.CurveQP), rhs, nameof(rhs.CurveQP));
			this.CurveQE = rhs.CurveQE;
			this.UpdatePropStatus(nameof(this.CurveQE), rhs, nameof(rhs.CurveQE));

			this.Vmo = rhs;
			}

			/// <summary>
			@@ -42,7 +44,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("水泵状态")]
			[PropertyOrder(13)]
			[PropertyOrder(1003)]
			[Browsable(true)]
			[TypeConverter(typeof(HydroPumpStatusConverter))]
			public override string LinkStatus { get; set; }
			@@ -51,9 +53,10 @@
			/// 额定流量
			/// </summary>
			[Category("数据")]
			[Display(Name = "额定流量(m³/h)")]
			[DisplayName("额定流量")]
			[PropertyOrder(101)]
			[DisplayUnit("m³/h")]
			[PropertyOrder(2001)]
			[Browsable(true)]
			public double? RatedQ { get; set; }

			@@ -61,9 +64,10 @@
			/// 额定扬程
			/// </summary>
			[Category("数据")]
			[Display(Name = "额定扬程(m)")]
			[DisplayName("额定扬程")]
			[PropertyOrder(102)]
			[DisplayUnit("m")]
			[PropertyOrder(2002)]
			[Browsable(true)]
			public double? RatedH { get; set; }

			@@ -71,9 +75,10 @@
			/// 额定功率
			/// </summary>
			[Category("数据")]
			[Display(Name = "额定功率(kW)")]
			[DisplayName("额定功率")]
			[PropertyOrder(103)]
			[DisplayUnit("kW")]
			[PropertyOrder(2003)]
			[Browsable(true)]
			public double RatedP { get; set; }

			@@ -81,9 +86,10 @@
			/// 额定转速
			/// </summary>
			[Category("数据")]
			[Display(Name = "额定转速(r/min)")]
			[DisplayName("额定转速")]
			[PropertyOrder(104)]
			[DisplayUnit("r/min")]
			[PropertyOrder(2004)]
			[Browsable(true)]
			public double? RatedN { get; set; }

			@@ -91,9 +97,10 @@
			/// 额定频率
			/// </summary>
			[Category("数据")]
			[Display(Name = "额定频率")]
			[DisplayName("额定频率")]
			[PropertyOrder(105)]
			[DisplayUnit("hz")]
			[PropertyOrder(2005)]
			[Browsable(true)]
			public double RatedHz { get; set; }

			@@ -101,9 +108,10 @@
			/// 设定频率
			/// </summary>
			[Category("数据")]
			[Display(Name = "设定频率")]
			[DisplayName("设定频率")]
			[PropertyOrder(106)]
			[DisplayUnit("hz")]
			[PropertyOrder(2006)]
			[Browsable(true)]
			public double CurrentHz
			{
			@@ -123,7 +131,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("转速比")]
			[PropertyOrder(107)]
			[PropertyOrder(2007)]
			[Browsable(false)]
			public double SpeedRatio { get; set; }

			@@ -132,7 +140,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("转速比模式")]
			[PropertyOrder(108)]
			[PropertyOrder(2008)]
			[Browsable(false)]
			public string SpeedRatioPattern { get; set; }

			@@ -141,7 +149,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("性能曲线")]
			[PropertyOrder(110)]
			[PropertyOrder(2009)]
			[IsHydroCurvePro(HydroCurve.Pump)]
			[Browsable(true)]
			public string Curve
			@@ -161,7 +169,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("流量扬程曲线")]
			[PropertyOrder(111)]
			[PropertyOrder(2010)]
			[IsHydroCurvePro(HydroCurve.PumpQH)]
			[Browsable(false)]
			public string CurveQH { get; set; }
			@@ -171,7 +179,7 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("流量功率曲线")]
			[PropertyOrder(112)]
			[PropertyOrder(2011)]
			[IsHydroCurvePro(HydroCurve.PumpQP)]
			[Browsable(false)]
			public string CurveQP { get; set; }
			@@ -181,28 +189,10 @@
			/// </summary>
			[Category("数据")]
			[DisplayName("流量效率曲线")]
			[PropertyOrder(113)]
			[PropertyOrder(2012)]
			[IsHydroCurvePro(HydroCurve.PumpQE)]
			[Browsable(false)]
			public string CurveQE { get; set; }

			/// <summary>
			/// 能耗价格
			/// </summary>
			[Category("数据")]
			[DisplayName("能耗价格")]
			[PropertyOrder(114)]
			[Browsable(false)]
			public double? Price { get; set; }

			/// <summary>
			/// 价格模式
			/// </summary>
			[Category("数据")]
			[DisplayName("价格模式")]
			[PropertyOrder(115)]
			[Browsable(false)]
			public string PricePattern { get; set; }


			/// <summary>
			@@ -296,9 +286,9 @@
			[Browsable(false)]
			public new Yw.Model.HydroPumpInfo Vmo { get; set; }

			public override void Update()
			public override void UpdateProperty()
			{
			base.Update();
			base.UpdateProperty();
			this.RatedP = this.Vmo.RatedP;
			this.UpdatePropStatus(nameof(this.RatedP), this.Vmo, nameof(this.Vmo.RatedP));
			this.RatedQ = this.Vmo.RatedQ;