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/LinkViewModel.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
index 0e9f8bd..8f90e54 100644
--- a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
@@ -41,18 +41,18 @@
#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; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鑺傜偣1")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("璧峰鑺傜偣")]
[Browsable(true)]
public string Node1
{
@@ -68,8 +68,8 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鑺傜偣2")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缁堟鑺傜偣")]
[Browsable(true)]
public string Node2
{
@@ -126,8 +126,8 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鏍囬珮")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鏍囬珮(m)")]
[Browsable(true)]
public float Elev
{
@@ -142,8 +142,8 @@
}
}
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("1)鍒濆鐘舵��")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鍒濆鐘舵��")]
[Browsable(true)]
public StatusType Status
{
@@ -165,8 +165,8 @@
// return "";
//}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鍙ｅ緞")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
public new float Diameter { get { return base.Diameter; } set { base.Diameter = value; } }
@@ -182,7 +182,7 @@
[JsonIgnore]
public String regionName { get; set; } = null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -197,7 +197,7 @@
//Position = new PointF(value, Position.Y);
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -214,18 +214,18 @@
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
public int Level { get; set; } = 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
public bool Visible { get; set; } = true;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
@@ -234,13 +234,13 @@
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
--
Gitblit v1.9.3