From e7df5d1ece7ecabaa7a3943f24a6621649fdc455 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 13 一月 2025 16:08:11 +0800
Subject: [PATCH] 增加批量添加,修改阀门界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index d790851..324f56e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -1,11 +1,4 @@
-锘縰sing HStation.CAL;
-using HStation.WinFrmUI.PhartRelation;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Linq;
-using System.Windows.Input;
-using Yw.WinFrmUI.Q3d;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public class AssetsMatchingHelper
{
@@ -424,33 +417,32 @@
{
input.MatchingValveSetting = valve.ValveSetting;
}
- input.MatchingValveType = (Yw.WinFrmUI.eValveType)(int)valve.ValveType;
if (input.CurveDbId == null)
{
- var list = Task.Run(async () =>
- await new BLL.PhartDiagramRelation().GetExByObjectTypeAndObjectID(HStation.Assets.DataType.ValveMain, valve.ID)).Result;
- if (list != null && list.Count > 0)
- {
- var def = list.OrderByDescending(x => x.Importance).First();
- input.MatchingCurveDbId = def.ID.ToString();
- var curve = def.Diagram.GraphList[0].GetFeatPointList();
- if (valve.ValveType == HStation.Assets.eValveType.GPV)
+ /* var list = Task.Run(async () =>
+ await new BLL.PhartDiagramRelation().GetExByObjectTypeAndObjectID(HStation.Assets.DataType.ValveMain, valve.ID)).Result;
+ if (list != null && list.Count > 0)
{
- input.MatchingCurveQL = new List<HydroCurvePointViewModel>();
- foreach (var item in curve)
+ var def = list.OrderByDescending(x => x.Importance).First();
+ input.MatchingCurveDbId = def.ID.ToString();
+ var curve = def.Diagram.GraphList[0].GetFeatPointList();
+ if (valve.ValveType == HStation.Assets.eValveType.GPV)
{
- input.MatchingCurveQL.Add(new HydroCurvePointViewModel(item.X, item.Y));
+ input.MatchingCurveQL = new List<HydroCurvePointViewModel>();
+ foreach (var item in curve)
+ {
+ input.MatchingCurveQL.Add(new HydroCurvePointViewModel(item.X, item.Y));
+ }
}
- }
- else if (valve.ValveType == HStation.Assets.eValveType.TCV)
- {
- input.MatchingCurveOL = new List<HydroCurvePointViewModel>();
- foreach (var item in curve)
+ else if (valve.ValveType == HStation.Assets.eValveType.TCV)
{
- input.MatchingCurveOL.Add(new HydroCurvePointViewModel(item.X, item.Y));
+ input.MatchingCurveOL = new List<HydroCurvePointViewModel>();
+ foreach (var item in curve)
+ {
+ input.MatchingCurveOL.Add(new HydroCurvePointViewModel(item.X, item.Y));
+ }
}
- }
- }
+ }*/
}
return true;
@@ -1977,10 +1969,6 @@
if (input.StartDiameter < 0)
{
input.MatchingStartDiameter = translation.StartDiameter;
- }
- if (input.Diameter < 0)
- {
- input.MatchingDiameter = translation.Diameter;
}
return true;
--
Gitblit v1.9.3