From 5c14c9686d2bd7c99fdd6cc6fc19404e6e4b8e4d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 15:02:20 +0800
Subject: [PATCH] 增加用水当量和用水器具界面
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs | 30 ++++++++++++++----------------
1 files changed, 14 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 7a06dc8..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
@@ -8,7 +8,7 @@
{
}
- public PipeViewModel(Vmo.PipeLineMainVmo rhs)
+ public PipeViewModel(Vmo.AssetsPipeMainVmo rhs)
{
this.ID = rhs.ID;
this.Description = rhs.Description;
@@ -20,17 +20,23 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- this.MaterialName = rhs.MaterialName;
+ if (rhs.Material == null)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ 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.PipeLineMainVmo rhs)
+ public void Reset(Vmo.AssetsPipeMainVmo rhs)
{
this.ID = rhs.ID;
this.Hazen = rhs.Hazen;
@@ -44,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;
}
@@ -76,7 +81,7 @@
/// </summary>
[DisplayName("鏉愭枡")]
[Browsable(true)]
- public string MaterialName { get; set; }
+ public string Material { get; set; }
/// <summary>
/// Hazen
@@ -112,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