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/03-node/01-source/00-core/HydroSourceViewModel.cs | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/00-core/HydroSourceViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/00-core/HydroSourceViewModel.cs index c489c79..703c171 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/00-core/HydroSourceViewModel.cs +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/00-core/HydroSourceViewModel.cs @@ -3,7 +3,7 @@ /// <summary> /// 姘存簮瑙嗗浘 /// </summary> - public class HydroSourceViewModel : HydroNodeViewModel + public class HydroSourceViewModel : HydroNodeViewModel, IHydroCalcuSourceResult { /// <summary> /// @@ -20,6 +20,19 @@ /// <summary> + /// 姘翠綅 + /// </summary> + [Category("璁$畻缁撴灉")] + [DisplayName("姘翠綅")] + [Display(Name = "姘翠綅(m)")] + [DisplayUnit("m")] + [HydroCalcuPro] + [PropertyOrder(11001)] + [ShowEditor(false)] + [Browsable(true)] + public virtual double? CalcuL { get; set; } + + /// <summary> /// /// </summary> [Browsable(false)] @@ -29,5 +42,17 @@ set { _vmo = value; } } + /// <summary> + /// 鏇存柊璁$畻灞炴�� + /// </summary> + public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs) + { + base.UpdateCalcuProperty(rhs); + if (rhs is HydroCalcuSourceResult calcuSourceResult) + { + this.CalcuL = calcuSourceResult.CalcuL.HasValue ? Math.Round(calcuSourceResult.CalcuL.Value, 2) : null; + } + } + } } -- Gitblit v1.9.3