From 083c4e47c7a59025f3348bd093693c6b3febb014 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 16 十月 2024 10:03:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Revit.Core/02-parter/03-link/02-pump/RevitPump.cs | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/02-parter/03-link/02-pump/RevitPump.cs b/Service/HStation.Service.Revit.Core/02-parter/03-link/02-pump/RevitPump.cs
index 769dea3..7d47989 100644
--- a/Service/HStation.Service.Revit.Core/02-parter/03-link/02-pump/RevitPump.cs
+++ b/Service/HStation.Service.Revit.Core/02-parter/03-link/02-pump/RevitPump.cs
@@ -8,26 +8,51 @@
/// <summary>
///
/// </summary>
- public RevitPump() { }
+ public RevitPump() : base() { }
/// <summary>
///
/// </summary>
public RevitPump(RevitPump rhs) : base(rhs)
{
- this.RatedPower = rhs.RatedPower;
+ this.RatedP = rhs.RatedP;
+ this.RatedQ = rhs.RatedQ;
+ this.RatedH = rhs.RatedH;
+ this.RatedN = rhs.RatedN;
+ this.RatedHz = rhs.RatedHz;
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;
}
/// <summary>
- /// 棰濆畾鍔熺巼
+ /// 棰濆畾鍔熺巼 (kW)
/// </summary>
- public double RatedPower { get; set; }
+ public double RatedP { get; set; }
+
+ /// <summary>
+ /// 棰濆畾娴侀噺锛坢鲁/h锛�
+ /// </summary>
+ public double? RatedQ { get; set; }
+
+ /// <summary>
+ /// 棰濆畾鎵▼锛坢锛�
+ /// </summary>
+ public double? RatedH { get; set; }
+
+ /// <summary>
+ /// 棰濆畾杞�燂紙r/min锛�
+ /// </summary>
+ public double? RatedN { get; set; }
+
+ /// <summary>
+ /// 棰濆畾棰戠巼
+ /// </summary>
+ public double RatedHz { get; set; }
/// <summary>
/// 娴侀噺鎵▼鏇茬嚎
@@ -35,9 +60,19 @@
public string CurveQH { get; set; }
/// <summary>
- /// 杞�熸瘮
+ /// 娴侀噺鍔熺巼鏇茬嚎
/// </summary>
- public double? SpeedRatio { get; set; }
+ public string CurveQP { get; set; }
+
+ /// <summary>
+ /// 娴侀噺鏁堢巼鏇茬嚎
+ /// </summary>
+ public string CurveQE { get; set; }
+
+ /// <summary>
+ /// 杞�熸瘮[0,1]
+ /// </summary>
+ public double SpeedRatio { get; set; }
/// <summary>
/// 杞�熸瘮妯″紡
@@ -54,10 +89,7 @@
/// </summary>
public string PricePattern { get; set; }
- /// <summary>
- /// 娴侀噺鏁堢巼鏇茬嚎
- /// </summary>
- public string CurveQE { get; set; }
+
--
Gitblit v1.9.3