From 60908c00556f4f53d82f5588ae3013f80c443590 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 14 十一月 2024 17:22:58 +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/04-link/01-pipe/00-core/HydroPipeViewModel.cs | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
index 0748b5b..593b49e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/01-pipe/00-core/HydroPipeViewModel.cs
@@ -27,6 +27,7 @@
this.UpdatePropStatus(nameof(this.Roughness), rhs, nameof(rhs.Roughness));
this.MinorLoss = rhs.MinorLoss;
this.UpdatePropStatus(nameof(this.MinorLoss), rhs, nameof(rhs.MinorLoss));
+
this.Vmo = rhs;
}
@@ -35,17 +36,18 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("绠￠亾鐘舵��")]
- [PropertyOrder(13)]
+ [PropertyOrder(1003)]
[Browsable(true)]
[TypeConverter(typeof(HydroPipeStatusConverter))]
public override string LinkStatus { get; set; }
/// <summary>
- /// 鏉愭枡
+ /// 鏉愯川
/// </summary>
[Category("鏁版嵁")]
- [DisplayName("鏉愭枡")]
- [PropertyOrder(100)]
+ [Display(Name = "鏉愯川")]
+ [DisplayName("鏉愯川")]
+ [PropertyOrder(2001)]
[Browsable(true)]
public string Material { get; set; }
@@ -53,9 +55,10 @@
/// 鐩村緞
/// </summary>
[Category("鏁版嵁")]
+ [Display(Name = "鐩村緞(mm)")]
[DisplayName("鐩村緞")]
- [PropertyOrder(101)]
[DisplayUnit("mm")]
+ [PropertyOrder(2002)]
[Browsable(true)]
public double Diameter { get; set; }
@@ -63,9 +66,10 @@
/// 闀垮害
/// </summary>
[Category("鏁版嵁")]
+ [Display(Name = "闀垮害(m)")]
[DisplayName("闀垮害")]
- [PropertyOrder(102)]
[DisplayUnit("m")]
+ [PropertyOrder(2003)]
[Browsable(true)]
public double Length { get; set; }
@@ -73,8 +77,10 @@
/// 绮楃硻绯绘暟
/// </summary>
[Category("鏁版嵁")]
+ [Display(Name = "绮楃硻绯绘暟")]
[DisplayName("绮楃硻绯绘暟")]
- [PropertyOrder(103)]
+ [Description("娴锋．濞佸粔鍏紡绯绘暟")]
+ [PropertyOrder(2004)]
[Browsable(true)]
public double Roughness { get; set; }
@@ -82,14 +88,17 @@
/// 灞�闃荤郴鏁�
/// </summary>
[Category("鏁版嵁")]
+ [Display(Name = "灞�闃荤郴鏁�")]
[DisplayName("灞�闃荤郴鏁�")]
- [PropertyOrder(104)]
+ [Description("灞�閮ㄩ樆鍔涚郴鏁�")]
+ [PropertyOrder(2005)]
[Browsable(true)]
public double MinorLoss { get; set; }
/// <summary>
///
/// </summary>
+ [Browsable(false)]
public new Yw.Model.HydroPipeInfo Vmo { get; set; }
@@ -97,9 +106,9 @@
/// <summary>
/// 鏇存柊灞炴��
/// </summary>
- public override void Update()
+ public override void UpdateProperty()
{
- base.Update();
+ base.UpdateProperty();
this.Material = this.Vmo.Material;
this.UpdatePropStatus(nameof(this.Material), this.Vmo, nameof(this.Vmo.Material));
this.Diameter = this.Vmo.Diameter;
@@ -112,6 +121,24 @@
this.UpdatePropStatus(nameof(this.MinorLoss), this.Vmo, nameof(this.Vmo.MinorLoss));
}
+ /// <summary>
+ ///
+ /// </summary>
+ public override void UpdateVmoProperty()
+ {
+ base.UpdateVmoProperty();
+ this.Vmo.Material = this.Material;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Material), this, nameof(this.Material));
+ this.Vmo.Diameter = this.Diameter;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Diameter), this, nameof(this.Diameter));
+ this.Vmo.Length = this.Length;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Length), this, nameof(this.Length));
+ this.Vmo.Roughness = this.Roughness;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.Roughness), this, nameof(this.Roughness));
+ this.Vmo.MinorLoss = this.MinorLoss;
+ this.Vmo.UpdatePropStatus(nameof(this.Vmo.MinorLoss), this, nameof(this.MinorLoss));
+ }
+
}
--
Gitblit v1.9.3