From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/00-core/HydroNodePropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
similarity index 87%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/00-core/HydroNodePropertyViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
index 57a0f03..883a6e1 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/00-core/HydroNodePropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
@@ -36,6 +36,7 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("鑷敱鍘嬪姏")]
[PropertyOrder(10001)]
+ [DisplayUnit("m")]
[Browsable(true)]
public double? CalcuPress { get; set; }
@@ -45,6 +46,7 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("缁濆鍘嬪姏")]
[PropertyOrder(10002)]
+ [DisplayUnit("m")]
[Browsable(true)]
public double? CalcuHead { get; set; }
@@ -54,6 +56,7 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("闇�姘撮噺")]
[PropertyOrder(10003)]
+ [DisplayUnit("m鲁/h")]
[Browsable(true)]
public double? CalcuDemand { get; set; }
@@ -81,9 +84,9 @@
base.UpdateCalcuProperty(rhs);
if (rhs is IHydroCalcuNodeResult calcuNodeProperty)
{
- this.CalcuPress = calcuNodeProperty.CalcuPress;
- this.CalcuHead = calcuNodeProperty.CalcuHead;
- this.CalcuDemand = calcuNodeProperty.CalcuDemand;
+ this.CalcuPress = calcuNodeProperty.CalcuPress ?? Math.Round(calcuNodeProperty.CalcuPress.Value, 2);
+ this.CalcuHead = calcuNodeProperty.CalcuHead ?? Math.Round(calcuNodeProperty.CalcuHead.Value, 2);
+ this.CalcuDemand = calcuNodeProperty.CalcuDemand ?? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1);
}
}
--
Gitblit v1.9.3