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/02-flowmeter/HydroFlowmeterViewModel.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
index df7c28c..f52120b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/03-meter/02-flowmeter/HydroFlowmeterViewModel.cs
@@ -42,7 +42,7 @@
[DisplayName("鑷敱鍘嬪姏")]
[Display(Name = "鑷敱鍘嬪姏(m)")]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[PropertyOrder(10001)]
[ShowEditor(false)]
[Browsable(false)]
@@ -55,7 +55,7 @@
[DisplayName("缁濆鍘嬪姏")]
[PropertyOrder(10002)]
[DisplayUnit("m")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
[Browsable(false)]
public override double? CalcuHead { get; set; }
@@ -67,7 +67,7 @@
[DisplayName("闇�姘撮噺")]
[PropertyOrder(10003)]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[ShowEditor(false)]
[Browsable(false)]
public override double? CalcuDemand { get; set; }
@@ -79,7 +79,7 @@
[DisplayName("璁＄畻娴侀噺")]
[Display(Name = "璁＄畻娴侀噺(m鲁/h)")]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro(true)]
+ [IsHydroCalcuPro]
[PropertyOrder(11001)]
[ShowEditor(false)]
[Browsable(true)]
@@ -95,14 +95,19 @@
/// <summary>
///
/// </summary>
- public override void Update()
+ public override void UpdateProperty()
{
- base.Update();
+ base.UpdateProperty();
this.CurrentFlow = this.Vmo.CurrentFlow;
this.UpdatePropStatus(nameof(this.CurrentFlow), this.Vmo, nameof(this.Vmo.CurrentFlow));
}
-
+ public override void UpdateVmoProperty()
+ {
+ base.UpdateVmoProperty();
+ this.Vmo.CurrentFlow = this.CurrentFlow;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.CurrentFlow), this, nameof(this.CurrentFlow));
+ }
/// <summary>
/// 鏇存柊璁＄畻灞炴��
@@ -116,5 +121,7 @@
}
}
+
+
}
}
--
Gitblit v1.9.3