From 9576b66b52fa7c9985489c950a3b726671d5fd1a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 十二月 2024 16:39:47 +0800
Subject: [PATCH] 泵曲线图片导入修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 d7dc185..3143774 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,7 +20,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null)
+ if (rhs.Material == null || rhs.Material == string.Empty)
{
this.Material = "榛樿";
}
@@ -30,7 +30,7 @@
}
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.Coefficient = rhs.MinorLoss;
}
@@ -45,7 +45,7 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- if (rhs.Material == null)
+ if (rhs.Material == null||rhs.Material==string.Empty)
{
this.Material = "榛樿";
}
@@ -55,7 +55,7 @@
}
this.Description = rhs.Description;
this.Name = rhs.Name;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.SortCode = rhs.SortCode;
this.Coefficient = rhs.MinorLoss;
}
@@ -105,7 +105,7 @@
/// </summary>
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
- public List<string> KeyWord { get; set; }
+ public string KeyWord { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3