From 504a7540001f5805938c83ed67a28d86d68b8808 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 30 十月 2024 01:00:25 +0800
Subject: [PATCH] 修改泵匹配选择逻辑
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
index 9664e3d..a8a02d9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs
@@ -1,15 +1,15 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI
{
public class PumpSingleMatchingViewModel
{
- public PumpSingleMatchingViewModel(Vmo.PumpSeriesVmo rhs)
+ public PumpSingleMatchingViewModel(Vmo.AssetsPumpSeriesVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
this.IsPump = false;
}
- public PumpSingleMatchingViewModel(Vmo.PumpGroupVmo rhs)
+ public PumpSingleMatchingViewModel(Vmo.AssetsPumpGroupVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -17,7 +17,7 @@
this.IsPump = false;
}
- public PumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs, long GroupID)
+ public PumpSingleMatchingViewModel(Vmo.AssetsPumpMainVmo rhs, long GroupID)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -25,7 +25,7 @@
this.IsPump = true;
}
- public PumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs)
+ public PumpSingleMatchingViewModel(Vmo.AssetsPumpMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -35,6 +35,7 @@
this.RatedPower = rhs.RatedPower;
this.RatedFlow = rhs.RatedFlow;
this.RatedSpeed = rhs.RatedSpeed;
+ this.RatedHead = rhs.RatedHead;
this.RatedEfficiency = rhs.RatedEfficiency;
this.D2 = rhs.D2;
this.Description = rhs.Description;
@@ -111,4 +112,12 @@
/// </summary>
public string Description { get; set; }
}
+}
+
+public class PhartViewModel
+{
+ public long ID { get; set; }
+ public string OtherName { get; set; }
+ public int Importance { get; set; }
+ public int SortCode { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3