From 278e94cb1b045288d1205f36b67f60cb5224754c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 06 十一月 2024 11:50:19 +0800
Subject: [PATCH] 属性调整
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 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 a8a2bf0..f61627a 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
@@ -17,20 +17,19 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null)
{
this.Material = "榛樿";
}
else
{
- this.Material = rhs.MaterialName.ToString();
+ this.Material = rhs.Material.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.Type;
- this.ValveLift = rhs.ValveLift;
+ this.ValveType = rhs.ValveType;
this.SortCode = rhs.SortCode;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.ValveSetting = rhs.ValveSetting;
}
@@ -39,7 +38,7 @@
this.ID = rhs.ID;
this.Name = rhs.Name;
this.Description = rhs.Description;
- this.Material = rhs.MaterialName;
+ this.Material = rhs.Material;
if (rhs.Caliber == null)
{
this.Caliber = "榛樿";
@@ -48,20 +47,19 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null)
{
this.Material = "榛樿";
}
else
{
- this.Material = rhs.MaterialName.ToString();
+ this.Material = rhs.Material.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.Type;
+ this.ValveType = rhs.ValveType;
this.SortCode = rhs.SortCode;
- this.ValveLift = rhs.ValveLift;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.ValveSetting = rhs.ValveSetting;
}
@@ -102,7 +100,7 @@
/// </summary>
[DisplayName("绫诲瀷")]
[Browsable(true)]
- public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }
+ public HStation.Assets.eValveType ValveType { get; set; }
/// <summary>
/// 璇存槑
@@ -110,13 +108,6 @@
[DisplayName("璇存槑")]
[Browsable(true)]
public string Description { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int? ValveLift { get; set; }
/// <summary>
/// 鎺掑簭鐮�
--
Gitblit v1.9.3