From 31e3f4ffdf7d566db391a5fcb94984f23e0abb02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 06 十一月 2024 15:00:31 +0800
Subject: [PATCH] 修改阀门匹配
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
index 7e03117..b21bdbb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
@@ -21,21 +21,20 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null)
{
this.MaterialName = "榛樿";
}
else
{
- this.MaterialName = rhs.MaterialName.ToString();
+ this.MaterialName = rhs.Material.ToString();
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
this.KeyWord = rhs.KeyWord;
- this.IsDefault = rhs.IsDefault;
this.Angle = rhs.Angle;
- this.ConnectionLength = rhs.ConnectionLength;
- this.Coefficient = rhs.Coefficient;
+ this.ElbowLengthType = rhs.ElbowLengthType;
+ this.MinorLoss = rhs.MinorLoss;
}
public void Reset(Vmo.AssetsElbowMainVmo rhs)
@@ -49,22 +48,21 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null)
{
this.MaterialName = "榛樿";
}
else
{
- this.MaterialName = rhs.MaterialName.ToString();
+ this.MaterialName = rhs.Material.ToString();
}
this.Description = rhs.Description;
this.Name = rhs.Name;
this.KeyWord = rhs.KeyWord;
- this.IsDefault = rhs.IsDefault;
this.SortCode = rhs.SortCode;
this.Angle = rhs.Angle;
- this.ConnectionLength = rhs.ConnectionLength;
- this.Coefficient = rhs.Coefficient;
+ this.ElbowLengthType = rhs.ElbowLengthType;
+ this.MinorLoss = rhs.MinorLoss;
}
/// <summary>
@@ -98,7 +96,7 @@
/// </summary>
[DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
- public double? Coefficient { get; set; }
+ public double? MinorLoss { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -115,18 +113,11 @@
public string KeyWord { get; set; }
/// <summary>
- /// 鏄惁榛樿
- /// </summary>
- [DisplayName("鏄惁榛樿")]
- [Browsable(true)]
- public bool IsDefault { get; set; }
-
- /// <summary>
/// 寮ご绫诲瀷
/// </summary>
[DisplayName("寮ご绫诲瀷")]
[Browsable(true)]
- public eLengthType? ConnectionLength { get; set; }
+ public eLengthType? ElbowLengthType { get; set; }
/// <summary>
/// 瑙掑害
--
Gitblit v1.9.3