Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2025-03-28 d5a2d7e66f9c8046bd88b8269e61aac5a2a265e2

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/monitor-analy/02-control/HydroMonitorAnalyListCtrl.cs

@@ -186,15 +186,14 @@
            _dt.Columns.Add("CalcuValue", typeof(string));
            _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)
                {
                    var allCalcuVisualDict = _allCalcuResultDict?.FirstOrDefault().Value?.GetVisualDict();
                    foreach (var monitor in monitorList)
                    foreach (var monitor in allMonitorList)
                    {
                        var visual = allVisualDict.GetValue(monitor.Parter);
                        if (visual == null)
@@ -270,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)