From e411302bca8857e102443a5250c82b9580ef07a3 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:48 +0800
Subject: [PATCH] 修改成套设备增加逻辑
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/01-reservoir/HydroReservoirViewModel.cs | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/01-reservoir/HydroReservoirViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/01-reservoir/HydroReservoirViewModel.cs
index 64b75e8..709a3f0 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/01-reservoir/HydroReservoirViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/01-reservoir/HydroReservoirViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
/// 姘村簱瑙嗗浘
/// </summary>
- public class HydroReservoirViewModel : HydroSourceViewModel
+ public class HydroReservoirViewModel : HydroSourceViewModel, IHydroCalcuReservoirResult
{
/// <summary>
///
@@ -15,32 +15,16 @@
/// </summary>
public HydroReservoirViewModel(Yw.Model.HydroReservoirInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
{
- this.PoolElev = rhs.PoolElev;
- this.UpdatePropStatus(nameof(this.PoolElev), rhs, nameof(rhs.PoolElev));
this.Head = rhs.Head;
- this.UpdatePropStatus(nameof(this.Head), rhs, nameof(rhs.Head));
this.HeadPattern = rhs.HeadPattern;
- this.UpdatePropStatus(nameof(this.HeadPattern), rhs, nameof(rhs.HeadPattern));
-
- this.Vmo = rhs;
}
-
- /// <summary>
- /// 姹犲簳鏍囬珮
- /// </summary>
- [Category("鏁版嵁")]
- [DisplayName("姹犲簳鏍囬珮")]
- [HydroMarkPro]
- [PropertyOrder(1001)]
- [DisplayUnit("m")]
- [Browsable(true)]
- public double? PoolElev { get; set; }
/// <summary>
/// 鎬绘按澶�
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鎬绘按澶�")]
+ [Display(Name = "鎬绘按澶�(m)")]
[HydroMarkPro]
[PropertyOrder(1002)]
[DisplayUnit("m")]
@@ -61,7 +45,11 @@
///
/// </summary>
[Browsable(false)]
- public new Yw.Model.HydroReservoirInfo Vmo { get; set; }
+ public new Yw.Model.HydroReservoirInfo Vmo
+ {
+ get { return _vmo as Yw.Model.HydroReservoirInfo; }
+ set { _vmo = value; }
+ }
/// <summary>
///
@@ -69,12 +57,8 @@
public override void UpdateProperty()
{
base.UpdateProperty();
- this.PoolElev = this.Vmo.PoolElev;
- this.UpdatePropStatus(nameof(this.PoolElev), this.Vmo, nameof(this.Vmo.PoolElev));
this.Head = this.Vmo.Head;
- this.UpdatePropStatus(nameof(this.Head), this.Vmo, nameof(this.Vmo.Head));
this.HeadPattern = this.Vmo.HeadPattern;
- this.UpdatePropStatus(nameof(this.HeadPattern), this.Vmo, nameof(this.Vmo.HeadPattern));
}
/// <summary>
@@ -83,12 +67,8 @@
public override void UpdateVmoProperty()
{
base.UpdateVmoProperty();
- this.Vmo.PoolElev = this.PoolElev;
- this.Vmo.UpdatePropStatus(nameof(this.Vmo.PoolElev), this, nameof(this.PoolElev));
this.Vmo.Head = this.Head;
- this.Vmo.UpdatePropStatus(nameof(this.Vmo.Head), this, nameof(this.Head));
this.Vmo.HeadPattern = this.HeadPattern;
- this.Vmo.UpdatePropStatus(nameof(this.Vmo.HeadPattern), this, nameof(this.HeadPattern));
}
--
Gitblit v1.9.3