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/06-simulation/XhsProjectSimulationCorePage.cs

@@ -32,6 +32,7 @@

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
        private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//项目站
        private HStation.Vmo.XhsSchemeVmo _scheme = null;//方案
        private Yw.Model.HydroModelInfo _hydroInfo = null;//水力信息
        private Dictionary<HydroWorkingVmo, bool> _allWorkingCheckedListDict = null;//所有工况选择列表字典

@@ -42,12 +43,14 @@
            (
                XhsProjectVmo project,
                XhsProjectSiteVmo projectSite,
                XhsSchemeVmo scheme,
                Yw.Model.HydroModelInfo hydroInfo,
                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
            )
        {
            _project = project;
            _projectSite = projectSite;
            _scheme = scheme;
            _hydroInfo = hydroInfo;
            _allWorkingCheckedListDict = allWorkingCheckedListDict;
        }
@@ -66,10 +69,10 @@
        #region BIM控件

        //bimface控件
        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
        private SimulationBimfaceCtrl _bimfaceCtrl = null;

        //获取 bimface 控件
        private async Task<XhsProjectSimulationBimfaceCtrl> GetBimfaceCtrl()
        private async Task<SimulationBimfaceCtrl> GetBimfaceCtrl()
        {
            if (_hydroInfo == null)
            {
@@ -78,7 +81,7 @@
            if (_bimfaceCtrl == null)
            {
                var overlay = this.ShowOverlay();
                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                _bimfaceCtrl = new SimulationBimfaceCtrl();
                _bimfaceCtrl.Dock = DockStyle.Fill;
                await _bimfaceCtrl.InitialData(_project, _projectSite);
                _bimfaceCtrl.LoadCompletedEvent += () =>
@@ -147,10 +150,10 @@
        #region 属性控件

        //属性控件
        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
        private SimulationPropertyCtrl _propertyCtrl = null;

        //获取属性控件
        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
        private SimulationPropertyCtrl GetPropertyCtrl()
        {
            if (_hydroInfo == null)
            {
@@ -158,8 +161,9 @@
            }
            if (_propertyCtrl == null)
            {
                _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                _propertyCtrl = new SimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
                _propertyCtrl.AllowEdit = true;
                _propertyCtrl.HydroViewEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Property);
@@ -246,7 +250,7 @@
                {
                    if (this.controlContainerRight.Controls.Count > 0)
                    {
                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
                        if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
                        {
                            return true;
                        }
@@ -278,21 +282,13 @@
            var visualVmListHelper = GetVisualVmListHelper();
            var vm = visualVmListHelper.GetVisual(visual);
            _propertyCtrl.SelectedObject = vm;
            _propertyCtrl.UpdateRows();
        }

        //更新属性控件
        private void UpdatePropertyCtrl()
        {
            _propertyCtrl?.UpdateRows();
        }

        //清理属性控件
        private void ClearPropertyCtrl()
        {
            if (_propertyCtrl != null)
            {
                _propertyCtrl.SelectedObject = null;
            }
        }

        #endregion
@@ -423,6 +419,20 @@
            return _visualListHelper;
        }

        //获取可见列表
        private List<Yw.Model.HydroVisualInfo> GetVisualList()
        {
            var helper = GetVisualListHelper();
            return helper.GetVisualList();
        }

        //获取水源列表
        private List<Yw.Model.HydroSourceInfo> GetSourceList()
        {
            var helper = GetVisualListHelper();
            return helper.GetSourceList();
        }

        #endregion

        #region 视图列表
@@ -444,6 +454,13 @@
                _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
            }
            return _visualVmListHelper;
        }

        //获取可见视图列表
        private List<HydroVisualViewModel> GetVisualViewModelList()
        {
            var helper = GetVisualVmListHelper();
            return helper.GetVisualList();
        }

        #endregion
@@ -662,12 +679,9 @@
            //水库
            this.barBtnSetReservoirList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroReservoirListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -675,18 +689,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //水池
            this.barBtnSetTankList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroTankListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -694,18 +706,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //水箱
            this.barBtnSetWaterboxList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroWaterboxListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -713,18 +723,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //连接节点
            this.barBtnSetJunctionList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroJunctionListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -732,18 +740,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //闷头
            this.barBtnSetBluntheadList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroBluntheadListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -751,18 +757,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //弯头
            this.barBtnSetElbowsList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualVmList = GetVisualViewModelList();
                var dlg = new SetHydroElbowListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualVmList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -770,18 +774,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //三通
            this.barBtnSetThreelinkList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroThreelinkListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -789,18 +791,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //四通
            this.barBtnSetFourlinkList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroFourlinkListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -808,18 +808,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //水表
            this.barBtnSetMeterList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroMeterListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -827,18 +825,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //流量计
            this.barBtnSetFlowmeterList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroFlowmeterListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -846,18 +842,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //压力表
            this.barBtnSetPressmeterList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroPressmeterListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -865,18 +859,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //管道
            this.barBtnSetPipeList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroPipeListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -884,18 +876,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //过渡件
            this.barBtnSetTranslationList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroTranslationListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -903,18 +893,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //水泵
            this.barBtnSetPumpList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroPumpListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -922,18 +910,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //阀门
            this.barBtnSetValveList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroValveListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -941,18 +927,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //换热器
            this.barBtnSetExchangerList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroExchangerListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -960,18 +944,16 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
            //换热器
            this.barBtnSetCompressorList.ItemClick += delegate
            {
                if (_hydroInfo == null)
                {
                    return;
                }
                var allVisualViewModelList = GetVisualViewModelList();
                var dlg = new SetHydroCompressorListDlg();
                dlg.SetBindingData(_hydroInfo);
                dlg.SetBindingData(allVisualViewModelList);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Set);
@@ -979,6 +961,7 @@
                dlg.HydroChangedInfoEvent += visuals =>
                {
                    SelectVisual(visuals?.FirstOrDefault(), eVisualSource.Set);
                    UpdateVisualListCtrl();
                };
                dlg.ShowDialog();
            };
@@ -2020,12 +2003,37 @@
        #region 水泵列表

        //性能曲线
        private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private void PumpFeat()
        {

            if (_hydroInfo == null)
            {
                return;
            }
            var pumps = _hydroInfo.Pumps;
            if (pumps == null || pumps.Count < 1)
            {
                XtraMessageBox.Show("无水泵信息");
                return;
            }
            var dlg = new SimulationPumpFeatDlg();
            dlg.SaveEvent += async (list) =>
            {
                pumps.ForEach(x => x.UpdateWorkingInfo(list));
                var visualVmListHelper = GetVisualVmListHelper();
                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
                SelectVisual(_visual, eVisualSource.None);
                var gradingHelper = await GetGradingHelper();
                gradingHelper.Set();
            };
            dlg.SetBindingData(_hydroInfo);
            dlg.ShowDialog();
        }

        #region 并联模拟
        //性能曲线
        private void barBtnPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            PumpFeat();
        }

        //并联模拟
        private void PumpParallel()
