From c09478fe73685a87de0c48f9b300008f06408dd8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 20 十一月 2024 15:15:51 +0800
Subject: [PATCH] 核心界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
index 3cd38bc..a38c376 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
@@ -7,6 +7,41 @@
/// </summary>
public class ValveMatchingViewModel
{
+ /// <summary>
+ ///
+ /// </summary>
+ public ValveMatchingViewModel()
+ { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public ValveMatchingViewModel(Yw.Model.HydroValveInfo rhs, Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuResult)
+ {
+ this.ID = rhs.ID;
+ this.Name = rhs.Name;
+ this.Code = rhs.Code;
+ this.ModelType = rhs.ModelType;
+ this.DbLocked = rhs.DbLocked;
+ this.DbId = rhs.DbId;
+ this.CurveDbId = hydroInfo.Curves?.Find(x => x.Code == rhs.ValveSetting)?.DbId;
+ this.Material = rhs.Material;
+ this.Diameter = rhs.Diameter;
+ this.MinorLoss = rhs.MinorLoss;
+ switch (rhs.ValveType)
+ {
+ case Yw.Hydro.ValveType.PRV: this.ValveType = HStation.Assets.eValveType.PRV; break;
+ case Yw.Hydro.ValveType.PSV: this.ValveType = HStation.Assets.eValveType.PSV; break;
+ case Yw.Hydro.ValveType.PBV: this.ValveType = HStation.Assets.eValveType.PBV; break;
+ case Yw.Hydro.ValveType.TCV: this.ValveType = HStation.Assets.eValveType.TCV; break;
+ case Yw.Hydro.ValveType.FCV: this.ValveType = HStation.Assets.eValveType.FCV; break;
+ case Yw.Hydro.ValveType.GPV: this.ValveType = HStation.Assets.eValveType.GPV; break;
+ case Yw.Hydro.ValveType.CV: this.ValveType = HStation.Assets.eValveType.CV; break;
+ default: break;
+ }
+ this.ValveSetting = rhs.ValveSetting;
+ }
+
/// <summaryd>
/// ID
/// </summary>
@@ -50,11 +85,11 @@
public string DbId { get; set; }
/// <summary>
- /// ChartDbId
+ /// CurveDbId
/// </summary>
- [DisplayName("ChartDbId")]
+ [DisplayName("CurveDbId")]
[Browsable(false)]
- public string ChartDbId { get; set; }
+ public string CurveDbId { get; set; }
/// <summary>
/// 鐩村緞
@@ -82,7 +117,7 @@
/// </summary>
[DisplayName("闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public string ValveType { get; set; }
+ public HStation.Assets.eValveType ValveType { get; set; }
/// <summary>
/// 闃�闂ㄨ缃�
@@ -90,13 +125,6 @@
[DisplayName("闃�闂ㄨ缃�")]
[Browsable(true)]
public string ValveSetting { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ紑搴�
- /// </summary>
- [DisplayName("闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int? ValveLift { get; set; }
/// <summary>
/// 鍖归厤鍨嬪彿
@@ -120,11 +148,11 @@
public double? MatchingDiameter { get; set; }
/// <summary>
- /// MatchingChartDbId
+ /// MatchingCurveDbId
/// </summary>
- [DisplayName("MatchingChartDbId")]
+ [DisplayName("MatchingCurveDbId")]
[Browsable(false)]
- public string MatchingChartDbId { get; set; }
+ public string MatchingCurveDbId { get; set; }
/// <summary>
/// 鍖归厤鏉愯川
@@ -145,7 +173,7 @@
/// </summary>
[DisplayName("鍖归厤闃�闂ㄧ被鍨�")]
[Browsable(true)]
- public string MatchingValveType { get; set; }
+ public HStation.Assets.eValveType? MatchingValveType { get; set; }
/// <summary>
/// 鍖归厤闃�闂ㄨ缃�
@@ -162,10 +190,10 @@
public List<CurvePointMatchingViewModel> MatchingCurveQL { get; set; }
/// <summary>
- /// 鍖归厤闃�闂ㄥ紑搴�
+ /// 鍖归厤寮�搴︽崯澶辨洸绾�
/// </summary>
- [DisplayName("鍖归厤闃�闂ㄥ紑搴�")]
- [Browsable(true)]
- public int? MatchingValveLift { get; set; }
+ [DisplayName("鍖归厤寮�搴︽崯澶辨洸绾�")]
+ [Browsable(false)]
+ public List<CurvePointMatchingViewModel> MatchingCurveOL { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3