From 5af88720773df7be98372ff8bce0acffa5dffb73 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 08 十一月 2024 14:59:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
index 06be9a9..9f88a5b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
@@ -40,9 +40,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("姹犲簳鏍囬珮")]
- [Display(Name = "姹犲簳鏍囬珮(m)")]
- [PropertyOrder(1001)]
[DisplayUnit("m")]
+ [Display(Name = "姹犲簳鏍囬珮(m)")]
+ [HydroMarkPro]
+ [PropertyOrder(1001)]
[Browsable(true)]
public double PoolElev { get; set; }
@@ -51,9 +52,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鍒濆姘翠綅")]
- [Display(Name = "鍒濆姘翠綅(m)")]
- [PropertyOrder(1002)]
[DisplayUnit("m")]
+ [Display(Name = "鍒濆姘翠綅(m)")]
+ [HydroMarkPro]
+ [PropertyOrder(1002)]
[Browsable(true)]
public double InitLevel { get; set; }
@@ -62,9 +64,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鏈�浣庢按浣�")]
- [Display(Name = "鏈�浣庢按浣�(m)")]
- [PropertyOrder(1003)]
[DisplayUnit("m")]
+ [Display(Name = "鏈�浣庢按浣�(m)")]
+ [HydroMarkPro]
+ [PropertyOrder(1003)]
[Browsable(true)]
public double MinLevel { get; set; }
@@ -73,9 +76,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鏈�楂樻按浣�")]
- [Display(Name = "鏈�楂樻按浣�(m)")]
- [PropertyOrder(1004)]
[DisplayUnit("m")]
+ [Display(Name = "鏈�楂樻按浣�(m)")]
+ [HydroMarkPro]
+ [PropertyOrder(1004)]
[Browsable(true)]
public double MaxLevel { get; set; }
@@ -84,9 +88,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鍏О鐩村緞")]
- [Display(Name = "鍏О鐩村緞(m)")]
- [PropertyOrder(1005)]
[DisplayUnit("m")]
+ [Display(Name = "鍏О鐩村緞(m)")]
+ [HydroMarkPro]
+ [PropertyOrder(1005)]
[Browsable(true)]
public double DN { get; set; }
@@ -95,9 +100,10 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("鏈�灏忓绉�")]
- [Display(Name = "鏈�灏忓绉�(m鲁)")]
- [PropertyOrder(1006)]
[DisplayUnit("m鲁")]
+ [Display(Name = "鏈�灏忓绉�(m鲁)")]
+ [HydroMarkPro]
+ [PropertyOrder(1006)]
[Browsable(true)]
public double MinVol { get; set; }
@@ -108,7 +114,7 @@
[DisplayName("瀹圭Н鏇茬嚎")]
[Display(Name = "瀹圭Н鏇茬嚎")]
[PropertyOrder(1007)]
- [IsHydroCurvePro(HydroCurve.Tank)]
+ [HydroCurvePro(HydroCurve.Tank)]
[Browsable(true)]
public string Curve
{
@@ -129,7 +135,7 @@
[DisplayName("瀹圭Н鏇茬嚎")]
[Display(Name = "瀹圭Н鏇茬嚎")]
[PropertyOrder(1008)]
- [IsHydroCurvePro(HydroCurve.TankVol)]
+ [HydroCurvePro(HydroCurve.TankVol)]
[Browsable(false)]
public string VolCurve { get; set; }
--
Gitblit v1.9.3