From 492fbc0052225864e97cceb66d86d3fdf9dee961 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 16:18:36 +0800
Subject: [PATCH] 修改匹配方法以及单独匹配

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 8406f2f..f8910bc 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
@@ -13,7 +13,7 @@
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
-            this.ParentID = rhs.PumpSeriesID;
+            this.ParentID = rhs.SeriesID;
             this.IsPump = false;
         }
 
@@ -29,12 +29,13 @@
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
-            this.ParentID = rhs.PumpSeriesID;
+            this.ParentID = rhs.SeriesID;
             this.IsPump = true;
             this.Erosion = rhs.Erosion;
             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