From 1e18310601b076d26329bb0a0e070afeb61d12f4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 25 十月 2024 09:39:15 +0800
Subject: [PATCH] 新模型
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 2 +-
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs | 27 +++++++++++++++++++++++++--
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs | 29 +++++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index 20d4a85..55d9941 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -312,7 +312,7 @@
}
//var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//涓婁紶
- var bimfaceId = 10000884702464; //娴嬭瘯鐢ㄤ緥 10000878572231 10000882826621 10000884283372 10000884362886 10000884702464
+ var bimfaceId = 10000884893369; //娴嬭瘯鐢ㄤ緥 10000878572231 10000882826621 10000884283372 10000884362886 10000884702464 10000884893369
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs
index 75febcd..9f3ffad 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing Yw.Model;
+
+namespace Yw.WinFrmUI
{
/// <summary>
/// 娴侀噺璁″睘鎬ц鍥�
@@ -15,10 +17,33 @@
/// </summary>
public HydroFlowmeterPropertyViewModel(Yw.Model.HydroFlowmeterInfo rhs) : base(rhs)
{
-
+ this.CurrentFlow = rhs.CurrentFlow;
+ this.UpdatePropStatus(nameof(this.CurrentFlow), rhs, nameof(rhs.CurrentFlow));
}
+ /// <summary>
+ /// 娴侀噺
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("娴侀噺")]
+ [PropertyOrder(1001)]
+ [Browsable(true)]
+ public double? CurrentFlow { get; set; }
+
+
+ /// <summary>
+ /// 鏇存柊灞炴��
+ /// </summary>
+ public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
+ {
+ base.UpdateProperty(rhs, allParterList);
+ if (rhs is Yw.Model.HydroFlowmeterInfo hydroFlowmeterInfo)
+ {
+ this.CurrentFlow = hydroFlowmeterInfo.CurrentFlow;
+ this.UpdatePropStatus(nameof(this.CurrentFlow), hydroFlowmeterInfo, nameof(hydroFlowmeterInfo.CurrentFlow));
+ }
+ }
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs
index 6b06036..401e1ba 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing Yw.Model;
+
+namespace Yw.WinFrmUI
{
/// <summary>
/// 鍘嬪姏琛ㄥ睘鎬ц鍥�
@@ -15,10 +17,31 @@
/// </summary>
public HydroPressmeterPropertyViewModel(Yw.Model.HydroPressmeterInfo rhs) : base(rhs)
{
-
+ this.CurrentPress = rhs.CurrentPress;
+ this.UpdatePropStatus(nameof(this.CurrentPress), rhs, nameof(rhs.CurrentPress));
}
+ /// <summary>
+ /// 鍘嬪姏
+ /// </summary>
+ [Category("鏁版嵁")]
+ [DisplayName("鍘嬪姏")]
+ [PropertyOrder(1001)]
+ [Browsable(true)]
+ public double? CurrentPress { get; set; }
+ /// <summary>
+ /// 鏇存柊灞炴��
+ /// </summary>
+ public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
+ {
+ base.UpdateProperty(rhs, allParterList);
+ if (rhs is Yw.Model.HydroPressmeterInfo hydroPressmeterInfo)
+ {
+ this.CurrentPress = hydroPressmeterInfo.CurrentPress;
+ this.UpdatePropStatus(nameof(this.CurrentPress), hydroPressmeterInfo, nameof(hydroPressmeterInfo.CurrentPress));
+ }
+ }
}
}
--
Gitblit v1.9.3