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/09-Tank/TankSingleMatchingViewModel.cs | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
index ffe9bc7..5c4f04b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs
@@ -8,7 +8,6 @@
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.SeriesID = rhs.SeriesID;
@@ -28,18 +27,39 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍙ｅ緞
+ /// 鏈�浣庢按浣�
/// </summary>
- [DisplayName("鍙ｅ緞(mm)")]
+ [DisplayName("鏈�浣庢按浣�")]
[Browsable(true)]
- public string Caliber { get; set; }
+ public double MinLevel { get; set; }
/// <summary>
- /// 鏉愭枡
+ /// 鏈�楂樻按浣�
/// </summary>
- [DisplayName("鏉愭枡")]
+ [DisplayName("鏈�楂樻按浣�")]
[Browsable(true)]
- public string Material { get; set; }
+ public double MaxLevel { get; set; }
+
+ /// <summary>
+ /// 鍏О鐩村緞
+ /// </summary>
+ [DisplayName("鍏О鐩村緞")]
+ [Browsable(true)]
+ public double DN { get; set; }
+
+ /// <summary>
+ /// 鏈�灏忓绉�
+ /// </summary>
+ [DisplayName("鏈�灏忓绉�")]
+ [Browsable(true)]
+ public double MinVol { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏佽婧㈡祦
+ /// </summary>
+ [DisplayName("鏄惁婧㈡祦")]
+ [Browsable(true)]
+ public bool OverFlow { get; set; }
/// <summary>
/// 鎹熷け绯绘暟
@@ -54,13 +74,6 @@
[DisplayName("璇存槑")]
[Browsable(true)]
public string Description { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int? TankLift { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -96,5 +109,12 @@
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ [DisplayName("闃�闂ㄨ缃�")]
+ [Browsable(true)]
+ public string TankSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3