From 2e3201e1be4247b47b2b8c2a60c56c0d6885b05a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 09:25:31 +0800
Subject: [PATCH] 主菜单提交

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
index fec8ae4..2344bca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
@@ -20,21 +20,20 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
-                this.MaterialName = "榛樿";
+                this.Material = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
             this.Hazen = rhs.Hazen;
             this.Darcy = rhs.Darcy;
             this.Manning = rhs.Manning;
             this.Name = rhs.Name;
             this.SortCode = rhs.SortCode;
-            this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
+            this.KeyWord = string.Join(",", rhs.KeyWord);
         }
 
         public void Reset(Vmo.AssetsPipeMainVmo rhs)
@@ -51,11 +50,10 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            this.MaterialName = rhs.MaterialName;
+            this.Material = rhs.Material;
             this.Description = rhs.Description;
             this.Name = rhs.Name;
-            this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
+            this.KeyWord = string.Join(",", rhs.KeyWord);
             this.SortCode = rhs.SortCode;
         }
 
@@ -83,7 +81,7 @@
         /// </summary>
         [DisplayName("鏉愭枡")]
         [Browsable(true)]
-        public string MaterialName { get; set; }
+        public string Material { get; set; }
 
         /// <summary>
         /// Hazen
@@ -119,13 +117,6 @@
         [DisplayName("鍏抽敭瀛�")]
         [Browsable(true)]
         public string KeyWord { get; set; }
-
-        /// <summary>
-        /// 鏄惁榛樿
-        /// </summary>
-        [DisplayName("鏄惁榛樿")]
-        [Browsable(true)]
-        public bool IsDefault { get; set; }
 
         /// <summary>
         /// 璇存槑

--
Gitblit v1.9.3