From 393c5a292f0d76545734928ffda9e8aed4223afc Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 28 十月 2024 13:26:33 +0800
Subject: [PATCH] 优化流量计、压力表小数位数
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs
index ac329c2..9d7aaa3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs
@@ -17,7 +17,7 @@
/// </summary>
public HydroFlowmeterPropertyViewModel(Yw.Model.HydroFlowmeterInfo rhs) : base(rhs)
{
- this.CurrentFlow = rhs.CurrentFlow;
+ this.CurrentFlow = rhs.CurrentFlow.HasValue ? Math.Round(rhs.CurrentFlow.Value, 1) : null;
this.UpdatePropStatus(nameof(this.CurrentFlow), rhs, nameof(rhs.CurrentFlow));
}
@@ -27,11 +27,48 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("娴侀噺")]
+ [DisplayUnit("m鲁/h")]
[PropertyOrder(1001)]
[Browsable(true)]
public double? CurrentFlow { get; set; }
/// <summary>
+ /// 鑷敱鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("鑷敱鍘嬪姏")]
+ [PropertyOrder(10001)]
+ [DisplayUnit("m")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuPress { get; set; }
+
+ /// <summary>
+ /// 缁濆鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("缁濆鍘嬪姏")]
+ [PropertyOrder(10002)]
+ [DisplayUnit("m")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuHead { get; set; }
+
+ /// <summary>
+ /// 闇�姘撮噺
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("闇�姘撮噺")]
+ [PropertyOrder(10003)]
+ [DisplayUnit("m鲁/h")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public override double? CalcuDemand { get; set; }
+
+ /// <summary>
/// 娴侀噺
/// </summary>
[Category("璁＄畻缁撴灉")]
--
Gitblit v1.9.3