From dd4fa076e58b00f46118928bbdaf38f7593544b4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:11 +0800
Subject: [PATCH] 状态显示调整
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionViewModel.cs | 85 ++++++++++--------------------------------
1 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionViewModel.cs
index 57da2db..650b1e0 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/01-junction/HydroJunctionViewModel.cs
@@ -1,9 +1,9 @@
锘縩amespace Yw.WinFrmUI
{
/// <summary>
- ///
+ /// 杩炴帴鑺傜偣
/// </summary>
- public class HydroJunctionViewModel
+ public class HydroJunctionViewModel : HydroNodeViewModel
{
/// <summary>
///
@@ -13,15 +13,8 @@
/// <summary>
///
/// </summary>
- public HydroJunctionViewModel(Yw.Model.HydroJunctionInfo rhs)
+ public HydroJunctionViewModel(Yw.Model.HydroJunctionInfo rhs) : base(rhs)
{
- this.ID = rhs.ID;
- this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
- this.Code = rhs.Code;
- this.Name = rhs.Name;
- this.FlagsString = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
- this.Description = rhs.Description;
- this.Quality = rhs.Quality;
this.Elev = rhs.Elev;
this.Demand = rhs.Demand;
this.DemandPattern = rhs.DemandPattern;
@@ -30,79 +23,41 @@
}
/// <summary>
- /// id
+ ///
/// </summary>
- [DisplayName("ID")]
- [Display(Name = "ID")]
- public long ID { get; set; }
+ public HydroJunctionViewModel(Yw.Model.HydroJunctionInfo rhs, Yw.WinFrmUI.HydroCalcuNodeResult calcuResult) : base(rhs, calcuResult)
+ {
+ this.Elev = rhs.Elev;
+ this.Demand = rhs.Demand;
+ this.DemandPattern = rhs.DemandPattern;
+
+ this.Vmo = rhs;
+ }
+
/// <summary>
- /// 鍒嗙被
+ /// 鏍囬珮(m)
/// </summary>
- [DisplayName("鍒嗙被")]
- [Display(Name = "鍒嗙被")]
- public string Catalog { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- [DisplayName("缂栫爜")]
- [Display(Name = "缂栫爜")]
- public string Code { get; set; }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- [DisplayName("鍚嶇О")]
- [Display(Name = "鍚嶇О")]
- public string Name { get; set; }
-
- /// <summary>
- /// 鏍囩
- /// </summary>
- [DisplayName("鏍囩")]
- [Display(Name = "鏍囩")]
- public string FlagsString { get; set; }
-
- /// <summary>
- /// 璇存槑
- /// </summary>
- [DisplayName("璇存槑")]
- [Display(Name = "璇存槑")]
- public string Description { get; set; }
-
- /// <summary>
- /// 鍒濆姘磋川
- /// </summary>
- [DisplayName("鍒濆姘磋川")]
- [Display(Name = "鍒濆姘磋川")]
- public double Quality { get; set; }
-
- /// <summary>
- /// 鏍囬珮
- /// </summary>
- [DisplayName("鏍囬珮")]
- [Display(Name = "鏍囬珮")]
+ [DisplayName("鏍囬珮(m)")]
public double Elev { get; set; }
/// <summary>
- /// 闇�姘撮噺
+ /// 闇�姘撮噺(m鲁/h)
/// </summary>
- [DisplayName("闇�姘撮噺")]
- [Display(Name = "闇�姘撮噺")]
+ [DisplayName("闇�姘撮噺(m鲁/h)")]
public double? Demand { get; set; }
/// <summary>
/// 闇�姘存ā寮�
/// </summary>
[DisplayName("闇�姘存ā寮�")]
- [Display(Name = "闇�姘存ā寮�")]
public string DemandPattern { get; set; }
/// <summary>
- ///
+ /// Vmo
/// </summary>
- public Yw.Model.HydroJunctionInfo Vmo { get; set; }
+ [Browsable(false)]
+ public new Yw.Model.HydroJunctionInfo Vmo { get; set; }
}
}
--
Gitblit v1.9.3