From 6936ebf1dfbd0025d3e86ae7dde316b6a6e43b9b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 16:40:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs | 21 +++++++++++++--------
1 files changed, 13 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 74ca6ac..f437feb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -217,7 +217,7 @@
Modular = this.PageGuid.Modular,
MoudingType = eMoudingType.Tab,
Function = SimulationFunctionHelper.Simulation,
- TagName = projectSite.ID.ToString()
+ TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}"
};
var page = FindPage(guid);
if (page == null)
@@ -300,20 +300,25 @@
SvgImage svgImage
)
{
+ //WaitFormHelper.ShowWaitForm(this.FindForm(), "姝ｅ湪鍔犺浇妯″瀷锛岃绋嶄警...");
+ //var dlg = new AddXhsSchemeDlg();
+ //dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
+ //dlg.ReloadDataEvent += (rhs) =>
+ //{
+ // this.simulationFunctionMgrCtrl1.AppendScheme(rhs);
+ //};
+ //dlg.SetBindingData(project, projectSite, hydroInfo);
+ //dlg.ShowDialog();
+
WaitFormHelper.ShowWaitForm(this.FindForm(), "姝ｅ湪鍔犺浇妯″瀷锛岃绋嶄警...");
- var dlg = new AddXhsSchemeDlg();
+ var dlg = new CreateXhsSchemeDlg();
dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
+ dlg.SetBindingData(project, projectSite, hydroInfo);
dlg.ReloadDataEvent += (rhs) =>
{
this.simulationFunctionMgrCtrl1.AppendScheme(rhs);
};
- dlg.SetBindingData(project, projectSite, hydroInfo);
dlg.ShowDialog();
-
- //var dlg = new CreateXhsSchemeDlg();
- //dlg.Shown += delegate { WaitFormHelper.HideWaitForm(this.FindForm()); };
- //dlg.SetBindingData(project, projectSite, hydroInfo);
- //dlg.ShowDialog();
}
//椤圭洰绔欐柟妗堝鍔犱簨浠�
--
Gitblit v1.9.3