From abf1e3b3334ab47c38aa92405a11a6ec92b7847a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 31 十月 2024 17:18:37 +0800
Subject: [PATCH] bimface 水流

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
index a72c84e..a8a2bf0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
@@ -27,9 +27,11 @@
             }
             this.Coefficient = rhs.Coefficient;
             this.SeriesID = rhs.SeriesID;
-            this.SeriesType = rhs.SeriesType;
+            this.SeriesType = rhs.Type;
             this.ValveLift = rhs.ValveLift;
             this.SortCode = rhs.SortCode;
+            this.KeyWord = rhs.KeyWord;
+            this.ValveSetting = rhs.ValveSetting;
         }
 
         public void Reset(Vmo.AssetsValveMainVmo rhs)
@@ -56,9 +58,11 @@
             }
             this.Coefficient = rhs.Coefficient;
             this.SeriesID = rhs.SeriesID;
-            this.SeriesType = rhs.SeriesType;
+            this.SeriesType = rhs.Type;
             this.SortCode = rhs.SortCode;
             this.ValveLift = rhs.ValveLift;
+            this.KeyWord = rhs.KeyWord;
+            this.ValveSetting = rhs.ValveSetting;
         }
 
         [DisplayName("ID")]
@@ -105,14 +109,14 @@
         /// </summary>
         [DisplayName("璇存槑")]
         [Browsable(true)]
-        public string? Description { get; set; }
+        public string Description { get; set; }
 
         /// <summary>
-        /// 闃�闂ㄧ姸鎬�
+        /// 闃�闂ㄥ紑搴�
         /// </summary>
-        [DisplayName("闃�闂ㄧ姸鎬�")]
+        [DisplayName("闃�闂ㄥ紑搴�")]
         [Browsable(true)]
-        public int ValveLift { get; set; }
+        public int? ValveLift { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�
@@ -132,14 +136,28 @@
         /// 鍒涘缓浜�
         /// </summary>
         [DisplayName("鍒涘缓浜�")]
-        [Browsable(true)]
+        [Browsable(false)]
         public string CreateName { get; set; }
 
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         [DisplayName("鍒涘缓鏃堕棿")]
-        [Browsable(true)]
+        [Browsable(false)]
         public string CreateTime { get; set; }
+
+        /// <summary>
+        /// 璇嗗埆鍏抽敭瀛�
+        /// </summary>
+        [DisplayName("鍏抽敭瀛�")]
+        [Browsable(true)]
+        public string KeyWord { get; set; }
+
+        /// <summary>
+        /// 闃�闂ㄨ缃�
+        /// </summary>
+        [DisplayName("闃�闂ㄨ缃�")]
+        [Browsable(true)]
+        public string ValveSetting { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3