From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/20-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
similarity index 76%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/20-pump/HydroPumpViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
index 35db70a..c534278 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/20-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
@@ -19,14 +19,16 @@
this.RatedQ = rhs.RatedQ;
this.RatedH = rhs.RatedH;
this.RatedN = rhs.RatedN;
+ this.RatedHz = rhs.RatedHz;
+ this.SpeedRatio = rhs.SpeedRatio;
+ this.SpeedRatioPattern = rhs.SpeedRatioPattern;
this.CurveQH = rhs.CurveQH;
this.CurveQP = rhs.CurveQP;
this.CurveQE = rhs.CurveQE;
- this.SpeedRatio = rhs.SpeedRatio;
- this.SpeedRatioPattern = rhs.SpeedRatioPattern;
this.Price = rhs.Price;
this.PricePattern = rhs.PricePattern;
+ this.Curve = string.IsNullOrEmpty(rhs.CurveQH) ? "鏈缃�" : "宸茶缃�";
this.Vmo = rhs;
}
@@ -39,14 +41,16 @@
this.RatedQ = rhs.RatedQ;
this.RatedH = rhs.RatedH;
this.RatedN = rhs.RatedN;
+ this.RatedHz = rhs.RatedHz;
+ this.SpeedRatio = rhs.SpeedRatio;
+ this.SpeedRatioPattern = rhs.SpeedRatioPattern;
this.CurveQH = rhs.CurveQH;
this.CurveQP = rhs.CurveQP;
this.CurveQE = rhs.CurveQE;
- this.SpeedRatio = rhs.SpeedRatio;
- this.SpeedRatioPattern = rhs.SpeedRatioPattern;
this.Price = rhs.Price;
this.PricePattern = rhs.PricePattern;
+ this.Curve = string.IsNullOrEmpty(rhs.CurveQH) ? "鏈缃�" : "宸茶缃�";
this.Vmo = rhs;
}
@@ -75,6 +79,47 @@
public double? RatedN { get; set; }
/// <summary>
+ /// 棰濆畾棰戠巼(hz)
+ /// </summary>
+ [DisplayName("棰濆畾棰戠巼(hz)")]
+ public double RatedHz { get; set; }
+
+ /// <summary>
+ /// 棰戠巼(hz)
+ /// </summary>
+ [DisplayName("棰戠巼(hz)")]
+ public double CurrentHz
+ {
+ get { return this.SpeedRatio * this.RatedHz; }
+ set
+ {
+ if (this.RatedHz <= 0)
+ {
+ return;
+ }
+ this.SpeedRatio = value / this.RatedHz;
+ }
+ }
+
+ /// <summary>
+ /// 杞�熸瘮
+ /// </summary>
+ [DisplayName("杞�熸瘮")]
+ public double SpeedRatio { get; set; }
+
+ /// <summary>
+ /// 杞�熸瘮妯″紡
+ /// </summary>
+ [DisplayName("杞�熸瘮妯″紡")]
+ public string SpeedRatioPattern { get; set; }
+
+ /// <summary>
+ /// 鎬ц兘鏇茬嚎
+ /// </summary>
+ [DisplayName("鎬ц兘鏇茬嚎")]
+ public string Curve { get; set; }
+
+ /// <summary>
/// 娴侀噺鎵▼鏇茬嚎
/// </summary>
[DisplayName("娴侀噺鎵▼鏇茬嚎")]
@@ -91,18 +136,6 @@
/// </summary>
[DisplayName("娴侀噺鏁堢巼鏇茬嚎")]
public string CurveQE { get; set; }
-
- /// <summary>
- /// 杞�熸瘮
- /// </summary>
- [DisplayName("杞�熸瘮")]
- public double? SpeedRatio { get; set; }
-
- /// <summary>
- /// 杞�熸瘮妯″紡
- /// </summary>
- [DisplayName("杞�熸瘮妯″紡")]
- public string SpeedRatioPattern { get; set; }
/// <summary>
/// 鑳借�椾环鏍�
--
Gitblit v1.9.3