From f47abf649b85ce5fd21725fedaebba359a6dfd1d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 09:20:02 +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/04-link/00-core/HydroLinkViewModel.cs | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
index 0ebb435..7cccec7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs
@@ -21,8 +21,6 @@
this.UpdatePropStatus(nameof(this.EndCode), rhs, nameof(rhs.EndCode));
this.LinkStatus = HydroLinkStatusHelper.GetStatusName(rhs.LinkStatus);
this.UpdatePropStatus(nameof(this.LinkStatus), rhs, nameof(rhs.LinkStatus));
-
- this.Vmo = rhs;
}
/// <summary>
@@ -32,8 +30,8 @@
[DisplayName("Y娴佸悜")]
[HydroFlowDirectionPro]
[PropertyOrder(102)]
- [Browsable(false)]
[TypeConverter(typeof(HydroFlowDirectionConverter))]
+ [Browsable(false)]
public override string FlowDirectionY { get; set; }
/// <summary>
@@ -64,7 +62,7 @@
[Category("鏁版嵁")]
[DisplayName("绠℃鐘舵��")]
[PropertyOrder(1003)]
- [Browsable(true)]
+ [Browsable(false)]
public virtual string LinkStatus { get; set; }
/// <summary>
@@ -72,43 +70,75 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("娴侀噺")]
- [PropertyOrder(10001)]
- [Browsable(true)]
[DisplayUnit("m鲁/h")]
+ [Display(Name = "娴侀噺(m鲁/h)")]
+ [PropertyOrder(10001)]
[HydroCalcuPro]
[ShowEditor(false)]
+ [Browsable(false)]
public virtual double? CalcuFlow { get; set; }
-
- /// <summary>
- /// 娴侀��
- /// </summary>
- [Category("璁＄畻缁撴灉")]
- [DisplayName("娴侀��")]
- [PropertyOrder(10002)]
- [Browsable(true)]
- [DisplayUnit("m/s")]
- [HydroCalcuPro]
- [ShowEditor(false)]
- public virtual double? CalcuVelocity { get; set; }
/// <summary>
/// 姘村ご鎹熷け
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("姘村ご鎹熷け")]
- [PropertyOrder(10003)]
- [Browsable(true)]
[DisplayUnit("m")]
+ [Display(Name = "姘村ご鎹熷け(m)")]
+ [PropertyOrder(10002)]
[HydroCalcuPro]
[ShowEditor(false)]
+ [Browsable(false)]
public virtual double? CalcuHeadLoss { get; set; }
+ /// <summary>
+ /// 娴侀��
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娴侀��")]
+ [DisplayUnit("m/s")]
+ [Display(Name = "娴侀��(m/s)")]
+ [PropertyOrder(19007)]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public virtual double? CalcuVelocity { get; set; }
/// <summary>
- /// Vmo
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [DisplayUnit("m")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [PropertyOrder(19008)]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public virtual double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娌跨▼鎹熷け")]
+ [DisplayUnit("m")]
+ [Display(Name = "娌跨▼鎹熷け(m)")]
+ [PropertyOrder(19009)]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ [Browsable(false)]
+ public virtual double? CalcuFrictionLoss { get; set; }
+
+ /// <summary>
+ ///
/// </summary>
[Browsable(false)]
- public new Yw.Model.HydroLinkInfo Vmo { get; set; }
+ public new Yw.Model.HydroLinkInfo Vmo
+ {
+ get { return _vmo as Yw.Model.HydroLinkInfo; }
+ set { _vmo = value; }
+ }
/// <summary>
///
@@ -141,8 +171,7 @@
/// <summary>
/// 鏇存柊璁＄畻灞炴��
/// </summary>
- /// <param name="rhs"></param>
- public override void UpdateCalcuProperty(HydroCalcuResult rhs)
+ public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
{
base.UpdateCalcuProperty(rhs);
if (rhs is HydroCalcuLinkResult calcuLinkProperty)
@@ -150,6 +179,8 @@
this.CalcuFlow = calcuLinkProperty.CalcuFlow.HasValue ? Math.Round(calcuLinkProperty.CalcuFlow.Value, 1) : null;
this.CalcuVelocity = calcuLinkProperty.CalcuVelocity.HasValue ? Math.Round(calcuLinkProperty.CalcuVelocity.Value, 2) : null;
this.CalcuHeadLoss = calcuLinkProperty.CalcuHeadLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuHeadLoss.Value, 2) : null;
+ this.CalcuMinorLoss = calcuLinkProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuMinorLoss.Value, 4) : null;
+ this.CalcuFrictionLoss = calcuLinkProperty.CalcuFrictionLoss.HasValue ? Math.Round(calcuLinkProperty.CalcuFrictionLoss.Value, 4) : null;
}
}
--
Gitblit v1.9.3