From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +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/03-junction/03-meter/03-pressmeter/HydroPressmeterViewModel.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/03-pressmeter/HydroPressmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/03-pressmeter/HydroPressmeterViewModel.cs
index 35ba414..a51922a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/03-pressmeter/HydroPressmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/03-pressmeter/HydroPressmeterViewModel.cs
@@ -22,12 +22,13 @@
}
/// <summary>
- /// 鍘嬪姏
+ /// 褰撳墠鍘嬪姏
/// </summary>
[Category("鏁版嵁")]
- [DisplayName("鍘嬪姏")]
+ [DisplayName("褰撳墠鍘嬪姏")]
+ [Display(Name = "褰撳墠鍘嬪姏(m)")]
[DisplayUnit("m")]
- [PropertyOrder(1001)]
+ [PropertyOrder(3001)]
[Browsable(true)]
public double? CurrentPress { get; set; }
@@ -38,7 +39,7 @@
[DisplayName("鑷敱鍘嬪姏")]
[PropertyOrder(10001)]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
[Browsable(false)]
public override double? CalcuPress { get; set; }
@@ -50,7 +51,7 @@
[DisplayName("缁濆鍘嬪姏")]
[PropertyOrder(10002)]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
[Browsable(false)]
public override double? CalcuHead { get; set; }
@@ -62,19 +63,20 @@
[DisplayName("闇�姘撮噺")]
[PropertyOrder(10003)]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
[Browsable(false)]
public override double? CalcuDemand { get; set; }
/// <summary>
- /// 鍘嬪姏
+ /// 璁＄畻鍘嬪姏
/// </summary>
[Category("璁＄畻缁撴灉")]
- [DisplayName("鍘嬪姏")]
- [PropertyOrder(11001)]
+ [DisplayName("璁＄畻鍘嬪姏")]
+ [Display(Name = "璁＄畻鍘嬪姏(m)")]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
+ [PropertyOrder(11001)]
[ShowEditor(false)]
[Browsable(true)]
public double? CalcuPr { get; set; }
@@ -88,13 +90,23 @@
/// <summary>
/// 鏇存柊灞炴��
/// </summary>
- public override void Update()
+ public override void UpdateProperty()
{
- base.Update();
+ base.UpdateProperty();
this.CurrentPress = this.Vmo.CurrentPress;
this.UpdatePropStatus(nameof(this.CurrentPress), this.Vmo, nameof(this.Vmo.CurrentPress));
}
+ /// <summary>
+ ///
+ /// </summary>
+ public override void UpdateVmoProperty()
+ {
+ base.UpdateVmoProperty();
+ this.Vmo.CurrentPress = this.CurrentPress;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurrentPress), this, nameof(this.CurrentPress));
+ }
+
/// <summary>
/// 鏇存柊璁＄畻灞炴��
--
Gitblit v1.9.3