From cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b Mon Sep 17 00:00:00 2001 From: duheng <2286773002@qq.com> Date: 星期三, 12 三月 2025 10:21:09 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs index cd8a96a..e0ee3e4 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/01-core/HydroMonitorAnalyHelper.cs @@ -34,14 +34,6 @@ var vm = new HydroMonitorAnalyViewModel(); - - //杩囨护娴嬬偣锛屼粎闇�瑕佸垎鏋愭祴鐐� - var monitorList = allMonitorList.Where(x => x.SourceType == Yw.Hydro.eSourceType.Analyse).ToList(); - if (monitorList == null || monitorList.Count < 1) - { - return vm; - } - //鏋勪欢鍒楄〃 var allVisualDict = hydroInfo.GetVisualDict(); if (allVisualDict == null || allVisualDict.Count < 1) @@ -63,7 +55,7 @@ //閬嶅巻娴嬬偣 vm.Items = new List<HydroMonitorAnalyItemViewModel>(); - foreach (var monitor in monitorList) + foreach (var monitor in allMonitorList) { var item = new HydroMonitorAnalyItemViewModel(monitor, allVisualDict, allCalcuVisualDict); vm.Items.Add(item); -- Gitblit v1.9.3