From 467578cbe7f027c14ceba0aed16fb827b94e2c65 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 07 三月 2025 09:41:58 +0800
Subject: [PATCH] pbs-为登录静态类赋值
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 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 1c5abe5..04eddc2 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
@@ -442,7 +442,7 @@
{
var opening = Yw.WinFrmUI.PhartGraphHelper.GetGraphParas<Yw.WinFrmUI.Phart.QLGraphParasViewModel>((Yw.Ahart.eCurveType)def.Diagram.GraphList[i].GraphType, def.Diagram.GraphList[i].GraphParas);
var model = new HydroFactorCurveViewModel();
- model.CurveFactor = opening.Opening;
+ model.CurveFactor = opening.Opening ?? 0;
model.CurveData = new List<HydroCurvePointViewModel>();
foreach (var item in curve)
{
@@ -1841,6 +1841,7 @@
public static bool Matching(HydroPressmeterMatchingViewModel input, List<AssetsPressmeterMainVmo> pressmeterVmos)
{
//杈撳叆鍙傛暟楠岃瘉
+
if (input == null)
{
return false;
@@ -2037,11 +2038,11 @@
{
input.MatchingMaterial = translation.Material;
}
- if (input.MinorLoss < 0)
+ if (input.MinorLoss <= 0)
{
input.MatchingMinorLoss = translation.MinorLoss;
}
- if (input.Roughness < 0)
+ if (input.Roughness <= 0)
{
input.MatchingRoughness = translation.Roughness;
}
@@ -2053,6 +2054,7 @@
{
input.MatchingStartDiameter = translation.StartDiameter;
}
+ input.MatchingTranslationType = (Yw.WinFrmUI.eTranslationType)(int)translation.TranslationType;
return true;
}
--
Gitblit v1.9.3