From 393d0a648f1cb3ff845b01b530a4a7bf7eca21cd Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 11 十二月 2024 15:49:18 +0800
Subject: [PATCH] 增加渭化模型

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
index 2cb5e83..24256c6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportHelper.cs
@@ -169,25 +169,26 @@
             Cell.structureCell("cos蠁");
             Cell.structureCell("r/m  ");
             builder.EndRow();
-            //if (vm.Pumps != null)
-            //{
-            //    foreach (var item in vm.Equipments)
-            //    {
-            //        Cell.structureCell(item.EquipmentName);
-            //        Cell.structureCell(item.EquipmentNumber);
-            //        Cell.structureCell(item.EquipmentMainName);
-            //        Cell.structureCell(item.RatedFlow);
-            //        Cell.structureCell(item.RatedHead);
-            //        Cell.structureCell(item.TypeOfDrive);
-            //        Cell.structureCell("鐢垫満椹卞姩");
-            //        Cell.structureCell(item.RatedCurrent);
-            //        Cell.structureCell(item.RatedPower);
-            //        Cell.structureCell(item.RatedFactor);
-            //        Cell.structureCell(item.Speed);
-            //        builder.EndRow();
-            //    }
-            //}
-            //else
+            if (vm.Pumps != null)
+            {
+                foreach (var item in vm.Pumps)
+                {
+                    Cell.structureCell(item.Name);
+                    Cell.structureCell(item.SerialNO);
+                    Cell.structureCell(item.ModelType);
+                    Cell.structureCell(item.RatedQ);
+                    Cell.structureCell(item.RatedH);
+                    //Cell.structureCell(item.TypeOfDrive);
+                    Cell.structureCell("鐢垫満椹卞姩");
+                    Cell.structureCell("鐢垫満椹卞姩");
+                    Cell.structureCell(item.RatedI);
+                    Cell.structureCell(item.RatedP);
+                    Cell.structureCell(item.RatedF);
+                    Cell.structureCell(item.RatedN);
+                    builder.EndRow();
+                }
+            }
+            else
             {
                 Cell.structureCell("");
                 Cell.structureCell("");

--
Gitblit v1.9.3