From d573ccd77f6df9be1798bd36f37c3cadeae5b9c9 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期三, 27 十一月 2024 16:35:23 +0800 Subject: [PATCH] 用水当量 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/ExchangerViewModel.cs | 40 ++++++++++++---------------------------- 1 files changed, 12 insertions(+), 28 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/ExchangerViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/ExchangerViewModel.cs index cdd5f14..f735c38 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/ExchangerViewModel.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/ExchangerViewModel.cs @@ -12,38 +12,36 @@ { this.ID = rhs.ID; this.Description = rhs.Description; - if (rhs.MaterialName == null) + if (rhs.Material == null) { - this.MaterialName = "榛樿"; + this.Material = "榛樿"; } else { - this.MaterialName = rhs.MaterialName.ToString(); + this.Material = rhs.Material.ToString(); } this.Name = rhs.Name; this.SortCode = rhs.SortCode; - this.KeyWord = rhs.KeyWord; - this.IsDefault = rhs.IsDefault; - this.Coefficient = rhs.Coefficient; + this.KeyWord = string.Join(",", rhs.KeyWord); + this.MinorLoss = rhs.MinorLoss; } public void Reset(Vmo.AssetsExchangerMainVmo rhs) { this.ID = rhs.ID; - if (rhs.MaterialName == null) + if (rhs.Material == null) { - this.MaterialName = "榛樿"; + this.Material = "榛樿"; } else { - this.MaterialName = rhs.MaterialName.ToString(); + this.Material = rhs.Material.ToString(); } 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; - this.Coefficient = rhs.Coefficient; + this.MinorLoss = rhs.MinorLoss; } /// <summary> @@ -59,25 +57,18 @@ public string Name { get; set; } /// <summary> - /// 鍙e緞 - /// </summary> - [DisplayName("鍙e緞(mm)")] - [Browsable(true)] - public string Caliber { get; set; } - - /// <summary> /// 鏉愭枡 /// </summary> [DisplayName("鏉愭枡")] [Browsable(true)] - public string MaterialName { get; set; } + public string Material { get; set; } /// <summary> /// 绯绘暟 /// </summary> [DisplayName("鎹熷け绯绘暟")] [Browsable(true)] - public double? Coefficient { get; set; } + public double MinorLoss { get; set; } /// <summary> /// 鎺掑簭鐮� @@ -92,13 +83,6 @@ [DisplayName("鍏抽敭瀛�")] [Browsable(true)] public string KeyWord { get; set; } - - /// <summary> - /// 鏄惁榛樿 - /// </summary> - [DisplayName("鏄惁榛樿")] - [Browsable(true)] - public bool IsDefault { get; set; } /// <summary> /// 璇存槑 -- Gitblit v1.9.3