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/HStation.WinFrmUI.Xhs.Core/03-simulation/02-bimface/XhsProjectSimulationBimfaceCtrl.cs |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 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 d0fbe62..bfaf03e 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
@@ -412,37 +412,39 @@
                 await _bimfaceInteropContainer?.ClearLogicCalcuCustomLabels();
                 return;
             }
-            var obj = new List<CustomLabel>();
+            var obj = new List<LogicCalcuCustomLabel>();
             var allParterList = hydroInfo.GetAllParters();
             allParterList?.ForEach(x =>
             {
                 if (x is Yw.Model.HydroPumpInfo pump)
                 {
-                    var hz = pump.RatedHz * pump.SpeedRatio;
+                    var hz = Math.Round(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);
-                    var pumpCustomLabel = new CustomLabel();
+                    var pumpCustomLabel = new LogicCalcuCustomLabel();
                     pumpCustomLabel.Id = pump.Code;
-                    pumpCustomLabel.Data = new List<CustomLabelItem>()
+                    pumpCustomLabel.Distance = 10000;
+                    pumpCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
                     {
-                        new CustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
-                        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"},
+                        new LogicCalcuCustomLabelItem(){ Name="鐘舵��",Value=HydroLinkStatusHelper.GetStatusName(pump.LinkStatus),Unit=string.Empty},
+                        new LogicCalcuCustomLabelItem(){ Name="棰戠巼",Value=hz.ToString(),Unit=string.Empty},
+                        new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuPump.Flow,1).ToString(),Unit="m鲁/h"},
+                        new LogicCalcuCustomLabelItem(){ Name="杩涘彛鍘嬪姏",Value=Math.Round(calcuPumpStart.Head,4).ToString(),Unit="m"},
+                        new LogicCalcuCustomLabelItem(){ Name="鍑哄彛鍘嬪姏",Value=Math.Round(calcuPumpEnd.Head,4).ToString(),Unit="m"},
                     };
                     obj.Add(pumpCustomLabel);
                 }
                 else if (x is Yw.Model.HydroEmitterInfo emitter)
                 {
                     var calcuEmitter = calcuResult.NodeList.Find(x => x.Id == emitter.Code);
-                    var emitterCustomLabel = new CustomLabel();
+                    var emitterCustomLabel = new LogicCalcuCustomLabel();
                     emitterCustomLabel.Id = emitter.Code;
-                    emitterCustomLabel.Data = new List<CustomLabelItem>()
+                    emitterCustomLabel.Distance = 10000;
+                    emitterCustomLabel.Data = new List<LogicCalcuCustomLabelItem>()
                     {
-                        new CustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
-                        new CustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
+                        new LogicCalcuCustomLabelItem(){ Name="娴侀噺",Value=Math.Round(calcuEmitter.Demand,1).ToString(),Unit="m鲁/h"},
+                        new LogicCalcuCustomLabelItem(){ Name="鍘嬪姏",Value=Math.Round(calcuEmitter.Head,4).ToString(),Unit="m"}
                     };
                     obj.Add(emitterCustomLabel);
                 }

--
Gitblit v1.9.3