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/12-report/02-helper/SimulationWorkingReportDlg.cs | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportDlg.cs index be13d55..64363db 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportDlg.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/02-helper/SimulationWorkingReportDlg.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Yw.DiagramFile; using Yw.Model; using Yw.Vmo; @@ -22,9 +23,7 @@ this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent; } - - - public event Action<SimulationWorkingReportViewModel> ReloadDataEvent; + public event Action<HStation.ReportFile.SimulationWorkingReportViewModel> ReloadDataEvent; /// <summary> /// 缁戝畾鏁版嵁 @@ -37,7 +36,7 @@ HydroWorkingVmo working, HydroCalcuResult calcuResult, HydroVisualInfo visual - ) + ) { this.simulationWorkingReportCtrl1.SetBindingData(project, hydroInfo, allMonitorList, working, calcuResult, visual); } @@ -48,10 +47,6 @@ this.ReloadDataEvent?.Invoke(vm); this.DialogResult = DialogResult.OK; this.Close(); - } - - - } } \ No newline at end of file -- Gitblit v1.9.3