@@ -2040,71 +2048,34 @@
                XtraMessageBox.Show("无水泵信息");
                return;
            }
            var vmList = new List<XhsSinglePumpViewModel>();
            foreach (var pump in pumps)
            {
                if (!pump.RatedN.HasValue)
                {
                    continue;
                }
                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
                if (qh == null)
                {
                    continue;
                }

                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();

                var vm = new XhsSinglePumpViewModel();
                vmList.Add(vm);
                vm.ID = pump.ID;
                vm.Name = pump.Name;
                vm.Code = pump.Code;
                vm.IsBp = true;
                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
                vm.RatedHz = pump.RatedHz;
                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
                vm.RatedSpeed = pump.RatedN.Value;
                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
                vm.CurveQH = qhPtList;
                vm.CurveQE = qePtList;
                vm.CurveQP = qpPtList;

            }

            var dlg = new PumpParallelAnalyDlg();
            dlg.SetBindingData(vmList);
            dlg.ReloadDataEvent += (list) =>
            var dlg = new SimulationPumpParallelDlg();
            dlg.SaveEvent += async (list) =>
            {
                list?.ForEach(x =>
                {
                    var pump = pumps.Find(t => t.Code == x.Code);
                    if (pump != null)
                    {
                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
                        pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
                        pump.LinkStatus = x.LinkStatus;
                        pump.SpeedRatio = x.SpeedRatio;
                    }
                });
                var codes = list?.Select(x => x.Code).ToList();
                //UpdateVisualViewModelProperty(codes);
                //ShowSelectedProperty();
                UpdateVisualListCtrl();
                return true;
                var visualVmListHelper = GetVisualVmListHelper();
                visualVmListHelper.UpdateProperty(pumps.Select(x => x as Yw.Model.HydroVisualInfo).ToList());
                SelectVisual(_visual, eVisualSource.None);
                var gradingHelper = await GetGradingHelper();
                gradingHelper.Set();
            };
            dlg.SetBindingData(_hydroInfo);
            dlg.ShowDialog();
        }

        //并联模拟
        private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {

            PumpParallel();
        }

        #endregion

        #endregion

