From 97a43bf839f59cdda1641d61706e6e71a0c5e172 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 24 十二月 2024 23:54:17 +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/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
index ca8ad48..c61b8a6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs
@@ -33,6 +33,8 @@
private AssetsValveSingleMatchingViewModel _row;
private ValveMatchingViewModel _viewModel;
+ private long _curveDbId;
+
public class ValveMatchingViewModel
{
public ValveMatchingViewModel()
@@ -49,7 +51,7 @@
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public async void SetBindingData(string dbId)
+ public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsValveMain>.Instance.GetAll();
_allList = new List<AssetsValveSingleMatchingViewModel>();
@@ -58,6 +60,10 @@
{
var item = allList?.Find(x => x.ID == id);
_selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbId = curveId;
}
Search();
await Task.Delay(300);
@@ -139,15 +145,14 @@
}
_row = row;
_viewModel.Vmo = row.Vmo;
- this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ValveMain, row.Vmo.ID);
+ this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ValveMain, row.Vmo.ID, _curveDbId);
}
//鏇茬嚎鏁版嵁鍏宠仈鍙樺寲
- private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
+ private void SelectData(PhartDiagramRelationExtensionsVmo def)
{
- if (list != null && list.Count > 0)
+ if (def != null)
{
- var def = list.OrderByDescending(x => x.Importance).First();
_viewModel.MatchingCurveDbId = def.ID.ToString();
var curve = def.Diagram.GraphList[0].GetFeatPointList();
if (_row.ValveType == HStation.Assets.eValveType.GPV)
--
Gitblit v1.9.3