From dfe7e1653f8309e23e4c314cd58ac4ff7ce49dbc Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/FactoryList.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/FactoryList.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/FactoryList.cs
index 7ead92b..bf713d8 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/FactoryList.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/FactoryList.cs
@@ -5,11 +5,11 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static Yw.WinFrmUI.Q3d.ObjectEnum;
-using static Yw.WinFrmUI.Q3d.MapViewEnum;
using System.Windows.Forms;
using Yw.WinFrmUI.Q3d;
using Yw.WinFrmUI.Q3d;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
+using static Yw.WinFrmUI.Q3d.ObjectEnum;
namespace Yw.WinFrmUI.Q3d
{
@@ -162,7 +162,7 @@
// 璇诲彇姘存车淇℃伅
var pumpType = (PumpType)Enum.Parse(typeof(PumpType), fields[1]);
var pumpName = fields[2];
- currentPump = new PumpViewModel { Name = pumpName, Type = pumpType, 棰濆畾杞�� = double.Parse(fields[3]), 棰濆畾娴侀噺 = double.Parse(fields[4]), 棰濆畾鎵▼ = double.Parse(fields[5]), 棰濆畾鍔熺巼 = fields.Length > 6 ? double.Parse(fields[6]) : 75, 褰撳墠杞�� = fields.Length > 7 ? double.Parse(fields[7]) : 1500 };
+ currentPump = new PumpViewModel { Name = pumpName, Type = pumpType, 棰濆畾杞�� = double.Parse(fields[3]), 棰濆畾娴侀噺 = double.Parse(fields[4]), 棰濆畾鎵▼ = double.Parse(fields[5]), 棰濆畾鍔熺巼 = fields.Length > 6 ? double.Parse(fields[6]) : 75, 褰撳墠杞�� = fields.Length > 7 ? double.Parse(fields[7]) : 1500 };
currentFactory.Pumps.Add(currentPump);
currentDataset = null;
--
Gitblit v1.9.3