From 7507591ef45cfa8f1080f6dbf68b411edcc7f086 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期日, 03 十一月 2024 15:42:56 +0800
Subject: [PATCH] 水力存储优化
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
index d661863..b28eed6 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs
@@ -5,29 +5,20 @@
/// <summary>
/// 鑺傜偣灞炴�ц鍥�
/// </summary>
- public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeProperty
+ public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeResult
{
/// <summary>
///
/// </summary>
- public HydroNodePropertyViewModel() { }
+ public HydroNodePropertyViewModel() : base() { }
/// <summary>
///
/// </summary>
public HydroNodePropertyViewModel(Yw.Model.HydroNodeInfo rhs) : base(rhs)
{
- this.Quality = rhs.Quality;
- }
- /// <summary>
- /// 鍒濆姘磋川
- /// </summary>
- [Category("鏁版嵁")]
- [DisplayName("鍒濆姘磋川")]
- [PropertyOrder(11)]
- [Browsable(true)]
- public double Quality { get; set; }
+ }
/// <summary>
/// 鑷敱鍘嬪姏
@@ -35,8 +26,11 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("鑷敱鍘嬪姏")]
[PropertyOrder(10001)]
+ [DisplayUnit("m")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
[Browsable(true)]
- public double? CalcuPress { get; set; }
+ public virtual double? CalcuPress { get; set; }
/// <summary>
/// 缁濆鍘嬪姏
@@ -44,8 +38,11 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("缁濆鍘嬪姏")]
[PropertyOrder(10002)]
+ [DisplayUnit("m")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
[Browsable(true)]
- public double? CalcuHead { get; set; }
+ public virtual double? CalcuHead { get; set; }
/// <summary>
/// 闇�姘撮噺
@@ -53,8 +50,11 @@
[Category("璁＄畻缁撴灉")]
[DisplayName("闇�姘撮噺")]
[PropertyOrder(10003)]
+ [DisplayUnit("m鲁/h")]
+ [IsHydroCalcuPro(true)]
+ [ShowEditor(false)]
[Browsable(true)]
- public double? CalcuDemand { get; set; }
+ public virtual double? CalcuDemand { get; set; }
/// <summary>
/// 鏇存柊灞炴��
@@ -66,7 +66,7 @@
base.UpdateProperty(rhs, allParterList);
if (rhs is Yw.Model.HydroNodeInfo hydroNodeInfo)
{
- this.Quality = hydroNodeInfo.Quality;
+
}
}
@@ -74,14 +74,14 @@
/// 鏇存柊璁＄畻灞炴��
/// </summary>
/// <param name="rhs"></param>
- public override void UpdateCalcuProperty(IHydroCalcuProperty rhs)
+ public override void UpdateCalcuProperty(IHydroCalcuResult rhs)
{
base.UpdateCalcuProperty(rhs);
- if (rhs is IHydroCalcuNodeProperty calcuNodeProperty)
+ if (rhs is IHydroCalcuNodeResult calcuNodeProperty)
{
- this.CalcuPress = calcuNodeProperty.CalcuPress;
- this.CalcuHead = calcuNodeProperty.CalcuHead;
- this.CalcuDemand = calcuNodeProperty.CalcuDemand;
+ this.CalcuPress = calcuNodeProperty.CalcuPress.HasValue ? Math.Round(calcuNodeProperty.CalcuPress.Value, 2) : null;
+ this.CalcuHead = calcuNodeProperty.CalcuHead.HasValue ? Math.Round(calcuNodeProperty.CalcuHead.Value, 2) : null;
+ this.CalcuDemand = calcuNodeProperty.CalcuDemand.HasValue ? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1) : null;
}
}
--
Gitblit v1.9.3