From d6111ca1fa9f70afc50c8213f81c9d78c14a6527 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 22 一月 2025 14:37:21 +0800
Subject: [PATCH] 阀门单独匹配修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
index 6388691..0944a88 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs
@@ -1,15 +1,4 @@
-锘縰sing DevExpress.XtraBars.Ribbon.Drawing;
-using DevExpress.XtraEditors;
-using DevExpress.XtraMap;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+锘縰sing System.Data;
namespace HStation.WinFrmUI
{
@@ -20,7 +9,7 @@
InitializeComponent();
this.layoutControl1.SetupLayoutControl();
this.gridView1.SetLimitView();
- this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
+ this.gridView1.RegistCustomDrawCell();
this.generalSearchCtrl1.SearchEvent += Search;
this.generalSearchCtrl1.ClearEvent += Clear;
this.phartDiagramRelationGridViewCtrl1.SelectDataEvent += SelectData;
@@ -33,7 +22,7 @@
private AssetsTankSingleMatchingViewModel _row;
private TankMatchingViewModel _viewModel;
- private long _curveDbid;
+ private long? _curveDbid;
public class TankMatchingViewModel
{
@@ -53,18 +42,21 @@
public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsTankMain>.Instance.GetAll();
- _allList = new List<AssetsTankSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsTankSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsTankSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbid = curveId;
+ }
+ Search();
}
- if (long.TryParse(curveDbId, out long curveId))
- {
- _curveDbid = curveId;
- }
- Search();
await Task.Delay(300);
if (_selected != null)
{
--
Gitblit v1.9.3