From 21dd2ae9704c484d5d75b2ed980e5402505da7dc Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 05 十一月 2024 18:01:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
index 820fbc8..77675e2 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
@@ -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;
--
Gitblit v1.9.3