From f97b3ccbfd63b62ec875223fcc417633f6ce2989 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 09 十二月 2024 17:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingViewModel.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingViewModel.cs
index 938cb07..b76beeb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingViewModel.cs
@@ -11,7 +11,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 = "榛樿";
@@ -20,20 +20,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.SeriesType = rhs.ValveType;
this.SortCode = rhs.SortCode;
- this.ValveLift = rhs.ValveLift;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.ValveSetting = rhs.ValveSetting;
}
@@ -74,7 +73,7 @@
/// </summary>
[DisplayName("绫诲瀷")]
[Browsable(true)]
- public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }
+ public HStation.Assets.eValveType SeriesType { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3