From 970022ca59c5c22cf572c458c01e0328be85a253 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 08 六月 2024 12:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.MapView/Base/NodeViewModel.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
index 2467e75..30dc9e3 100644
--- a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
@@ -91,33 +91,34 @@
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("鏍囬珮(m)")]
[DisplayName("鏍囬珮(m)")]
[Browsable(true)]
public new float Elev { get { return base.Elev; } set { base.Elev = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("鏈�澶у彛寰�(mm)")]
[DisplayName("鏈�澶у彛寰�(mm)")]
[Browsable(false)]
public virtual float MaxDiameter { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
- [Description("闇�姘撮噺(m)")]
- [DisplayName("闇�姘撮噺(m)")]
+
+ [Category("璁＄畻鍙傛暟")]
+ [Description("闇�姘撮噺(m鲁/h)")]
+ [DisplayName("闇�姘撮噺(m鲁/h)")]
[Browsable(true)]
public virtual float Demand { get; set; }
/// <summary>
/// 妯″紡鐨勭紪鍙�
/// </summary>
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("鐢ㄦ按閲忔ā寮忕殑缂栧彿")]
[DisplayName("妯″紡缂栧彿")]
[Browsable(true)]
@@ -125,7 +126,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[DisplayName("閾捐〃娓呭崟")]
[Browsable(true)]
[JsonIgnore]
@@ -161,7 +162,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
[Browsable(false)]
@@ -174,7 +175,7 @@
set { if (value != null) X = value.X; Y = value.Y; }
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
@@ -188,13 +189,13 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
public int Level { get; set; } = 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
public bool Visible { get; set; } = true;
@@ -203,7 +204,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
--
Gitblit v1.9.3