From bcc7f0563d92efd7013ec36e1d9ad7871b631454 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 08 十一月 2024 14:52:00 +0800 Subject: [PATCH] 优化水力特性 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs index 247e86d..4379a1a 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs @@ -19,6 +19,7 @@ this.xhsProjectSimulationFunctionMgrCtrl1.ShowXhsProjectSimulationEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowXhsProjectSimulationEvent; this.xhsProjectSimulationFunctionMgrCtrl1.CreateXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CreateXhsProjectSchemeEvent; this.xhsProjectSimulationFunctionMgrCtrl1.CompareXhsProjectSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CompareXhsProjectSchemeEvent; + PumpFullInfoViewDlg.JumpPumpFullInfoCtrl += ShowPumpInfo; } private long _projectId;//椤圭洰id @@ -88,7 +89,6 @@ await page.SetBindingData(_project, _projectSite, _hydroInfo); CreatePage(page, guid); } - } //鏄剧ず姘村姏妯℃嫙浜嬩欢 @@ -115,12 +115,16 @@ { return; } - var dlg = new AddXhsProjectSimulationSchemeDlg(); - await dlg.SetBindingData(_projectSite.ID); - dlg.ReloadDataEvent += (scheme) => - { - this.xhsProjectSimulationFunctionMgrCtrl1.AppendScheme(scheme); - }; + //var dlg = new AddXhsProjectSimulationSchemeDlg(); + //await dlg.SetBindingData(_projectSite.ID); + //dlg.ReloadDataEvent += (scheme) => + //{ + // this.xhsProjectSimulationFunctionMgrCtrl1.AppendScheme(scheme); + //}; + //dlg.ShowDialog(); + + var dlg = new AddXhsSchemeDlg(); + await dlg.SetBindingData(_project, _projectSite, _hydroInfo); dlg.ShowDialog(); } @@ -130,7 +134,7 @@ TipFormHelper.ShowWarn("姝e湪寮�鍙戜腑锛屾暚璇锋湡寰�..."); } - #endregion + #endregion 鍔熻兘闈㈡澘 #region TabbedView 鐩稿叧浜嬩欢澶勭悊绋嬪簭 @@ -412,5 +416,19 @@ } #endregion Page + + private void ShowPumpInfo(PumpFullInfoCtrl pumpFullInfoCtrl) + { + var guid = new PageGuid() + { + Modular = this.PageGuid.Modular, + MoudingType = eMoudingType.Tab, + Function = "xhs-project-pump-info", + }; + if (!IsExistPage(guid, true)) + { + CreatePage(pumpFullInfoCtrl, guid); + } + } } } \ No newline at end of file -- Gitblit v1.9.3