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/17-compressor/CompressorSingleMatchingViewModel.cs | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs
similarity index 70%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs
index 9748010..b836ec2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/TankSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs
@@ -6,14 +6,13 @@
{
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.Caliber = rhs.Caliber;
+ 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")]
@@ -30,9 +29,9 @@
/// <summary>
/// 鍙ｅ緞
/// </summary>
- [DisplayName("鍙ｅ緞(mm)")]
+ [DisplayName("鍙ｅ緞")]
[Browsable(true)]
- public string Caliber { get; set; }
+ public double? Caliber { get; set; }
/// <summary>
/// 鏉愭枡
@@ -70,31 +69,10 @@
public string Name { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [DisplayName("鍒涘缓浜�")]
- [Browsable(false)]
- public string CreateName { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [DisplayName("鍒涘缓鏃堕棿")]
- [Browsable(false)]
- public string CreateTime { get; set; }
-
- /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
public string KeyWord { get; set; }
-
- /// <summary>
- /// 闃�闂ㄨ缃�
- /// </summary>
- [DisplayName("闃�闂ㄨ缃�")]
- [Browsable(true)]
- public string CompressorSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3