From ca1ccd0dd9f2d6936368f07d14a2b29b309fd151 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:25 +0800
Subject: [PATCH] 增加单独匹配界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 98 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs
index 7b1bdac..362d856 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs
@@ -6,18 +6,57 @@
public class PumpMatchingViewModel
{
/// <summary>
+ ///
+ /// </summary>
+ public PumpMatchingViewModel() { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public PumpMatchingViewModel(Yw.Model.HydroPumpInfo 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.DbId = rhs.DbId;
+ this.DbLocked = rhs.DbLocked;
+ this.CurveDbId = hydroInfo.Curves?.Find(x => x.Code == rhs.CurveQH)?.DbId;
+ this.RatedP = rhs.RatedP;
+ this.RatedQ = rhs.RatedQ;
+ this.RatedH = rhs.RatedH;
+ this.RatedN = rhs.RatedN;
+ this.RatedHz = rhs.RatedHz;
+ this.CurrentHz = Math.Round(rhs.RatedHz * rhs.SpeedRatio, 1);
+ if (allCalcuResult != null && allCalcuResult.Count > 0)
+ {
+ var calcuResult = allCalcuResult.Find(x => x.Code == rhs.Code) as HydroCalcuLinkResult;
+ if (calcuResult != null)
+ {
+ if (calcuResult.CalcuFlow.HasValue)
+ {
+ this.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
+ }
+
+ var calcuResultStart = allCalcuResult.Find(x => x.Code == rhs.StartCode) as HydroCalcuNodeResult;
+ var calcuResultEnd = allCalcuResult.Find(x => x.Code == rhs.EndCode) as HydroCalcuNodeResult;
+ if (calcuResultStart != null && calcuResultEnd != null)
+ {
+ if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
+ {
+ this.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
+ }
+ }
+ }
+ }
+ }
+
+ /// <summary>
/// ID
/// </summary>
[DisplayName("ID")]
[Browsable(false)]
public long ID { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- [DisplayName("缂栫爜")]
- [Browsable(true)]
- public string Code { get; set; }
/// <summary>
/// 鍚嶇О
@@ -27,11 +66,11 @@
public string Name { get; set; }
/// <summary>
- /// Db閿佸畾
+ /// 缂栫爜
/// </summary>
- [DisplayName("閿佸畾")]
+ [DisplayName("缂栫爜")]
[Browsable(true)]
- public bool DbLocked { get; set; }
+ public string Code { get; set; }
/// <summary>
/// 鍨嬪彿
@@ -46,6 +85,13 @@
[DisplayName("DbId")]
[Browsable(false)]
public string DbId { get; set; }
+
+ /// <summary>
+ /// Db閿佸畾
+ /// </summary>
+ [DisplayName("閿佸畾")]
+ [Browsable(true)]
+ public bool DbLocked { get; set; }
/// <summary>
/// CurveDbId
@@ -81,6 +127,34 @@
[DisplayName("棰濆畾杞��")]
[Browsable(true)]
public double? RatedN { get; set; }
+
+ /// <summary>
+ /// 棰濆畾棰戠巼
+ /// </summary>
+ [DisplayName("棰濆畾棰戠巼")]
+ [Browsable(true)]
+ public double RatedHz { get; set; }
+
+ /// <summary>
+ /// 璁惧畾棰戠巼
+ /// </summary>
+ [DisplayName("璁惧畾棰戠巼")]
+ [Browsable(true)]
+ public double CurrentHz { get; set; }
+
+ /// <summary>
+ /// 璁＄畻娴侀噺
+ /// </summary>
+ [DisplayName("璁＄畻娴侀噺")]
+ [Browsable(true)]
+ public double? CalcuQ { get; set; }
+
+ /// <summary>
+ /// 璁＄畻鎵▼
+ /// </summary>
+ [DisplayName("璁＄畻鎵▼")]
+ [Browsable(true)]
+ public double? CalcuH { get; set; }
/// <summary>
/// 鍖归厤鍨嬪彿
@@ -132,6 +206,20 @@
public double? MatchingRatedN { get; set; }
/// <summary>
+ /// 鍖归厤棰濆畾棰戠巼
+ /// </summary>
+ [DisplayName("鍖归厤棰濆畾棰戠巼")]
+ [Browsable(true)]
+ public double? MatchingRatedHz { get; set; }
+
+ /// <summary>
+ /// 鍖归厤璁惧畾棰戠巼
+ /// </summary>
+ [DisplayName("鍖归厤璁惧畾棰戠巼")]
+ [Browsable(true)]
+ public double? MatchingCurrentHz { get; set; }
+
+ /// <summary>
/// 鍖归厤娴侀噺鎵▼鏇茬嚎
/// </summary>
[DisplayName("鍖归厤娴侀噺鎵▼鏇茬嚎")]
--
Gitblit v1.9.3