From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
index 6cd0249..ce6f0a2 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs
@@ -268,11 +268,37 @@
public double? CalcuQ { get; set; }
/// <summary>
+ /// 杩涘彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("杩涘彛鍘嬪姏")]
+ [Display(Name = "杩涘彛鍘嬪姏(m)")]
+ [PropertyOrder(11002)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuPr1 { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("鍑哄彛鍘嬪姏")]
+ [Display(Name = "鍑哄彛鍘嬪姏(m)")]
+ [PropertyOrder(11003)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuPr2 { get; set; }
+
+ /// <summary>
/// 鎵▼
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鎵▼")]
- [PropertyOrder(11002)]
+ [PropertyOrder(11004)]
[DisplayUnit("m")]
[HydroCalcuPro]
[ShowEditor(false)]
@@ -284,7 +310,7 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鍔熺巼")]
- [PropertyOrder(11003)]
+ [PropertyOrder(11005)]
[DisplayUnit("kW")]
[HydroCalcuPro]
[ShowEditor(false)]
@@ -296,7 +322,7 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("鏁堢巼")]
- [PropertyOrder(11004)]
+ [PropertyOrder(11006)]
[DisplayUnit("%")]
[HydroCalcuPro]
[ShowEditor(false)]
@@ -376,6 +402,8 @@
if (rhs is HydroCalcuPumpResult calcuPumpProperty)
{
this.CalcuQ = calcuPumpProperty.CalcuQ.HasValue ? Math.Round(calcuPumpProperty.CalcuQ.Value, 1) : null;
+ this.CalcuPr1 = calcuPumpProperty.CalcuPr1.HasValue ? Math.Round(calcuPumpProperty.CalcuPr1.Value, 2) : null;
+ this.CalcuPr2 = calcuPumpProperty.CalcuPr2.HasValue ? Math.Round(calcuPumpProperty.CalcuPr2.Value, 2) : null;
this.CalcuH = calcuPumpProperty.CalcuH.HasValue ? Math.Round(calcuPumpProperty.CalcuH.Value, 2) : null;
this.CalcuP = calcuPumpProperty.CalcuP.HasValue ? Math.Round(calcuPumpProperty.CalcuP.Value, 1) : null;
this.CalcuE = calcuPumpProperty.CalcuE.HasValue ? Math.Round(calcuPumpProperty.CalcuE.Value, 1) : null;
--
Gitblit v1.9.3