From d107fd0519b4b84c31bc55bbd30cc0ba0af7507d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 07 二月 2025 10:41:13 +0800
Subject: [PATCH] 过渡件匹配Model修改，增加过渡件类型匹配字段
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs
index 671d6b5..fee2aa7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs
@@ -22,6 +22,7 @@
this.RatedHz = rhs.RatedHz;
this.InletDiameter = rhs.InletDiameter;
this.OutletDiameter = rhs.OutletDiameter;
+ this.Elev = Math.Round(rhs.Elev, 4);
this.CurveQH = rhs.CurveQH;
this.CurveQP = rhs.CurveQP;
this.CurveQE = rhs.CurveQE;
@@ -154,13 +155,24 @@
public double? OutletDiameter { get; set; }
/// <summary>
+ /// 鏍囬珮/楂樼▼
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("鏍囬珮")]
+ [DisplayUnit("m")]
+ [Display(Name = "鏍囬珮(m)")]
+ [PropertyOrder(2009)]
+ [Browsable(true)]
+ public virtual double Elev { get; set; }
+
+ /// <summary>
/// 璁惧畾棰戠巼
/// </summary>
[Category("鏁版嵁")]
[Display(Name = "璁惧畾棰戠巼")]
[DisplayName("璁惧畾棰戠巼")]
[DisplayUnit("hz")]
- [PropertyOrder(2009)]
+ [PropertyOrder(2010)]
[Browsable(true)]
public double CurrentHz
{
@@ -181,7 +193,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鎬ц兘鏇茬嚎")]
- [PropertyOrder(2009)]
+ [PropertyOrder(2011)]
[HydroCurvePro(HydroCurve.Pump)]
[Browsable(true)]
public string Curve
@@ -201,7 +213,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鎵▼鏇茬嚎")]
- [PropertyOrder(2010)]
+ [PropertyOrder(2012)]
[HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQH)]
[Browsable(true)]
public string CurveQH { get; set; }
@@ -211,7 +223,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鍔熺巼鏇茬嚎")]
- [PropertyOrder(2011)]
+ [PropertyOrder(2013)]
[HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQP)]
[Browsable(true)]
public string CurveQP { get; set; }
@@ -221,7 +233,7 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鏁堢巼鏇茬嚎")]
- [PropertyOrder(2012)]
+ [PropertyOrder(2014)]
[HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQE)]
[Browsable(true)]
public string CurveQE { get; set; }
--
Gitblit v1.9.3