From 7d17fabc46e87ea0f0896f760034f4d16a4dfed0 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期五, 20 九月 2024 13:20:57 +0800 Subject: [PATCH] 提交修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs index d8a7f32..c56496b 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs @@ -261,7 +261,49 @@ //鑷姩鍖归厤 private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - var dlg = new AssetsAutoMatchingMainDlg(new AssetsAutoMatchingInputViewModel()); + // _hydroInfo + var pump = _hydroInfo.Pumps; + var threelinks = _hydroInfo.Threelinks; + var aa = new AssetsAutoMatchingInputViewModel(); + foreach (var item in pump) + { + aa = new AssetsAutoMatchingInputViewModel + { + PumpMatchingModels = new List<PumpMatchingViewModel> + { + new PumpMatchingViewModel + { + RatedH = item.RatedH, // 鍋囪item宸茬粡瀹氫箟骞朵笖鍖呭惈浜哛atedH绛夊睘鎬� + RatedP = item.RatedP, + RatedQ = item.RatedQ, + RatedN = item.RatedN, + ModelType=item.ModelType, + DbID=item.DbId, + DbLocked=item.DbLocked + } + } + }; + } + foreach (var item in threelinks) + { + aa = new AssetsAutoMatchingInputViewModel + { + ThreeLinkMatchingModels = new List<ThreeLinkMatchingViewModel> + { + new ThreeLinkMatchingViewModel + { + Caliber=item.Caliber, + Material=item.Material, + ModelType=item.ModelType, + DbLocked=item.DbLocked, + ID=item.ID, + Code=item.Code, + MinorLoss=item.MinorLoss + } + } + }; + } + var dlg = new AssetsAutoMatchingMainDlg(aa); dlg.ShowDialog(); } @@ -285,6 +327,5 @@ _parter = allParterList.Find(x => x.Code == obj); ShowProperty(); } - } } \ No newline at end of file -- Gitblit v1.9.3