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

Shuxia Ning

2024-12-09 f97b3ccbfd63b62ec875223fcc417633f6ce2989

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs

@@ -58,7 +58,7 @@
            var vm = CreateViewModel();
            if (vm != null)
            {
                this.pumpVariableSpeedViewChart1.SetBindingData(vm);
                this.pumpRunViewChart1.SetBindingData(vm);
            }
        }

@@ -69,7 +69,7 @@
            var vm = CreateViewModel();
            if (vm != null)
            {
                this.pumpVariableSpeedViewChart1.SetBindingData(vm);
                this.pumpRunViewChart1.SetBindingData(vm);
            }
        }

@@ -93,6 +93,7 @@
            vm.RatedP = _pumpInfo.RatedP;
            vm.RatedN = _pumpInfo.RatedN.HasValue ? _pumpInfo.RatedN.Value : 0;
            vm.RatedHz = _pumpInfo.RatedHz;
            vm.Color = Color.LightGray;

            var curveqh = _hydroInfo.Curves?.Find(x => x.Code == _pumpInfo.CurveQH);
            if (curveqh != null)
@@ -140,6 +141,7 @@
                            vmItem.Id = working.ID.ToString();
                            vmItem.Name = working.Name;
                            vmItem.Hz = workingPumpInfo.CurrentHz;
                            vmItem.Color = HydroPumpCurveColorHelper.GetRandomColor(_workingList.IndexOf(working));
                            if (_pumpInfo.RatedN.HasValue)
                            {
                                var speedRatio = workingPumpInfo.CurrentHz / _pumpInfo.RatedHz;