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/03-junction/00-core/HydroJunctionPropertyViewModel.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroJunctionPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/00-core/HydroJunctionPropertyViewModel.cs
similarity index 78%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroJunctionPropertyViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/00-core/HydroJunctionPropertyViewModel.cs
index 1314f3e..0f10dec 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroJunctionPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/00-core/HydroJunctionPropertyViewModel.cs
@@ -10,7 +10,7 @@
/// <summary>
///
/// </summary>
- public HydroJunctionPropertyViewModel() { }
+ public HydroJunctionPropertyViewModel() : base() { }
/// <summary>
///
@@ -19,6 +19,8 @@
{
this.Elev = rhs.Elev;
this.UpdatePropStatus(nameof(this.Elev), rhs, nameof(rhs.Elev));
+ this.MinorLoss = rhs.MinorLoss;
+ this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(rhs.MinorLoss));
this.Demand = rhs.Demand;
this.UpdatePropStatus(nameof(this.Demand), rhs, nameof(rhs.Demand));
this.DemandPattern = rhs.DemandPattern;
@@ -32,8 +34,18 @@
[Category("鏁版嵁")]
[DisplayName("鏍囬珮")]
[PropertyOrder(101)]
+ [DisplayUnit("m")]
[Browsable(true)]
public double Elev { get; set; }
+
+ /// <summary>
+ /// 鎹熷け绯绘暟
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("鎹熷け绯绘暟")]
+ [PropertyOrder(33)]
+ [Browsable(true)]
+ public double? MinorLoss { get; set; }
/// <summary>
/// 闇�姘撮噺
@@ -41,6 +53,7 @@
[Category("鏁版嵁")]
[DisplayName("闇�姘撮噺")]
[PropertyOrder(102)]
+ [DisplayUnit("m鲁/h")]
[Browsable(true)]
public double? Demand { get; set; }
@@ -57,8 +70,6 @@
/// <summary>
/// 鏇存柊灞炴��
/// </summary>
- /// <param name="rhs"></param>
- /// <param name="allParterList"></param>
public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
{
base.UpdateProperty(rhs, allParterList);
@@ -66,6 +77,8 @@
{
this.Elev = hydroJunctionInfo.Elev;
this.UpdatePropStatus(nameof(this.Elev), hydroJunctionInfo, nameof(hydroJunctionInfo.Elev));
+ this.MinorLoss = hydroJunctionInfo.MinorLoss;
+ this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(hydroJunctionInfo.MinorLoss));
this.Demand = hydroJunctionInfo.Demand;
this.UpdatePropStatus(nameof(this.Demand), hydroJunctionInfo, nameof(hydroJunctionInfo.Demand));
this.DemandPattern = hydroJunctionInfo.DemandPattern;
--
Gitblit v1.9.3