From 6d4874f6d9c271c67d72a62f08985c71f7f8bfac Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 19:02:13 +0800
Subject: [PATCH] 界面修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs
index 0c063aa..ac80b17 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs
@@ -20,19 +20,18 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.MaterialName == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
- 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.Coefficient = rhs.MinorLoss;
}
public void Reset(Vmo.AssetsFourlinkMainVmo rhs)
@@ -46,20 +45,19 @@
{
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.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.Coefficient = rhs.MinorLoss;
}
/// <summary>
@@ -86,7 +84,7 @@
/// </summary>
[DisplayName("鏉愭枡")]
[Browsable(true)]
- public string MaterialName { get; set; }
+ public string Material { get; set; }
/// <summary>
/// 绯绘暟
@@ -108,13 +106,6 @@
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
public string KeyWord { get; set; }
-
- /// <summary>
- /// 鏄惁榛樿
- /// </summary>
- [DisplayName("鏄惁榛樿")]
- [Browsable(true)]
- public bool IsDefault { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3