From 0711485ecb4fe66fbe820478d92eb9f04b77c042 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期四, 24 十月 2024 13:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
index 563eb7e..c1dc41d 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/02-pump/HydroPumpPropertyViewModel.cs
@@ -5,7 +5,7 @@
     /// <summary>
     /// 姘存车灞炴�ц鍥�
     /// </summary>
-    public class HydroPumpPropertyViewModel : HydroLinkPropertyViewModel
+    public class HydroPumpPropertyViewModel : HydroLinkPropertyViewModel, IHydroCalcuPumpResult
     {
         /// <summary>
         /// 
@@ -31,7 +31,7 @@
             this.UpdatePropStatus(nameof(this.SpeedRatio), rhs, nameof(rhs.SpeedRatio));
             this.SpeedRatioPattern = rhs.SpeedRatioPattern;
             this.UpdatePropStatus(nameof(this.SpeedRatioPattern), rhs, nameof(rhs.SpeedRatioPattern));
-            this.HasCurve = !string.IsNullOrEmpty(rhs.CurveQH);
+            this.Curve = string.IsNullOrEmpty(rhs.CurveQH) ? "鏈厤缃�" : "宸查厤缃�";
             this.CurveQH = rhs.CurveQH;
             this.UpdatePropStatus(nameof(this.CurveQH), rhs, nameof(rhs.CurveQH));
             this.CurveQP = rhs.CurveQP;
@@ -149,9 +149,9 @@
         [Category("鏁版嵁")]
         [DisplayName("鎬ц兘鏇茬嚎")]
         [PropertyOrder(110)]
-        [ShowEditor(false)]
+        [IsHydroCurvePro(HydroCurve.Pump)]
         [Browsable(true)]
-        public bool HasCurve { get; set; }
+        public string Curve { get; set; }
 
         /// <summary>
         /// 娴侀噺鎵▼鏇茬嚎
@@ -203,6 +203,92 @@
 
 
         /// <summary>
+        /// 娴侀噺
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("娴侀噺")]
+        [PropertyOrder(10001)]
+        [DisplayUnit("m鲁/h")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(false)]
+        public override double? CalcuFlow { get; set; }
+
+        /// <summary>
+        /// 娴侀��
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("娴侀��")]
+        [PropertyOrder(10002)]
+        [DisplayUnit("m/s")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(false)]
+        public override double? CalcuVelocity { get; set; }
+
+        /// <summary>
+        /// 姘村ご鎹熷け
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("姘村ご鎹熷け")]
+        [PropertyOrder(10003)]
+        [DisplayUnit("m")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(false)]
+        public override double? CalcuHeadLoss { get; set; }
+
+
+        /// <summary>
+        /// 娴侀噺
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("娴侀噺")]
+        [PropertyOrder(11001)]
+        [DisplayUnit("m鲁/h")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(true)]
+        public double? CalcuQ { get; set; }
+
+        /// <summary>
+        /// 鎵▼
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("鎵▼")]
+        [PropertyOrder(11002)]
+        [DisplayUnit("m")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(true)]
+        public double? CalcuH { get; set; }
+
+        /// <summary>
+        /// 鍔熺巼
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("鍔熺巼")]
+        [PropertyOrder(11003)]
+        [DisplayUnit("kW")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(true)]
+        public double? CalcuP { get; set; }
+
+        /// <summary>
+        /// 鏁堢巼
+        /// </summary>
+        [Category("璁＄畻缁撴灉")]
+        [DisplayName("鏁堢巼")]
+        [PropertyOrder(11004)]
+        [DisplayUnit("%")]
+        [IsHydroCalcuPro(true)]
+        [ShowEditor(false)]
+        [Browsable(true)]
+        public double? CalcuE { get; set; }
+
+
+        /// <summary>
         /// 鏇存柊灞炴��
         /// </summary>
         public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
@@ -237,7 +323,20 @@
             }
         }
 
-
+        /// <summary>
+        /// 鏇存柊璁＄畻灞炴��
+        /// </summary>
+        public override void UpdateCalcuProperty(IHydroCalcuResult rhs)
+        {
+            base.UpdateCalcuProperty(rhs);
+            if (rhs is IHydroCalcuPumpResult calcuPumpProperty)
+            {
+                this.CalcuQ = calcuPumpProperty.CalcuQ.HasValue ? Math.Round(calcuPumpProperty.CalcuQ.Value, 1) : null;
+                this.CalcuH = calcuPumpProperty.CalcuH.HasValue ? Math.Round(calcuPumpProperty.CalcuH.Value, 2) : null;
+                this.CalcuP = calcuPumpProperty.CalcuP.HasValue ? Math.Round(calcuPumpProperty.CalcuP.Value, 1) : null;
+                this.CalcuE = calcuPumpProperty.CalcuE.HasValue ? Math.Round(calcuPumpProperty.CalcuE.Value, 1) : null;
+            }
+        }
 
     }
 }

--
Gitblit v1.9.3