From 5c4bc78d4b5e50391e25d672654589c381be21e6 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期日, 15 九月 2024 11:53:47 +0800
Subject: [PATCH] 水力组件升级
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs | 120 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 36 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
index 49a95dd..e61bf8a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
@@ -17,13 +17,17 @@
/// </summary>
public HydroPumpPropertyViewModel(Yw.Model.HydroPumpInfo rhs) : base(rhs)
{
- this.RatedPower = rhs.RatedPower;
+ this.RatedP = rhs.RatedP;
+ this.RatedQ = rhs.RatedQ;
+ this.RatedH = rhs.RatedH;
+ this.RatedN = rhs.RatedN;
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.CurveQE = rhs.CurveQE;
}
@@ -43,53 +47,55 @@
[DisplayName("棰濆畾鍔熺巼")]
[PropertyOrder(101)]
[Browsable(true)]
- public double RatedPower { get; set; }
+ public double RatedP { get; set; }
+
+ /// <summary>
+ /// 棰濆畾娴侀噺
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("棰濆畾娴侀噺")]
+ [PropertyOrder(102)]
+ [Browsable(true)]
+ public double? RatedQ { get; set; }
+
+ /// <summary>
+ /// 棰濆畾鎵▼
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("棰濆畾鎵▼")]
+ [PropertyOrder(103)]
+ [Browsable(true)]
+ public double? RatedH { get; set; }
+
+ /// <summary>
+ /// 棰濆畾杞��
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("棰濆畾杞��")]
+ [PropertyOrder(104)]
+ [Browsable(true)]
+ public double? RatedN { get; set; }
+
/// <summary>
/// 娴侀噺鎵▼鏇茬嚎
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺鎵▼鏇茬嚎")]
- [PropertyOrder(102)]
+ [PropertyOrder(105)]
[IsHydroCurvePro(HydroCurve.PumpQH)]
[Browsable(true)]
public string CurveQH { get; set; }
/// <summary>
- /// 杞�熸瘮
+ /// 娴侀噺鍔熺巼鏇茬嚎
/// </summary>
[Category("鏁版嵁")]
- [DisplayName("杞�熸瘮")]
- [PropertyOrder(103)]
- [Browsable(true)]
- public double? SpeedRatio { get; set; }
-
- /// <summary>
- /// 杞�熸瘮妯″紡
- /// </summary>
- [Category("鏁版嵁")]
- [DisplayName("杞�熸瘮妯″紡")]
- [PropertyOrder(104)]
- [Browsable(true)]
- public string SpeedRatioPattern { get; set; }
-
- /// <summary>
- /// 鑳借�椾环鏍�
- /// </summary>
- [Category("鏁版嵁")]
- [DisplayName("鑳借�椾环鏍�")]
- [PropertyOrder(105)]
- [Browsable(true)]
- public double? Price { get; set; }
-
- /// <summary>
- /// 浠锋牸妯″紡
- /// </summary>
- [Category("鏁版嵁")]
- [DisplayName("浠锋牸妯″紡")]
+ [DisplayName("娴侀噺鍔熺巼鏇茬嚎")]
[PropertyOrder(106)]
+ [IsHydroCurvePro(HydroCurve.PumpQP)]
[Browsable(true)]
- public string PricePattern { get; set; }
+ public string CurveQP { get; set; }
/// <summary>
/// 娴侀噺鏁堢巼鏇茬嚎
@@ -102,6 +108,44 @@
public string CurveQE { get; set; }
/// <summary>
+ /// 杞�熸瘮
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("杞�熸瘮")]
+ [PropertyOrder(108)]
+ [Browsable(true)]
+ public double? SpeedRatio { get; set; }
+
+ /// <summary>
+ /// 杞�熸瘮妯″紡
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("杞�熸瘮妯″紡")]
+ [PropertyOrder(109)]
+ [Browsable(true)]
+ public string SpeedRatioPattern { get; set; }
+
+ /// <summary>
+ /// 鑳借�椾环鏍�
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("鑳借�椾环鏍�")]
+ [PropertyOrder(110)]
+ [Browsable(true)]
+ public double? Price { get; set; }
+
+ /// <summary>
+ /// 浠锋牸妯″紡
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("浠锋牸妯″紡")]
+ [PropertyOrder(111)]
+ [Browsable(true)]
+ public string PricePattern { get; set; }
+
+
+
+ /// <summary>
/// 鏇存柊灞炴��
/// </summary>
/// <param name="rhs"></param>
@@ -111,13 +155,17 @@
base.UpdateProperty(rhs, allParterList);
if (rhs is Yw.Model.HydroPumpInfo hydroPumpInfo)
{
- this.RatedPower = hydroPumpInfo.RatedPower;
+ this.RatedP = hydroPumpInfo.RatedP;
+ this.RatedQ = hydroPumpInfo.RatedQ;
+ this.RatedH = hydroPumpInfo.RatedH;
+ this.RatedN = hydroPumpInfo.RatedN;
this.CurveQH = hydroPumpInfo.CurveQH;
+ this.CurveQP = hydroPumpInfo.CurveQP;
+ this.CurveQE = hydroPumpInfo.CurveQE;
this.SpeedRatio = hydroPumpInfo.SpeedRatio;
this.SpeedRatioPattern = hydroPumpInfo.SpeedRatioPattern;
this.Price = hydroPumpInfo.Price;
this.PricePattern = hydroPumpInfo.PricePattern;
- this.CurveQE = hydroPumpInfo.CurveQE;
}
}
--
Gitblit v1.9.3