From cb12c35c7af4350b0f38b6d90a15d8bd9796b8c5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:22:49 +0800
Subject: [PATCH] epa报错处理
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/00-core/HydroLinkViewModel.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 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 3e50ece..edcc529 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
@@ -26,12 +26,23 @@
}
/// <summary>
+ /// Y娴佸悜
+ /// </summary>
+ [Category("鎷撴墤缁撴瀯")]
+ [DisplayName("Y娴佸悜")]
+ [HydroFlowDirectionPro]
+ [PropertyOrder(102)]
+ [Browsable(false)]
+ [TypeConverter(typeof(HydroFlowDirectionConverter))]
+ public override string FlowDirectionY { get; set; }
+
+ /// <summary>
/// 涓婃父鑺傜偣
/// </summary>
[Category("鎷撴墤缁撴瀯")]
[DisplayName("涓婃父鑺傜偣")]
[PropertyOrder(1001)]
- [IsHydroLinkPro]
+ [HydroLinkPro]
[ReadOnly(true)]
[Browsable(true)]
public string StartCode { get; set; }
@@ -42,7 +53,7 @@
[Category("鎷撴墤缁撴瀯")]
[DisplayName("涓嬫父鑺傜偣")]
[PropertyOrder(1002)]
- [IsHydroLinkPro]
+ [HydroLinkPro]
[ReadOnly(true)]
[Browsable(true)]
public string EndCode { get; set; }
@@ -61,10 +72,11 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("娴侀噺")]
+ [Display(Name = "娴侀噺(m鲁/h)")]
[PropertyOrder(10001)]
[Browsable(true)]
[DisplayUnit("m鲁/h")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuFlow { get; set; }
@@ -73,10 +85,11 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("娴侀��")]
+ [Display(Name = "娴侀��(m/s)")]
[PropertyOrder(10002)]
[Browsable(true)]
[DisplayUnit("m/s")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuVelocity { get; set; }
@@ -85,12 +98,39 @@
/// </summary>
[Category("璁＄畻缁撴灉")]
[DisplayName("姘村ご鎹熷け")]
+ [Display(Name = "姘村ご鎹熷け(m)")]
[PropertyOrder(10003)]
[Browsable(true)]
[DisplayUnit("m")]
- [IsHydroCalcuPro]
+ [HydroCalcuPro]
[ShowEditor(false)]
public virtual double? CalcuHeadLoss { get; set; }
+
+ /// <summary>
+ /// 灞�閮ㄦ崯澶�
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ崯澶�")]
+ [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+ [PropertyOrder(10004)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuMinorLoss { get; set; }
+
+ /// <summary>
+ /// 娌跨▼鎹熷け
+ /// </summary>
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娌跨▼鎹熷け")]
+ [Display(Name = "娌跨▼鎹熷け(m)")]
+ [PropertyOrder(10005)]
+ [Browsable(true)]
+ [DisplayUnit("m")]
+ [HydroCalcuPro]
+ [ShowEditor(false)]
+ public virtual double? CalcuFrictionLoss { get; set; }
/// <summary>
@@ -131,7 +171,7 @@
/// 鏇存柊璁＄畻灞炴��
/// </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)
@@ -139,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