From 94d10185010a7476021764f5b5cb59dc7d2b68f4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 十二月 2024 15:23:00 +0800
Subject: [PATCH] 项目管理整改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
index db7d20d..144d424 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
@@ -3,7 +3,7 @@
/// <summary>
/// 绠￠亾瑙嗗浘
/// </summary>
- public class HydroPipeViewModel : HydroLinkViewModel
+ public class HydroPipeViewModel : HydroLinkViewModel, IHydroCalcuPipeResult
{
/// <summary>
///
@@ -25,8 +25,6 @@
this.UpdatePropStatus(nameof(this.Roughness), rhs, nameof(rhs.Roughness));
this.MinorLoss = rhs.MinorLoss;
this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(rhs.MinorLoss));
-
- this.Vmo = rhs;
}
/// <summary>
@@ -58,7 +56,7 @@
[DisplayUnit("mm")]
[PropertyOrder(2002)]
[Browsable(true)]
- public double Diameter { get; set; }
+ public virtual double Diameter { get; set; }
/// <summary>
/// 闀垮害
@@ -93,13 +91,55 @@
[Browsable(true)]
public double MinorLoss { get; set; }
+
+ /// <summary>
+ /// 娴侀噺
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娴侀噺")]
+ [Display(Name = "娴侀噺(m鲁/h)")]
+ [PropertyOrder(11001)]
+ [Browsable(true)]
+ [DisplayUnit("m鲁/h")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuQ { get; set; }
+
+ /// <summary>
+ /// 杩涘彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("杩涘彛鍘嬪姏")]
+ [Display(Name = "杩涘彛鍘嬪姏(m)")]
+ [PropertyOrder(11002)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuPr1 { get; set; }
+
+ /// <summary>
+ /// 鍑哄彛鍘嬪姏
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("鍑哄彛鍘嬪姏")]
+ [Display(Name = "鍑哄彛鍘嬪姏(m)")]
+ [PropertyOrder(11003)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuPr2 { get; set; }
+
/// <summary>
///
/// </summary>
[Browsable(false)]
- public new Yw.Model.HydroPipeInfo Vmo { get; set; }
-
-
+ public new Yw.Model.HydroPipeInfo Vmo
+ {
+ get { return _vmo as Yw.Model.HydroPipeInfo; }
+ set { _vmo = value; }
+ }
/// <summary>
/// 鏇存柊灞炴��
@@ -137,7 +177,19 @@
this.Vmo.UpdatePropStatus(nameof(this.Vmo.MinorLoss), this, nameof(this.MinorLoss));
}
-
+ /// <summary>
+ /// 鏇存柊璁＄畻灞炴��
+ /// </summary>
+ public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
+ {
+ base.UpdateCalcuProperty(rhs);
+ if (rhs is HydroCalcuPipeResult calcuPipeProperty)
+ {
+ this.CalcuQ = calcuPipeProperty.CalcuQ.HasValue ? Math.Round(calcuPipeProperty.CalcuQ.Value, 1) : null;
+ this.CalcuPr1 = calcuPipeProperty.CalcuPr1.HasValue ? Math.Round(calcuPipeProperty.CalcuPr1.Value, 2) : null;
+ this.CalcuPr2 = calcuPipeProperty.CalcuPr2.HasValue ? Math.Round(calcuPipeProperty.CalcuPr2.Value, 2) : null;
+ }
+ }
}
}
--
Gitblit v1.9.3