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

lixiaojun

2024-10-29 1d8832e8e8e862a296f80c18ae2f1dac40419b68

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs

@@ -132,33 +132,37 @@
            var run_list = this.pumpParallelInfoCtrl1.GetRunList();  
            var msg = SetParallel(run_list);
            if (!string.IsNullOrEmpty(msg))
            {
                 //TipFormHelper.ShowWarn(msg);
                return msg;
            }
            return string.Empty;
        }
         

        private string SetParallel(List<Yw.WinFrmUI.Phart.PumpSerialParallelInfoViewModel> list)
        {
            this.pumpSerialParallelChart.Delete();
            if (list == null || !list.Any())
            {
                return "无数据!";
            } 
            }
            if (list.Count < 2)
            {
                Set(list);
                return "无法计算 并联曲线!";
            }
            var msg = string.Empty;
            var vm_parallel = CalcParallel(list);
            if (vm_parallel != null)
            {
                list.Add(vm_parallel);
                Set(list);   
                return string.Empty;
            }
            else
            {
                return "无法计算 并联曲线!";
                msg = "无法计算 并联曲线!";
            }
            Set(list);
            return msg;
        }