From 0711485ecb4fe66fbe820478d92eb9f04b77c042 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 24 十月 2024 13:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
index 366c22f..1443ed1 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/03-link/02-pump/HydroPumpViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public class HydroPumpViewModel : HydroLinkViewModel
+ public class HydroPumpViewModel : HydroLinkViewModel, IHydroCalcuPumpResult
{
/// <summary>
///
@@ -35,7 +35,7 @@
/// <summary>
///
/// </summary>
- public HydroPumpViewModel(Yw.Model.HydroPumpInfo rhs, Yw.WinFrmUI.HydroCalcuLinkResult calcuResult) : base(rhs, calcuResult)
+ public HydroPumpViewModel(Yw.Model.HydroPumpInfo rhs, Yw.WinFrmUI.HydroCalcuPumpResult calcuResult) : base(rhs, calcuResult)
{
this.RatedP = rhs.RatedP;
this.RatedQ = rhs.RatedQ;
@@ -52,6 +52,14 @@
this.PricePattern = rhs.PricePattern;
this.Vmo = rhs;
+
+ if (calcuResult != null)
+ {
+ this.CalcuQ = calcuResult.CalcuQ.HasValue ? Math.Round(calcuResult.CalcuQ.Value, 1) : null;
+ this.CalcuH = calcuResult.CalcuH.HasValue ? Math.Round(calcuResult.CalcuH.Value, 2) : null;
+ this.CalcuP = calcuResult.CalcuP.HasValue ? Math.Round(calcuResult.CalcuP.Value, 1) : null;
+ this.CalcuE = calcuResult.CalcuE.HasValue ? Math.Round(calcuResult.CalcuE.Value, 1) : null;
+ }
}
/// <summary>
@@ -159,6 +167,48 @@
[DisplayName("浠锋牸妯″紡")]
public string PricePattern { get; set; }
+ /// <summary>
+ /// 璁＄畻娴侀噺 锛坢鲁/h锛�
+ /// </summary>
+ [DisplayName("璁＄畻娴侀噺(m鲁/h)")]
+ public override double? CalcuFlow { get; set; }
+
+ /// <summary>
+ /// 璁＄畻娴侀�燂紙m/s锛�
+ /// </summary>
+ [DisplayName("璁＄畻娴侀��(m/s)")]
+ public override double? CalcuVelocity { get; set; }
+
+ /// <summary>
+ /// 璁＄畻姘村ご鎹熷け锛坢锛�
+ /// </summary>
+ [DisplayName("璁＄畻姘村ご鎹熷け(m)")]
+ public override double? CalcuHeadLoss { get; set; }
+
+ /// <summary>
+ /// 璁＄畻娴侀噺 锛坢鲁/h锛�
+ /// </summary>
+ [DisplayName("璁＄畻娴侀噺(m鲁/h)")]
+ public double? CalcuQ { get; set; }
+
+ /// <summary>
+ /// 璁＄畻鎵▼ 锛坢锛�
+ /// </summary>
+ [DisplayName("璁＄畻鎵▼(m)")]
+ public double? CalcuH { get; set; }
+
+ /// <summary>
+ /// 璁＄畻鍔熺巼 锛坘W锛�
+ /// </summary>
+ [DisplayName("璁＄畻鍔熺巼(kW)")]
+ public double? CalcuP { get; set; }
+
+ /// <summary>
+ /// 璁＄畻鏁堢巼 锛�%锛�
+ /// </summary>
+ [DisplayName("璁＄畻鏁堢巼(%)")]
+ public double? CalcuE { get; set; }
+
/// <summary>
///
--
Gitblit v1.9.3