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/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs
index 5812713..af1ac1e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
- public class HydroPressmeterViewModel : HydroJunctionViewModel
+ public class HydroPressmeterViewModel : HydroJunctionViewModel, IHydroCalcuPressmeterResult
{
/// <summary>
///
@@ -15,17 +15,35 @@
/// </summary>
public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs) : base(rhs)
{
+ this.CurrentPress = rhs.CurrentPress.HasValue ? Math.Round(rhs.CurrentPress.Value, 2) : null;
this.Vmo = rhs;
}
/// <summary>
///
/// </summary>
- public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs, HydroCalcuNodeResult calcuResult) : base(rhs, calcuResult)
+ public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs, HydroCalcuPressmeterResult calcuResult) : base(rhs, calcuResult)
{
+ this.CurrentPress = rhs.CurrentPress.HasValue ? Math.Round(rhs.CurrentPress.Value, 2) : null;
+ if (calcuResult != null)
+ {
+ this.CalcuPr = calcuResult.CalcuPr.HasValue ? Math.Round(calcuResult.CalcuPr.Value, 2) : null;
+ }
+
this.Vmo = rhs;
}
+ /// <summary>
+ /// 鍘嬪姏
+ /// </summary>
+ [DisplayName("鍘嬪姏(m)")]
+ public double? CurrentPress { get; set; }
+
+ /// <summary>
+ /// 璁＄畻鍘嬪姏
+ /// </summary>
+ [DisplayName("璁＄畻鍘嬪姏(m)")]
+ public double? CalcuPr { get; set; }
/// <summary>
///
--
Gitblit v1.9.3