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 |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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 923c6d7..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
@@ -72,6 +72,7 @@
         /// </summary>
         [Category("璁$畻缁撴灉")]
         [DisplayName("娴侀噺")]
+        [Display(Name = "娴侀噺(m鲁/h)")]
         [PropertyOrder(10001)]
         [Browsable(true)]
         [DisplayUnit("m鲁/h")]
@@ -84,6 +85,7 @@
         /// </summary>
         [Category("璁$畻缁撴灉")]
         [DisplayName("娴侀��")]
+        [Display(Name = "娴侀��(m/s)")]
         [PropertyOrder(10002)]
         [Browsable(true)]
         [DisplayUnit("m/s")]
@@ -96,12 +98,39 @@
         /// </summary>
         [Category("璁$畻缁撴灉")]
         [DisplayName("姘村ご鎹熷け")]
+        [Display(Name = "姘村ご鎹熷け(m)")]
         [PropertyOrder(10003)]
         [Browsable(true)]
         [DisplayUnit("m")]
         [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>
@@ -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