@@ -2154,7 +2125,7 @@
                }

                WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");
                //await Task.Delay(3000);
                await Task.Delay(3000);
                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
                WaitFormHelper.HideWaitForm();
                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
@@ -2180,9 +2151,22 @@

                #endregion

                #region 当前构件

                SelectVisual(_visual, eVisualSource.Calcu);

                #endregion

                #region 构件明细

                UpdateVisualListCtrl();

                #endregion

                #region 颜色分级

                var gradingHelper = await GetGradingHelper();
                gradingHelper.Set();

                #endregion

@@ -2258,6 +2242,7 @@
            {
                this.barBtnAddWorking.Enabled = false;
                workingHelper.ResetWorking(rhs);
                UpdateWorkingCheckedList(rhs, false);
                this.AppendWorkingEvent?.Invoke(rhs);
            };
            dlg.ShowDialog();
@@ -2289,10 +2274,24 @@
        }

        //更新工况选择列表
        public void UpdateWorkingCheckedList(HydroWorkingVmo working)
        {
            var helper = GetWorkingCheckedListHelper();
            helper.Update(working);
        }

        //更新工况选择列表
        public void UpdateWorkingCheckedList(HydroWorkingVmo working, bool hasChecked)
        {
            var helper = GetWorkingCheckedListHelper();
            helper.Update(working, hasChecked);
        }

        //移除工况选择列表
        public void RemoveWorkingCheckedList(HydroWorkingVmo working)
        {
            var helper = GetWorkingCheckedListHelper();
            helper.Remove(working);
        }


@@ -2331,92 +2330,26 @@
        //水泵分析
        private void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            {
                return;
            }
            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
            {
                return;
            }

            var calcuResultHelper = GetCalcuResultHelper();
            var vmList = new List<XhsSinglePumpViewModel>();
            foreach (var pump in _hydroInfo.Pumps)
            {
                if (!pump.RatedN.HasValue)
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
                {
                    continue;
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
                if (qh == null)
                {
                    continue;
                }

                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();

                var vm = new XhsSinglePumpViewModel();
                vmList.Add(vm);
                vm.ID = pump.ID;
                vm.Name = pump.Name;
                vm.Code = pump.Code;
                vm.IsBp = true;
                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
                vm.RatedHz = pump.RatedHz;
                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
                vm.RatedSpeed = pump.RatedN.Value;
                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
                vm.CurveQH = qhPtList;
                vm.CurveQE = qePtList;
                vm.CurveQP = qpPtList;

                var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
                if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
                {
                    //var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
                    //if (calcuResult != null)
                    //{
                    //    if (calcuResult.CalcuFlow.HasValue)
                    //    {
                    //        vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
                    //    }

                    //    var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
                    //    var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
                    //    if (calcuResultStart != null && calcuResultEnd != null)
                    //    {
                    //        if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
                    //        {
                    //            vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
                    //        }
                    //    }
                    //}
                }

                var dlg = new SimulationSingleWorkingPumpAnalyDlg();
                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult);
                dlg.ShowDialog();
            }

            var dlg = new PumpParallelAnalyDlg();
            dlg.SetBindingData(vmList);
            dlg.ReloadDataEvent += (list) =>
            else
            {
                list?.ForEach(x =>
                {
                    var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
                    if (pump != null)
                    {
                        pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
                        pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
                    }
                });
                //ShowSelectedProperty();
                return true;
            };
            dlg.ShowDialog();
                var dlg = new SimulationMultiWorkingPumpAnalyDlg();
                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
                dlg.ShowDialog();
            }
        }

        //能效分析
@@ -2449,8 +2382,27 @@
        {
            if (_visual == null)
            {
                TipFormHelper.ShowWarn("请选择构件后重试！");
                return;
                var sources = GetSourceList();
                if (sources != null)
                {
                    if (sources.Count == 1)
                    {
                        SelectVisual(sources[0], eVisualSource.None);
                    }
                    else
                    {
                        var source = sources.FirstOrDefault(x => x.Flags.Contains(HStation.Xhs.Flags.进口));
                        if (source != null)
                        {
                            SelectVisual(source, eVisualSource.None);
                        }
                    }
                }
                if (_visual == null)
                {
                    TipFormHelper.ShowWarn("请选择构件后重试！");
                    return;
                }
            }
            HydroVisualInfo visual = _visual;
            if (_visual is HydroLinkInfo linkInfo)