From 13e69c09c5ac97e0294d64617dfb934e34bb4264 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 17:11:13 +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 | 182 +++++++++++++++++++++++++--------------------
1 files changed, 101 insertions(+), 81 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 c868702..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
@@ -1,114 +1,134 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI
{
public class ValveSingleMatchingViewModel
{
- public ValveSingleMatchingViewModel(Vmo.PumpSeriesVmo rhs)
+ public ValveSingleMatchingViewModel(Vmo.AssetsValveMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
- this.IsPump = false;
- }
-
- public ValveSingleMatchingViewModel(Vmo.PumpGroupVmo rhs)
- {
- this.ID = rhs.ID;
- this.Name = rhs.Name;
- this.ParentID = rhs.PumpSeriesID;
- this.IsPump = false;
- }
-
- public ValveSingleMatchingViewModel(Vmo.PumpMainVmo rhs, long GroupID)
- {
- this.ID = rhs.ID;
- this.Name = rhs.Name;
- this.ParentID = GroupID;
- this.IsPump = true;
- }
-
- public ValveSingleMatchingViewModel(Vmo.PumpMainVmo rhs)
- {
- this.ID = rhs.ID;
- this.Name = rhs.Name;
- this.ParentID = rhs.PumpSeriesID;
- this.IsPump = true;
- this.Erosion = rhs.Erosion;
- this.RatedPower = rhs.RatedPower;
- this.RatedFlow = rhs.RatedFlow;
- this.RatedSpeed = rhs.RatedSpeed;
- this.RatedEfficiency = rhs.RatedEfficiency;
- this.D2 = rhs.D2;
this.Description = rhs.Description;
this.SortCode = rhs.SortCode;
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.Description = rhs.Description;
+ this.Material = rhs.Material;
+ if (rhs.Caliber == null)
+ {
+ this.Caliber = "榛樿";
+ }
+ else
+ {
+ this.Caliber = rhs.Caliber.ToString();
+ }
+ if (rhs.Material == null)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ this.Material = rhs.Material.ToString();
+ }
+ this.Coefficient = rhs.MinorLoss;
+ this.SeriesID = rhs.SeriesID;
+ this.SeriesType = rhs.ValveType;
+ this.SortCode = rhs.SortCode;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
+ this.ValveSetting = rhs.ValveSetting;
}
+ [DisplayName("ID")]
+ [Browsable(false)]
public long ID { get; set; }
- public long ParentID { get; set; }
- public string Name { get; set; }
- public bool IsPump { get; set; }
/// <summary>
- /// 娉电郴鍒桰D
+ /// 绯诲垪ID
/// </summary>
- public long PumpSeriesID { get; set; }
+ [DisplayName("绯诲垪ID")]
+ [Browsable(false)]
+ public long SeriesID { get; set; }
/// <summary>
- /// 鍙傛暟
+ /// 鍙ｅ緞
/// </summary>
- public Dictionary<string, string> Paras { get; set; }
+ [DisplayName("鍙ｅ緞(mm)")]
+ [Browsable(true)]
+ public string Caliber { get; set; }
/// <summary>
- /// 鏍囩
+ /// 鏉愭枡
/// </summary>
- public List<string> Flags { get; set; }
+ [DisplayName("鏉愭枡")]
+ [Browsable(true)]
+ public string Material { get; set; }
/// <summary>
- /// 鏍囧織
+ /// 鎹熷け绯绘暟
/// </summary>
- public string TagName { get; set; }
+ [DisplayName("鎹熷け绯绘暟")]
+ [Browsable(true)]
+ public double Coefficient { get; set; }
/// <summary>
- /// 鎺掑簭鐮�
+ /// 绫诲瀷
/// </summary>
- public int SortCode { get; set; }
-
- /// <summary>
- /// 棰濆畾杞��
- /// </summary>
- public double RatedSpeed { get; set; }
-
- /// <summary>
- /// 棰濆畾娴侀噺
- /// </summary>
- public double RatedFlow { get; set; }
-
- /// <summary>
- /// 棰濆畾鎵▼
- /// </summary>
- public double RatedHead { get; set; }
-
- /// <summary>
- /// 棰濆畾鏁堢巼
- /// </summary>
- public double? RatedEfficiency { get; set; }
-
- /// <summary>
- /// 棰濆畾鍔熺巼
- /// </summary>
- public double RatedPower { get; set; }
-
- /// <summary>
- /// 姘旇殌
- /// </summary>
- public double? Erosion { get; set; }
-
- /// <summary>
- /// 鍙惰疆澶栧緞
- /// </summary>
- public double? D2 { get; set; }
+ [DisplayName("绫诲瀷")]
+ [Browsable(true)]
+ public HStation.Assets.eValveType SeriesType { get; set; }
/// <summary>
/// 璇存槑
/// </summary>
+ [DisplayName("璇存槑")]
+ [Browsable(true)]
public string Description { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄥ紑搴�
+ /// </summary>
+ [DisplayName("闃�闂ㄥ紑搴�")]
+ [Browsable(true)]
+ public int? ValveLift { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ [DisplayName("鎺掑簭鐮�")]
+ [Browsable(true)]
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ [DisplayName("鍚嶇О")]
+ [Browsable(true)]
+ 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 ValveSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3