From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
index cb283d1..ef5424b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs
@@ -416,6 +416,26 @@
#endregion
+ #region 涓氬姟鏍囨敞寮曠嚎鏍囩
+
+ /// <summary>
+ /// 璁剧疆涓氬姟鏍囨敞寮曠嚎鏍囩
+ /// </summary>
+ public async Task SetLogicMarkLeadLabels(List<LogicMarkLeadLabel> obj)
+ {
+ await _bimfaceInteropContainer?.SetLogicMarkLeadLabels(obj);
+ }
+
+ /// <summary>
+ /// 娓呴櫎涓氬姟鏍囨敞寮曠嚎鏍囩
+ /// </summary>
+ public async Task ClearLogicMarkLeadLabels()
+ {
+ await _bimfaceInteropContainer?.ClearLogicMarkLeadLabels();
+ }
+
+ #endregion
+
#region 涓氬姟
@@ -489,7 +509,6 @@
#endregion
-
#region 璁剧疆Open鏋勪欢棰滆壊
private const string _openComponentColor = "#2E8B57";
@@ -546,14 +565,7 @@
{
if (x is Yw.Model.HydroPumpInfo pump)
{
- double? speed = pump.RatedN;
- if (speed.HasValue)
- {
- if (pump.SpeedRatio.HasValue)
- {
- speed = speed.Value * pump.SpeedRatio.Value;
- }
- }
+ var hz = pump.RatedHz * pump.SpeedRatio;
var calcuPump = calcuResult.LinkList.Find(x => x.Id == pump.Code);
var calcuPumpStart = calcuResult.NodeList.Find(x => x.Id == pump.StartCode);
var calcuPumpEnd = calcuResult.NodeList.Find(x => x.Id == pump.EndCode);
@@ -562,7 +574,7 @@
pumpCustomLabel.Data = new List<CustomLabelItem>()
{
new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
- new CustomLabelItem(){ Name="杞��",Value=speed?.ToString(),Unit="r/min"},
+ new CustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
new CustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
new CustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
@@ -591,6 +603,12 @@
#endregion
+ #region 鏍囨敞
+
+
+
+ #endregion
+
#endregion
--
Gitblit v1.9.3