From ff457d72c09f3f0d49e6b79d9461bf596e8945bf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 10 十二月 2024 17:34:31 +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/06-simulation/XhsProjectSimulationCorePage.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 5907903..a868760 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1540,6 +1540,13 @@
return _monitorHelper;
}
+ //鑾峰彇鐩戞祴鐐瑰垪琛�
+ private async Task<List<HydroMonitorVmo>> GetMonitorList()
+ {
+ var helper = GetMonitorHelper();
+ return await helper.Get();
+ }
+
//璁剧疆鐩戞祴鐐瑰垪琛�
private async void SetMonitorList(HydroVisualInfo visual)
{
@@ -1599,7 +1606,7 @@
private void ResetMonitorValue()
{
var allWorkingList = GetWorkingList();
- var working = allWorkingList?.Last(x => !string.IsNullOrEmpty(x.MonitorInfo));
+ var working = allWorkingList?.LastOrDefault(x => !string.IsNullOrEmpty(x.MonitorInfo));
if (working != null)
{
var helper = GetMonitorValueHelper();
@@ -2263,7 +2270,7 @@
return;
}
SimulationWordReport word = new SimulationWordReport();
- word.Create(fileName);
+ //word.Create(fileName);
}
#endregion
@@ -2458,8 +2465,9 @@
}
//鑳芥晥鍒嗘瀽
- private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ var allMonitorList = await GetMonitorList();
var workingCheckedListHelper = GetWorkingCheckedListHelper();
var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
@@ -2471,14 +2479,14 @@
return;
}
var dlg = new SimulationSingleWorkingEnergyDlg();
- dlg.SetBindingData(workingHelper.Working, workingHelper.HydroInfo, workingHelper.CalcuResult);
+ dlg.SetBindingData(workingHelper.Working, workingHelper.HydroInfo, allMonitorList, workingHelper.CalcuResult);
dlg.ShowDialog();
}
else
{
var dlg = new SimulationMultiWorkingEnergyDlg();
- dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
+ dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
dlg.ShowDialog();
}
}
--
Gitblit v1.9.3