From ca1ccd0dd9f2d6936368f07d14a2b29b309fd151 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期三, 04 十二月 2024 15:59:25 +0800 Subject: [PATCH] 增加单独匹配界面 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/02-valve/SetSchemeValveListCtrl.cs | 134 ++++++++++++++++++++++---------------------- 1 files changed, 67 insertions(+), 67 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/02-valve/SetSchemeValveListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/02-valve/SetSchemeValveListCtrl.cs index f7704a7..93a0c0f 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/02-valve/SetSchemeValveListCtrl.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/02-valve/SetSchemeValveListCtrl.cs @@ -29,6 +29,7 @@ /// 姘村姏鐐瑰嚮浜嬩欢 /// </summary> public event Action<Yw.Model.HydroParterInfo> HydroClickEvent; + /// <summary> /// 姘村姏鏀瑰彉浜嬩欢 /// </summary> @@ -61,8 +62,10 @@ //姘村姏淇℃伅 private Yw.Model.HydroModelInfo _hydroInfo = null; + //鎵�鏈夊垪琛� private List<HydroValveViewModel> _allList = null; + //鎵�鏈夌粦瀹氬垪琛� private List<HydroValveViewModel> _allBindingList = null; @@ -226,80 +229,77 @@ //璁剧疆 private void SelectChange() { - if (_hydroInfo == null) - { - XtraMessageBox.Show("鏃犳按鍔涗俊鎭�"); - return; - } - Search(); - var row = this.gridView1.GetFocusedRow() as HydroValveViewModel; - if (row == null) - { - XtraMessageBox.Show("鏃犲彲璁剧疆闃�闂ㄦ暟鎹�"); - return; - } + /* if (_hydroInfo == null) + { + XtraMessageBox.Show("鏃犳按鍔涗俊鎭�"); + return; + } + Search(); + var row = this.gridView1.GetFocusedRow() as HydroValveViewModel; + if (row == null) + { + XtraMessageBox.Show("鏃犲彲璁剧疆闃�闂ㄦ暟鎹�"); + return; + } - var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null); - var dlg = new ValveSingleMatchingDlg(); - dlg.SetBindingData(input); - dlg.ReloadDataEvent += (output) => - { - var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output); - if (bol) - { - UpdateProperty(); - } - }; - dlg.ShowDialog(); + var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null); + var dlg = new ValveSingleMatchingDlg(); + dlg.SetBindingData(input); + dlg.ReloadDataEvent += (output) => + { + var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output); + if (bol) + { + UpdateProperty(); + } + }; + dlg.ShowDialog();*/ } - //鍗曞厓鏍肩偣鍑� private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e) { - var row = this.gridView1.GetRow(e.RowHandle) as HydroValveViewModel; - if (row == null) - { - return; - } + /* var row = this.gridView1.GetRow(e.RowHandle) as HydroValveViewModel; + if (row == null) + { + return; + } - if (e.Column == this.colSelect) - { - var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null); - var dlg = new ValveSingleMatchingDlg(); - dlg.SetBindingData(input); - dlg.ReloadDataEvent += (output) => - { - var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output); - if (bol) - { - row.UpdateProperty(); - this.gridView1.RefreshRow(e.RowHandle); - this.HydroChangedEvent?.Invoke(new List<Yw.Model.HydroParterInfo>() { row.Vmo }); + if (e.Column == this.colSelect) + { + var input = AssetsMatchingParasHelper.Create(_hydroInfo, row.Vmo, null); + var dlg = new ValveSingleMatchingDlg(); + dlg.SetBindingData(input); + dlg.ReloadDataEvent += (output) => + { + var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, output); + if (bol) + { + row.UpdateProperty(); + this.gridView1.RefreshRow(e.RowHandle); + this.HydroChangedEvent?.Invoke(new List<Yw.Model.HydroParterInfo>() { row.Vmo }); - - var record = new SetSchemeParterRecord(); - record.Name = row.Vmo.Name; - record.Code = row.Vmo.Code; - record.Catalog = Yw.Hydro.ParterCatalog.Valve; - record.MatchingModel = output; - record.Items = new List<SetSchemeParterRecordItem>() { - new() {Name="鍨嬪彿",BeforeValue=$"{output.ModelType}",AfterValue=$"{output.MatchingModelType}"}, - new() {Name="鏉愭枡",BeforeValue=$"{output.Material}",AfterValue=$"{output.MatchingMaterial}"}, - new() {Name="鐩村緞锛坢m锛�",BeforeValue=$"{output.Diameter}",AfterValue=$"{output.MatchingDiameter}"}, - new() {Name="灞�闃荤郴鏁�",BeforeValue=$"{output.MinorLoss}",AfterValue=$"{output.MatchingMinorLoss}"}, - new() {Name="闃�闂ㄧ被鍨�",BeforeValue=$"{output.ValveType}",AfterValue=$"{output.MatchingValveType}"}, - }; - this.HydroRecordChangedEvent?.Invoke(record); - } - }; - dlg.ShowDialog(); - } - else - { - this.HydroClickEvent?.Invoke(row.Vmo); - } + var record = new SetSchemeParterRecord(); + record.Name = row.Vmo.Name; + record.Code = row.Vmo.Code; + record.Catalog = Yw.Hydro.ParterCatalog.Valve; + record.MatchingModel = output; + record.Items = new List<SetSchemeParterRecordItem>() { + new() {Name="鍨嬪彿",BeforeValue=$"{output.ModelType}",AfterValue=$"{output.MatchingModelType}"}, + new() {Name="鏉愭枡",BeforeValue=$"{output.Material}",AfterValue=$"{output.MatchingMaterial}"}, + new() {Name="鐩村緞锛坢m锛�",BeforeValue=$"{output.Diameter}",AfterValue=$"{output.MatchingDiameter}"}, + new() {Name="灞�闃荤郴鏁�",BeforeValue=$"{output.MinorLoss}",AfterValue=$"{output.MatchingMinorLoss}"}, + new() {Name="闃�闂ㄧ被鍨�",BeforeValue=$"{output.ValveType}",AfterValue=$"{output.MatchingValveType}"}, + }; + this.HydroRecordChangedEvent?.Invoke(record); + } + }; + dlg.ShowDialog(); + } + else + { + this.HydroClickEvent?.Invoke(row.Vmo); + }*/ } - } -} +} \ No newline at end of file -- Gitblit v1.9.3