From c7621b10414bcba9031acb29f0de3af9a1a7a751 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 12 三月 2025 08:44:30 +0800
Subject: [PATCH] 监测分析bug修复
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs | 7 +++----
Desktop/HStation.Desktop.Xhs.Core/Program.cs | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/Program.cs b/Desktop/HStation.Desktop.Xhs.Core/Program.cs
index dcf26b1..c4b8535 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/Program.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/Program.cs
@@ -158,7 +158,7 @@
//
private static void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
{
- throw new NotImplementedException();
+ //throw new NotImplementedException();
}
}
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs
index a52c471..c4abb7c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs
@@ -269,14 +269,13 @@
}
_dt.Columns.Add("UnitName", typeof(string));
- var monitorList = _allMonitorList?.Where(x => x.SourceType == Yw.Hydro.eSourceType.Analyse).ToList();
- monitorList = monitorList?.OrderBy(x => x.SortCode).ToList();
- if (monitorList != null && monitorList.Count > 0)
+ var allMonitorList = _allMonitorList?.OrderBy(x => x.SortCode).ToList();
+ if (allMonitorList != null && allMonitorList.Count > 0)
{
var allVisualDict = _hydroInfo?.GetVisualDict();
if (allVisualDict != null && allVisualDict.Count > 0)
{
- foreach (var monitor in monitorList)
+ foreach (var monitor in allMonitorList)
{
var visual = allVisualDict.GetValue(monitor.Parter);
if (visual == null)
--
Gitblit v1.9.3