From 6f932c727fe72e5c3417812234371a35e7225a93 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 15 十月 2024 14:20:40 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..3fd37e4 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);
}
-
}
//鏄剧ず姘村姏妯℃嫙浜嬩欢
@@ -130,7 +130,7 @@
TipFormHelper.ShowWarn("姝ｅ湪寮�鍙戜腑锛屾暚璇锋湡寰�...");
}
- #endregion
+ #endregion 鍔熻兘闈㈡澘
#region TabbedView 鐩稿叧浜嬩欢澶勭悊绋嬪簭
@@ -412,5 +412,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