From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +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/18-exchanger/ExchangerSingleMatchingViewModel.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs
index 0461942..099b557 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs
@@ -6,14 +6,12 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
- this.Description = rhs.Description;
- this.SortCode = rhs.SortCode;
- this.ID = rhs.ID;
- this.Name = rhs.Name;
- this.Description = rhs.Description;
+ this.Material = rhs.Material;
this.SeriesID = rhs.SeriesID;
- this.SortCode = rhs.SortCode;
this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.Coefficient = rhs.MinorLoss;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
}
[DisplayName("ID")]
@@ -56,13 +54,6 @@
public string Description { get; set; }
/// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int? ExchangerLift { get; set; }
-
- /// <summary>
/// 鎺掑簭鐮�
/// </summary>
[DisplayName("鎺掑簭鐮�")]
@@ -96,5 +87,12 @@
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ [DisplayName("闃�闂ㄨ缃�")]
+ [Browsable(true)]
+ public string ExchangerSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3