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.Core/Base/LinkCalcModel.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
index 8d345ba..40eaf92 100644
--- a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
+++ b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
@@ -152,43 +152,43 @@
}
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("1)娴侀噺")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娴侀噺(m鲁/h)")]
[Browsable(true)]
public float EN_FLOW { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("2)娴侀��")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娴侀��(m/s)")]
[Browsable(true)]
public float EN_VELOCITY { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("3)姘村ご鎹熷け")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("姘村ご鎹熷け(m)")]
[Browsable(true)]
public float EN_HEADLOSS { get; set; } = float.NaN;
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("4)娌跨▼姘存崯")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("娌跨▼姘存崯(m)")]
[Browsable(true)]
public float EN_HEADLOSS_LINE { get; set; } = float.NaN;
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("5)灞�閮ㄦ按鎹�")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("灞�閮ㄦ按鎹�(m)")]
[Browsable(true)]
public float EN_HEADLOSS_MINOR { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("5)褰撳墠鐘舵��")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("褰撳墠鐘舵��")]
[Browsable(false)]
public float EN_STATUS { get; set; } = float.NaN;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("閫変腑")]
[Browsable(false)]
public bool Selected { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("榧犳爣鎮簬涓婃柟")]
[DisplayName("榧犳爣鎮簬涓婃柟")]
[Browsable(false)]
--
Gitblit v1.9.3