From 1902e2c2332610fcaf310db19f98e7e9f819d0a6 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 23 十月 2024 13:24:45 +0800
Subject: [PATCH] 增加并联分析参数

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
index c95be1d..423e0de 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-link/03-valve/HydroValvePropertyViewModel.cs
@@ -17,10 +17,18 @@
         /// </summary>
         public HydroValvePropertyViewModel(Yw.Model.HydroValveInfo rhs) : base(rhs)
         {
+            this.Material = rhs.Material;
+            this.UpdatePropStatus(nameof(this.Material), rhs, nameof(rhs.Material));
             this.Diameter = rhs.Diameter;
+            this.UpdatePropStatus(nameof(this.Diameter), rhs, nameof(rhs.Diameter));
             this.MinorLoss = rhs.MinorLoss;
+            this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(rhs.MinorLoss));
             this.ValveType = rhs.ValveType;
+            this.UpdatePropStatus(nameof(this.ValveType), rhs, nameof(rhs.ValveType));
+            this.OpeningDegree = rhs.OpeningDegree;
+            this.UpdatePropStatus(nameof(this.OpeningDegree), rhs, nameof(rhs.OpeningDegree));
             this.ValveSetting = rhs.ValveSetting;
+            this.UpdatePropStatus(nameof(this.ValveSetting), rhs, nameof(rhs.ValveSetting));
         }
 
 
@@ -35,6 +43,15 @@
         public override string LinkStatus { get; set; }
 
         /// <summary>
+        /// 鏉愭枡
+        /// </summary>
+        [Category("鏁版嵁")]
+        [DisplayName("鏉愭枡")]
+        [PropertyOrder(100)]
+        [Browsable(true)]
+        public string Material { get; set; }
+
+        /// <summary>
         /// 鐩村緞
         /// </summary>
         [Category("鏁版嵁")]
@@ -45,10 +62,10 @@
         public double Diameter { get; set; }
 
         /// <summary>
-        /// 灞�閮ㄩ樆鍔涚郴鏁�
+        /// 灞�闃荤郴鏁�
         /// </summary>
         [Category("鏁版嵁")]
-        [DisplayName("灞�閮ㄩ樆鍔涚郴鏁�")]
+        [DisplayName("灞�闃荤郴鏁�")]
         [PropertyOrder(102)]
         [Browsable(true)]
         public double MinorLoss { get; set; }
@@ -64,29 +81,45 @@
         public string ValveType { get; set; }
 
         /// <summary>
+        /// 闃�闂ㄥ紑搴�
+        /// </summary>
+        [Category("鏁版嵁")]
+        [DisplayName("闃�闂ㄥ紑搴�")]
+        [PropertyOrder(104)]
+        [Browsable(true)]
+        public double OpeningDegree { get; set; }
+
+        /// <summary>
         /// 闃�闂ㄨ缃�
         /// </summary>
         [Category("鏁版嵁")]
         [DisplayName("闃�闂ㄨ缃�")]
-        [PropertyOrder(104)]
+        [PropertyOrder(105)]
         [IsHydroCurvePro(HydroCurve.ValveQL)]
         [Browsable(true)]
         public string ValveSetting { get; set; }
 
+
         /// <summary>
         /// 鏇存柊灞炴��
         /// </summary>
-        /// <param name="rhs"></param>
-        /// <param name="allParterList"></param>
         public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
         {
             base.UpdateProperty(rhs, allParterList);
             if (rhs is Yw.Model.HydroValveInfo hydroValveInfo)
             {
+                this.Material = hydroValveInfo.Material;
+                this.UpdatePropStatus(nameof(this.Material), hydroValveInfo, nameof(hydroValveInfo.Material));
                 this.Diameter = hydroValveInfo.Diameter;
+                this.UpdatePropStatus(nameof(this.Diameter), hydroValveInfo, nameof(hydroValveInfo.Diameter));
                 this.MinorLoss = hydroValveInfo.MinorLoss;
+                this.UpdatePropStatus(nameof(this.MinorLoss), hydroValveInfo, nameof(hydroValveInfo.MinorLoss));
                 this.ValveType = hydroValveInfo.ValveType;
+                this.UpdatePropStatus(nameof(this.ValveType), hydroValveInfo, nameof(hydroValveInfo.ValveType));
+                this.OpeningDegree = hydroValveInfo.OpeningDegree;
+                this.UpdatePropStatus(nameof(this.OpeningDegree), hydroValveInfo, nameof(hydroValveInfo.OpeningDegree));
                 this.ValveSetting = hydroValveInfo.ValveSetting;
+                this.UpdatePropStatus(nameof(this.ValveSetting), hydroValveInfo, nameof(hydroValveInfo.ValveSetting));
             }
         }
 

--
Gitblit v1.9.3