From 7c4fde84af5d666236c85b784bf13c9295bcb605 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 29 十月 2024 14:18:46 +0800
Subject: [PATCH] bimface 业务计算显示距离设定
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/00-core/HydroTankPropertyViewModel.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/HydroTankPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/00-core/HydroTankPropertyViewModel.cs
similarity index 89%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/HydroTankPropertyViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/00-core/HydroTankPropertyViewModel.cs
index c5dd322..829fb8c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/HydroTankPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/01-source/02-tank/00-core/HydroTankPropertyViewModel.cs
@@ -29,6 +29,7 @@
this.UpdatePropStatus(nameof(this.DN), rhs, nameof(rhs.DN));
this.MinVol = Math.Round(rhs.MinVol, 4);
this.UpdatePropStatus(nameof(this.MinVol), rhs, nameof(rhs.MinVol));
+ this.Curve = string.IsNullOrEmpty(rhs.VolCurve) ? "鏈厤缃�" : "宸查厤缃�";
this.VolCurve = rhs.VolCurve;
this.UpdatePropStatus(nameof(this.VolCurve), rhs, nameof(rhs.VolCurve));
this.OverFlow = rhs.OverFlow;
@@ -100,24 +101,33 @@
/// </summary>
[Category("鏁版嵁")]
[DisplayName("瀹圭Н鏇茬嚎")]
- [PropertyOrder(107)]
+ [PropertyOrder(108)]
+ [IsHydroCurvePro(HydroCurve.Tank)]
[Browsable(true)]
+ public string Curve { get; set; }
+
+ /// <summary>
+ /// 瀹圭Н鏇茬嚎
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("瀹圭Н鏇茬嚎")]
+ [PropertyOrder(109)]
+ [IsHydroCurvePro(HydroCurve.TankVol)]
+ [Browsable(false)]
public string VolCurve { get; set; }
/// <summary>
- /// 鏄惁鍏佽婧㈡祦
+ /// 鍏佽婧㈡祦
/// </summary>
[Category("鏁版嵁")]
- [DisplayName("鏄惁鍏佽婧㈡祦")]
- [PropertyOrder(108)]
+ [DisplayName("鍏佽婧㈡祦")]
+ [PropertyOrder(110)]
[Browsable(true)]
public bool OverFlow { get; set; }
/// <summary>
/// 鏇存柊灞炴��
/// </summary>
- /// <param name="rhs"></param>
- /// <param name="allParterList"></param>
public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
{
base.UpdateProperty(rhs, allParterList);
@@ -135,6 +145,7 @@
this.UpdatePropStatus(nameof(this.DN), hydroTankInfo, nameof(hydroTankInfo.DN));
this.MinVol = hydroTankInfo.MinVol;
this.UpdatePropStatus(nameof(this.MinVol), hydroTankInfo, nameof(hydroTankInfo.MinVol));
+ this.Curve = string.IsNullOrEmpty(hydroTankInfo.VolCurve) ? "鏈厤缃�" : "宸查厤缃�";
this.VolCurve = hydroTankInfo.VolCurve;
this.UpdatePropStatus(nameof(this.VolCurve), hydroTankInfo, nameof(hydroTankInfo.VolCurve));
this.OverFlow = hydroTankInfo.OverFlow;
--
Gitblit v1.9.3