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/LinkViewModel.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
index 363bb08..4fae9e1 100644
--- a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
@@ -41,18 +41,18 @@
#region 灞炴��
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("1)缂栧彿")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缂栧彿")]
[Browsable(true)]
public new string ID { get { return base.ID; } set { base.ID = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("2)鍚嶇О")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍚嶇О")]
[Browsable(true)]
public new string Name { get { return base.Name; } set { base.Name = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("9)璧峰鑺傜偣")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("璧峰鑺傜偣")]
[Browsable(true)]
public string Node1
{
@@ -68,8 +68,8 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("10)缁堟鑺傜偣")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缁堟鑺傜偣")]
[Browsable(true)]
public string Node2
{
@@ -126,7 +126,7 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鏍囬珮(m)")]
[Browsable(false)]
public float Elev
@@ -142,8 +142,8 @@
}
}
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("1)鍒濆鐘舵��")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鍒濆鐘舵��")]
[Browsable(true)]
public StatusType Status
{
@@ -165,13 +165,13 @@
// return "";
//}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("4)鍙ｅ緞(mm)")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
public new float Diameter { get { return base.Diameter; } set { base.Diameter = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("5)闀垮害(m)")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("闀垮害(m)")]
[Browsable(true)]
/// <summary>
/// 闀垮害
@@ -199,9 +199,9 @@
[JsonIgnore]
public String regionName { get; set; } = null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
- [DisplayName("7)X鍧愭爣")]
+ [DisplayName("X鍧愭爣")]
[Browsable(true)]
public float X
{
@@ -214,9 +214,9 @@
//Position = new PointF(value, Position.Y);
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
- [DisplayName("8)Y鍧愭爣")]
+ [DisplayName("Y鍧愭爣")]
[Browsable(true)]
public float Y
{
@@ -253,7 +253,7 @@
[Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
- [DisplayName("3)绫诲瀷")]
+ [DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
--
Gitblit v1.9.3