From 0a6c1d69626e7a9af49c76a73ef5ff8051ebf419 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期三, 15 五月 2024 14:34:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.MapView/Model/PumpViewModel.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs b/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
index 5029577..b43469f 100644
--- a/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
@@ -26,7 +26,7 @@
get { return base.Name; }
set { base.Name = value; }
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("姘存车绫诲瀷")]
public new PumpType Type { get; set; }
@@ -34,20 +34,20 @@
public dict<string, Dataset> Datasets { get; set; } = new dict<string, Dataset>();
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾杞�� { get; set; } = 1500;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾娴侀噺 { get; set; } = 200;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾鎵▼ { get; set; } = 50;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾鍔熺巼 { get; set; } = 75;
public double 杞�熸瘮 { get; set; } = 1;
[DisplayName("2)褰撳墠杞��")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 褰撳墠杞�� { get; set; } = 1500;
[Browsable(false)]
@@ -530,7 +530,7 @@
return series;
}
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("3)娴侀噺鎵▼鏇茬嚎")]
public List<PointF> HeadCurvePoints
{
@@ -554,7 +554,7 @@
}
}
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("4)娴侀噺鏁堢巼鏇茬嚎")]
public List<PointF> EfficCurvePoints
{
@@ -585,7 +585,7 @@
public List<string> Parameters { get; set; }
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
+ [Category("璁＄畻缁撴灉")]
[DisplayName("2)鎵▼")]
[Browsable(true)]
public new float EN_HEADLOSS { get { return -base.EN_HEADLOSS; } }
--
Gitblit v1.9.3