From f10f00cf1739b49fe51abfbb96093a2a2f66a65c Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期日, 19 一月 2025 17:56:36 +0800 Subject: [PATCH] 赋值问题报错修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs index c011712..2fa6eaa 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs @@ -1,16 +1,4 @@ -锘縰sing DevExpress.Mvvm.POCO; -using DevExpress.XtraEditors; -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; - -namespace HStation.WinFrmUI +锘縩amespace HStation.WinFrmUI { public partial class AssetsCompressorSingleMatchingDlg : DevExpress.XtraEditors.XtraForm { @@ -26,7 +14,7 @@ private HydroCompressorMatchingViewModel _input = null; /// <summary> - /// + /// /// </summary> public void SetBindingData(HydroCompressorMatchingViewModel input) { @@ -35,7 +23,7 @@ return; } _input = input; - this.assetsCompressorSingleMatchingCtrl1.SetBindingData(input.DbId); + this.assetsCompressorSingleMatchingCtrl1.SetBindingData(input.DbId, input.CurveDbId); } private void GeneralOkAndCancelCtrl1_OkEvent() @@ -50,14 +38,16 @@ return; } - _input.MatchingModelType = vm.Name; - _input.MatchingMaterial = vm.Material; - _input.MatchingDiameter = vm.Diameter; - _input.MinorLoss = vm.MinorLoss; + _input.MatchingModelType = vm.Vmo.Name; + _input.MatchingMaterial = vm.Vmo.Material; + _input.MatchingDiameter = vm.Vmo.Diameter; + _input.MatchingMinorLoss = vm.Vmo.MinorLoss; + _input.MatchingCurveQL = vm.MatchingCurve; + _input.MatchingDbId = vm.Vmo.ID.ToString(); + _input.MatchingCurveDbId = vm.MatchingCurveDbId; this.ReloadDataEvent?.Invoke(_input); this.DialogResult = DialogResult.OK; this.Close(); } - } } \ No newline at end of file -- Gitblit v1.9.3