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/Base/NodeViewModel.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
index 6532a30..fe7a0c5 100644
--- a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
@@ -35,13 +35,13 @@
#region 灞炴��
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("ID缂栧彿")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缂栧彿")]
[Browsable(true)]
public new string ID { get { return base.ID; } set { base.ID = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("Name鍚嶇О")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍚嶇О")]
[Browsable(true)]
public new string Name { get { return base.Name; } set { base.Name = value; } }
@@ -60,7 +60,7 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -75,7 +75,7 @@
base.X = value;
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -91,33 +91,33 @@
}
}
- [Category("1銆佸熀鏈俊鎭�")]
- [Description("鏍囬珮")]
- [DisplayName("鏍囬珮")]
+ [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銆佽绠楀弬鏁�")]
- [Description("鏈�澶у彛寰�")]
- [DisplayName("鏈�澶у彛寰�")]
+ [Category("璁＄畻鍙傛暟")]
+ [Description("鏈�澶у彛寰�(mm)")]
+ [DisplayName("鏈�澶у彛寰�(mm)")]
[Browsable(false)]
public virtual float MaxDiameter { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
- [Description("闇�姘撮噺")]
- [DisplayName("闇�姘撮噺")]
+ [Category("璁＄畻鍙傛暟")]
+ [Description("闇�姘撮噺(m)")]
+ [DisplayName("闇�姘撮噺(m)")]
[Browsable(true)]
public virtual float Demand { get; set; }
/// <summary>
/// 妯″紡鐨勭紪鍙�
/// </summary>
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("鐢ㄦ按閲忔ā寮忕殑缂栧彿")]
[DisplayName("妯″紡缂栧彿")]
[Browsable(true)]
@@ -125,7 +125,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[DisplayName("閾捐〃娓呭崟")]
[Browsable(true)]
[JsonIgnore]
@@ -161,7 +161,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
[Browsable(false)]
@@ -174,7 +174,7 @@
set { if (value != null) X = value.X; Y = value.Y; }
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
@@ -188,13 +188,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 +203,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
--
Gitblit v1.9.3