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/03-valve/HydroValveViewModel.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-valve/HydroValveViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-valve/HydroValveViewModel.cs
index b57ec6d..5f413de 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-valve/HydroValveViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-valve/HydroValveViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
/// 闃�闂ㄨ鍥�
/// </summary>
- public class HydroValveViewModel : HydroLinkViewModel
+ public class HydroValveViewModel : HydroLinkViewModel, IHydroCalcuValveResult
{
/// <summary>
///
@@ -173,6 +173,45 @@
public override double? CalcuFrictionLoss { get; set; }
/// <summary>
+ /// 娴侀噺
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娴侀噺")]
+ [Display(Name = "娴侀噺(m鲁/h)")]
+ [PropertyOrder(11001)]
+ [Browsable(true)]
+ [DisplayUnit("m鲁/h")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual 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>
[Browsable(false)]
@@ -229,6 +268,20 @@
this.Vmo.UpdatePropStatus(nameof(this.Vmo.ValveSetting), this, nameof(this.ValveSetting));
}
+ /// <summary>
+ /// 鏇存柊璁＄畻灞炴��
+ /// </summary>
+ public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
+ {
+ base.UpdateCalcuProperty(rhs);
+ if (rhs is HydroCalcuValveResult calcuValveProperty)
+ {
+ this.CalcuQ = calcuValveProperty.CalcuQ.HasValue ? Math.Round(calcuValveProperty.CalcuQ.Value, 1) : null;
+ this.CalcuPr1 = calcuValveProperty.CalcuPr1.HasValue ? Math.Round(calcuValveProperty.CalcuPr1.Value, 2) : null;
+ this.CalcuPr2 = calcuValveProperty.CalcuPr2.HasValue ? Math.Round(calcuValveProperty.CalcuPr2.Value, 2) : null;
+ }
+ }
+
//鏇存柊闃�闂ㄨ缃�
//浣跨敤vmo鏇存柊鑷韩灞炴�ф椂锛屽啀搴︽洿鏂伴榾闂ㄨ缃殑鍏朵粬灞炴��
private void UpdateValveSetting()
--
Gitblit v1.9.3