增加BIMFACE水流动画效果

lixiaojun

2025-04-09 9aa8106d88fc3070498493e2819922f7ac31746e

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -2,10 +2,11 @@
using DevExpress.Mvvm.Native;
using DevExpress.Pdf.Native;
using Mapster;
using Yw.EPAnet;
using Yw.Epanet;
using Yw.Hydro;
using Yw.Model;
using Yw.Vmo;
using Yw.WinFrmUI.Bimface;

namespace HStation.WinFrmUI
{
@@ -20,20 +21,19 @@
            RegistBulkSetEvents();
        }



        #region 模型事件

        /// <summary>
        /// 获取模型事件
        /// </summary>
        public event Func<XhsSchemeVmo, Task<Yw.Model.HydroModelInfo>> GetModelEvent;

        /// <summary>
        /// 刷新模型事件
        /// </summary>
        public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;

        #endregion
        #endregion 模型事件

        #region 方案事件

@@ -41,12 +41,13 @@
        /// 更新方案事件
        /// </summary>
        public event Action<XhsSchemeVmo> UpdateSchemeEvent;

        /// <summary>
        /// 移除方案事件
        /// </summary>
        public event Action<XhsSchemeVmo> RemoveSchemeEvent;

        #endregion
        #endregion 方案事件

        #region 工况事件

@@ -54,20 +55,23 @@
        /// 新增工况事件
        /// </summary>
        public event Action<HydroWorkingVmo> AppendWorkingEvent;

        /// <summary>
        /// 更新工况事件
        /// </summary>
        public event Action<HydroWorkingVmo> UpdateWorkingEvent;

        /// <summary>
        /// 移除工况事件
        /// </summary>
        public event Action<HydroWorkingVmo> RemoveWorkingEvent;

        /// <summary>
        /// 重载工况事件
        /// </summary>
        public event Action<Dictionary<HydroWorkingVmo, bool>> ReloadWorkingEvent;

        #endregion
        #endregion 工况事件

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
        private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//项目站
@@ -112,7 +116,7 @@
        {
            base.InitialDataSource();
            ShowBimfaceCtrl();
            ShowQ3dCtrl();
            ShowL3d2Ctrl();
            ShowPropertyCtrl();
            InitialSvgImages();
        }
@@ -121,8 +125,7 @@
        private void InitialSvgImages()
        {
            //监测
            this.barBtnDockingMonitor.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Docking;
            this.barBtnAnalyseMonitor.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Analyse;
            this.barBtnSetMonitorList.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Docking;

            //水库
            this.barBtnSetReservoirList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
@@ -141,6 +144,12 @@
            this.barBtnSetWaterboxList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetWaterboxList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetWaterboxList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //连接节点
            this.barBtnSetJunctionList.ImageOptions.SvgImage = HydroMainSvgImageHelper.Junction;
            this.barBtnSetJunctionList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetJunctionList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetJunctionList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //闷头
            this.barBtnSetBluntheadList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Blunthead;
@@ -262,7 +271,7 @@
            return helper.GetPropStatusDbList();
        }

        #endregion
        #endregion 属性状态

        #region 更改状态

@@ -311,7 +320,7 @@
            return helper.GetRemoveParters();
        }

        #endregion
        #endregion 更改状态

        #region BIM控件

@@ -355,41 +364,41 @@
            this.tabPageBimface.Controls.Add(bimfaceCtrl);
        }

        #endregion
        #endregion BIM控件

        #region Q3d控件
        #region L3d2控件

        //Q3d 控件
        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
        //L3d2控件
        private XhsProjectSimulationL3d2Ctrl _l3d2ctrl = null;

        //获取 Q3d 控件
        private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
        //获取L3d2控件
        private XhsProjectSimulationL3d2Ctrl GetL3d2Ctrl()
        {
            if (_hydroInfo == null)
            {
                return default;
            }
            if (_q3dCtrl == null)
            if (_l3d2ctrl == null)
            {
                _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
                _q3dCtrl.Dock = DockStyle.Fill;
                _q3dCtrl.InitialData(() => _hydroInfo);
                _q3dCtrl.SelectedPartersChangedEvent += (codes) =>
                _l3d2ctrl = new XhsProjectSimulationL3d2Ctrl();
                _l3d2ctrl.Dock = DockStyle.Fill;
                _l3d2ctrl.InitialData(hydroInfoFunc: () => _hydroInfo);
                _l3d2ctrl.SelectedPartersChangedEvent += (codes) =>
                {
                    var visualListHelper = GetVisualListHelper();
                    var visuals = visualListHelper.GetVisualList(codes);
                    SelectVisual(visuals?.LastOrDefault(), eSimulationVisualSource.Q3d);
                };
            }
            return _q3dCtrl;
            return _l3d2ctrl;
        }

        //显示 Q3d 控件
        private void ShowQ3dCtrl()
        //显示L3d2控件
        private void ShowL3d2Ctrl()
        {
            var q3dCtrl = GetQ3dCtrl();
            var l3d2Ctrl = GetL3d2Ctrl();
            this.tabPageQ3d.Controls.Clear();
            this.tabPageQ3d.Controls.Add(q3dCtrl);
            this.tabPageQ3d.Controls.Add(l3d2Ctrl);
        }

        #endregion
@@ -480,6 +489,13 @@
                    var gradingHelper = await GetGradingHelper();
                    gradingHelper.Set(visual);
                };
                _propertyCtrl.FlowDirectionPropertyValueChangedEvent += async (visual) =>
                {
                    //流向属性发生改变
                    //判断当前是否有流向展示，若有则更新流向，最好是更新单个流向
                    var flowDirectionHelper = await GetFlowEffectHelper();
                    flowDirectionHelper.Set(visual);
                };
            }
            return _propertyCtrl;
        }
@@ -504,7 +520,7 @@
        }

        //显示属性控件
        private async void ShowPropertyCtrl()
        private async Task ShowPropertyCtrl()
        {
            if (IsPropertyCtrlVisible)
            {
@@ -519,9 +535,9 @@
        }

        //设置属性控件
        private void SetPropertyCtrl(HydroVisualInfo visual)
        private async void SetPropertyCtrl(HydroVisualInfo visual)
        {
            ShowPropertyCtrl();
            await ShowPropertyCtrl();
            var visualVmListHelper = GetVisualVmListHelper();
            var vm = visualVmListHelper.GetVisual(visual);
            _propertyCtrl.SelectedObject = vm;
@@ -550,16 +566,14 @@
                case eSimulationVisualSource.None:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;

                case eSimulationVisualSource.Bimface:
                    {
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -567,8 +581,7 @@
                case eSimulationVisualSource.Q3d:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -576,16 +589,14 @@
                case eSimulationVisualSource.Property:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                    }
                    break;

                case eSimulationVisualSource.List:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -593,8 +604,7 @@
                case eSimulationVisualSource.Set:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -602,8 +612,7 @@
                case eSimulationVisualSource.Search:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -611,8 +620,7 @@
                case eSimulationVisualSource.Monitor:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -620,8 +628,7 @@
                case eSimulationVisualSource.Check:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -629,8 +636,7 @@
                case eSimulationVisualSource.Calcu:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -638,8 +644,7 @@
                case eSimulationVisualSource.Warning:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        this.barBtnSetMonitorList.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -704,7 +709,7 @@
            return helper.GetSourceList();
        }

        #endregion
        #endregion 可见列表

        #region 视图列表

@@ -741,7 +746,7 @@
            return helper.GetVisual(code);
        }

        #endregion
        #endregion 视图列表

        #region 明细控件

@@ -843,7 +848,7 @@
            ShowVisualListCtrl();
        }

        #endregion
        #endregion 明细控件

        #region 构件显示

@@ -894,7 +899,7 @@

        #endregion 构件显示

        #endregion
        #endregion 构件明细

        #region 一键显隐

@@ -944,6 +949,7 @@

        //保存锁定对象
        private object _locker_save = new();

        private bool _isSaving = false;//正在保存

        //保存
@@ -986,10 +992,18 @@

            WaitFormHelper.ShowWaitForm("正在保存，请稍后...");

            bool bol = false;

            var bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
            try
            {
                bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
                .Update(_hydroInfo, addParterList, updateParterList, removeParters);

            }
            catch (Exception ex)
            {
                XtraMessageBox.Show(ex.Message);
                _isSaving = false;
            }

            if (!bol)
            {
@@ -1612,7 +1626,7 @@
            }
        }

        #endregion
        #endregion 批量配置

        #region 构件查询

@@ -1757,6 +1771,41 @@

        #endregion

        #region 水流动画


        //水力动画辅助类
        private SimulationFlowEffectHelper _flowEffectHelper = null;

        //获取水流动画辅助类
        private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
        {
            if (_flowEffectHelper == null)
            {
                var visualListHelper = GetVisualListHelper();
                var calcuResultHelper = GetCalcuResultHelper();
                var bimfaceCtrl = await GetBimfaceCtrl();
                _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
            }
            return _flowEffectHelper;
        }


        //水流动画是否可见
        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (this.barCkFlowEffect.Checked)
            {
                this.barCkGrading.Checked = false;
            }
            var flowEffectHelper = await GetFlowEffectHelper();
            flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
            flowEffectHelper.Set();

        }

        #endregion

        #region 颜色分级

        //颜色分级辅助类
@@ -1832,6 +1881,10 @@
        //颜色分级展示
        private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (this.barCkGrading.Checked)
            {
                this.barCkFlowEffect.Checked = false;
            }
            var gradingHelper = await GetGradingHelper();
            gradingHelper.Visible = this.barCkGrading.Checked;
            gradingHelper.Set();
@@ -1864,7 +1917,7 @@
            }
        }

        #endregion
        #endregion 人工刷新

        #region 监测点

@@ -1889,20 +1942,6 @@
            return await helper.GetAll();
        }

        //获取监测对接列表
        private async Task<List<HydroMonitorVmo>> GetMonitorDockingList()
        {
            var helper = GetMonitorHelper();
            return await helper.GetDockingList();
        }

        //获取监测分析列表
        private async Task<List<HydroMonitorVmo>> GetMonitorAnalyseList()
        {
            var helper = GetMonitorHelper();
            return await helper.GetAnalyseList();
        }

        #endregion

        #region 监测值
@@ -1917,8 +1956,7 @@
            {
                var visualListHelper = GetVisualListHelper();
                var monitorHelper = GetMonitorHelper();
                var calcuResultHelper = GetCalcuResultHelper();
                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper, calcuResultHelper);
                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
            }
            return _monitorValueHelper;
        }
@@ -1930,21 +1968,7 @@
            return await helper.GetAll();
        }

        //获取监测对接值列表
        private async Task<List<HydroMonitorValueViewModel>> GetMonitorDockingValueList()
        {
            var helper = GetMonitorValueHelper();
            return await helper.GetDockingList();
        }

        //获取监测分析值列表
        private async Task<List<HydroMonitorValueViewModel>> GetMonitorAnalyseValueList()
        {
            var helper = GetMonitorValueHelper();
            return await helper.GetAnalyseList();
        }

        //重置
        //重置监测值
        private void ResetMonitorValue()
        {
            var allWorkingList = GetWorkingList();
@@ -1956,12 +1980,12 @@
            }
        }

        #endregion 监测值
        #endregion

        #region 传感器测点
        #region 设置测点

        //设置可见构件对接测点列表
        private async void SetMonitorDockingList(HydroVisualInfo visual)
        //设置测点列表
        private async void SetMonitorList(HydroVisualInfo visual)
        {
            if (_hydroInfo == null)
            {
@@ -1975,33 +1999,33 @@
            var allMonitorList = await monitorHelper.GetAll();
            var monitorValueHelper = GetMonitorValueHelper();
            var allMonitorValueList = await monitorValueHelper.GetAll();
            var calcuResult = GetCalcuResult();
            var dlg = new SetHydroMonitorDockingListDlg();
            var dlg = new SetHydroMonitorListDlg();
            dlg.ReloadDataEvent += async (list) =>
            {
                var monitorList = list?.Select(x => x.Vmo).ToList();
                await monitorHelper.Update(visual.Code, eSourceType.Docking, monitorList);
                await monitorValueHelper.Update(visual.Code, eSourceType.Docking, list);
                await monitorHelper.Update(visual.Code, monitorList);
                await monitorValueHelper.Update(visual.Code, list);
                var monitorMarkerHelper = await GetMonitorMarkerHelper();
                monitorMarkerHelper.Set();
            };
            dlg.SetBindingData(_hydroInfo, visual, allMonitorList, allMonitorValueList, calcuResult);
            dlg.SetBindingData(_hydroInfo, visual, allMonitorList, allMonitorValueList);
            dlg.ShowDialog();
        }

        //设置传感器测点
        private void barBtnDockingMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        //设置测点列表
        private void barBtnSetMonitorList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_visual == null)
            {
                TipFormHelper.ShowWarn("请选择构件后重试！");
                return;
            }
            SetMonitorDockingList(_visual);
            SetMonitorList(_visual);
        }

        #endregion 传感器测点
        #endregion

        #region 传感器测值
        #region 设置测值

        //监测值列表控件
        private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
@@ -2041,8 +2065,8 @@
            }
        }

        //显示监测对接值列表控件
        private async void ShowMonitorDockingValueListCtrl()
        //显示监测值列表控件
        private async void ShowMonitorValueListCtrl()
        {
            var monitorValueListCtrl = GetMonitorValueListCtrl();
            if (!IsMonitorValueListCtrlVisible)
@@ -2050,60 +2074,20 @@
                this.controlContainerBottom.Controls.Clear();
                this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                this.docPnlBottom.Text = "传感器测值";
                this.docPnlBottom.Text = "设置测值";
                this.docPnlBottom.Height = 350;
            }
            var allValueList = await GetMonitorDockingValueList();
            var calcuResult = GetCalcuResult();
            var allValueList = await GetMonitorValueList();
            monitorValueListCtrl.SetBindingData(allValueList);
        }

        //设置传感器测值
        private void barBtnDockingMonitorValue_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        //设置测值
        private void barBtnSetMonitorValueList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            ShowMonitorDockingValueListCtrl();
            ShowMonitorValueListCtrl();
        }

        #endregion 传感器测值

        #region 分析测点

        //设置可见构件分析测点列表
        private async void SetMonitorAnalyseList(HydroVisualInfo visual)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            if (visual == null)
            {
                return;
            }
            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.GetAnalyseList();
            var dlg = new SetHydroMonitorAnalyseListDlg();
            dlg.ReloadDataEvent += async (list) =>
            {
                await monitorHelper.Update(visual.Code, eSourceType.Analyse, list);
                //var monitorMarkerHelper = await GetMonitorMarkerHelper();
                //monitorMarkerHelper.Update(visual.Code, monitorList);
                //monitorMarkerHelper.Set();
            };
            dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
            dlg.ShowDialog();
        }

        //设置分析测点
        private void barBtnAnalyseMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_visual == null)
            {
                return;
            }
            SetMonitorAnalyseList(_visual);
        }

        #endregion 分析测点
        #endregion 

        #region 测点标记

@@ -2130,7 +2114,7 @@
            monitorMarkerHelper.Set();
        }

        #endregion 测点标记
        #endregion

        #region 模型检查

@@ -2234,7 +2218,7 @@
            return _calcuResultHelper;
        }

        #endregion 计算结果
        #endregion

        #region 计算失败

@@ -2399,7 +2383,7 @@

        #endregion 计算标签

        #endregion 模型计算
        #endregion

        #region 导出INP

@@ -2517,8 +2501,7 @@
            UpdatePropertyCtrl();
        }


        #endregion
        #endregion 压力切换

        #region 评价规则

@@ -2622,9 +2605,12 @@
                    return;
                }

                var isHead = _calcuPressModeIsHead;
                var allEvaluationList = await GetEvaluationList();

                WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");
                await Task.Delay(3000);
                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead);
                var calcuResult = _hydroInfo.Calcu(isHead, allEvaluationList);
                WaitFormHelper.HideWaitForm();
                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
                if (calcuResult.Succeed)
@@ -2685,7 +2671,7 @@
            Calcu();
        }

        #endregion
        #endregion 水力计算

        #region 导出报告

@@ -2715,7 +2701,7 @@
                allWorkingList = new List<HydroWorkingVmo>() { working };
            }

            #endregion
            #endregion 工况列表

            #region 选择节点

@@ -2725,7 +2711,7 @@
                return default;
            }

            #endregion
            #endregion 选择节点

            var vm = new SimulationPrintViewModel();

@@ -2737,7 +2723,7 @@
                return vm;
            }

            #endregion
            #endregion 项目

            #region 水泵列表

@@ -2747,14 +2733,14 @@
                    return pump;
                }).ToList();

            #endregion
            #endregion 水泵列表

            #region 附加信息

            var allMonitorList = await GetMonitorList();
            var allEvaluationList = await GetEvaluationList();

            #endregion
            #endregion 附加信息

            #region 基础模型

@@ -2765,7 +2751,7 @@
            }
            var baseHydroInfoRhs = baseHydroInfo.Adapt<Yw.Model.HydroModelInfo>();

            #endregion
            #endregion 基础模型

            #region 遍历工况

@@ -2773,7 +2759,7 @@
            foreach (var working in allWorkingList)
            {
                baseHydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
                var calcuResult = baseHydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
                var calcuResult = baseHydroInfoRhs.Calcu(_calcuPressModeIsHead, allEvaluationList);

                var printWorking = new SimulationPrintWorkingViewModel(working);
                vm.WorkingList.Add(printWorking);
@@ -2792,7 +2778,7 @@
                printWorking.LossCurve = HydroLossCurveHelper.Create(baseHydroInfoRhs, working, selectedNode, calcuResult, _calcuPressModeIsHead, allEvaluationList);
            }

            #endregion
            #endregion 遍历工况

            #region 方案处理

@@ -2804,7 +2790,7 @@
                foreach (var working in allWorkingList)
                {
                    hydroInfoRhs.UpdateWorkingInfo(working.WorkingInfo);
                    var calcuResult = hydroInfoRhs.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, _calcuPressModeIsHead, allEvaluationList);
                    var calcuResult = hydroInfoRhs.Calcu(_calcuPressModeIsHead, allEvaluationList);

                    var printWorking = new SimulationPrintWorkingViewModel(working);
                    vm.Scheme.WorkingList.Add(printWorking);
@@ -2824,8 +2810,7 @@
                }
            }

            #endregion 

            #endregion 方案处理

            return vm;
        }
@@ -2834,46 +2819,46 @@
        private async void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var printInfo = await CreatePrintInfo();
            var printDlg = new SimulationCommonReportDlg();
            var printDlg = new HStation.WinFrmUI.SimulationCommonReportDlg();
            printDlg.SetBindingData(printInfo);
            printDlg.ShowDialog();
            if (_visual == null)
            {
                SelectInputSource();
                if (_visual == null)
            /*    if (_visual == null)
                {
                    TipFormHelper.ShowWarn("请选择构件后重试！");
                    return;
                    SelectInputSource();
                    if (_visual == null)
                    {
                        TipFormHelper.ShowWarn("请选择构件后重试！");
                        return;
                    }
                }
            }
            HydroVisualInfo visual = _visual;
            if (_visual is HydroLinkInfo linkInfo)
            {
                var visualListHelper = GetVisualListHelper();
                visual = visualListHelper.GetVisual(linkInfo.StartCode);
            }

            var allMonitorList = await GetMonitorList();
            var working = GetWorking();
            var calcuResult = GetCalcuResult();

            var dlg = new SimulationWorkingReportDlg();
            dlg.ReloadDataEvent += (vm) =>
            {
                var fileName = FileDialogHelper.SaveWordDoc("导出Word报告");
                if (string.IsNullOrEmpty(fileName))
                HydroVisualInfo visual = _visual;
                if (_visual is HydroLinkInfo linkInfo)
                {
                    return;
                    var visualListHelper = GetVisualListHelper();
                    visual = visualListHelper.GetVisual(linkInfo.StartCode);
                }
                var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
                reportHelper.Create(fileName, vm);
                TipFormHelper.ShowInfo("导出成功！");
            };
            dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual);
            dlg.ShowDialog();

                var allMonitorList = await GetMonitorList();
                var working = GetWorking();
                var calcuResult = GetCalcuResult();

                var dlg = new SimulationWorkingReportDlg();
                dlg.ReloadDataEvent += (vm) =>
                {
                    var fileName = FileDialogHelper.SaveWordDoc("导出Word报告");
                    if (string.IsNullOrEmpty(fileName))
                    {
                        return;
                    }
                    var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
                    reportHelper.Create(fileName, vm);
                    TipFormHelper.ShowInfo("导出成功！");
                };
                dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual);
                dlg.ShowDialog();*/
        }

        #endregion
        #endregion 导出报告

        #region 当前工况

@@ -2938,7 +2923,7 @@
            AddWorking();
        }

        #endregion
        #endregion 当前工况

        #region 选择工况

@@ -3026,6 +3011,8 @@
                var monitorValueHelper = GetMonitorValueHelper();
                var allMonitorValueList = await monitorValueHelper.GetAll();
                allMonitorValueList.UpdateMonitorValue(rhs.MonitorInfo);
                var gradingHelper = await GetGradingHelper();
                gradingHelper.Set();
            };
            dlg.DeleteDataEvent += (rhs) =>
            {
@@ -3035,7 +3022,7 @@
            dlg.ShowDialog();
        }

        #endregion
        #endregion 选择工况

        #region 监测分析

@@ -3105,7 +3092,7 @@
                this.docPnlBottom.Height = 350;
            }

            var allMonitorList = await GetMonitorAnalyseList();
            var allMonitorList = await GetMonitorList();
            var isHead = _calcuPressModeIsHead;
            var allEvaluationList = await GetEvaluationList();

@@ -3179,10 +3166,11 @@
            {
                return;
            }
            var allMonitorList = await GetMonitorDockingList();

            var allMonitorList = await GetMonitorList();
            if (allMonitorList == null || allMonitorList.Count < 1)
            {
                TipFormHelper.ShowWarn("请配置传感器测点后重试！");
                TipFormHelper.ShowWarn("请设置监测点后重试！");
                return;
            }

@@ -3192,6 +3180,14 @@
            var workingList = GetCheckedWorkingList();
            if (workingList == null || workingList.Count < 1)
            {
                var allMonitorValueList = await GetMonitorValueList();
                allMonitorValueList = allMonitorValueList?.Where(x => x.PropValue.HasValue).ToList();
                if (allMonitorValueList == null || allMonitorValueList.Count < 1)
                {
                    TipFormHelper.ShowWarn("请设置监测值后，重新计算！");
                    return;
                }

                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
                {
@@ -3210,11 +3206,17 @@
        }

        //水泵分析
        private void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private async void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            if (_hydroInfo == null)
            {
                return;
            }
            var isHead = _calcuPressModeIsHead;
            var allEvaluationList = await GetEvaluationList();

            var workingList = GetCheckedWorkingList();
            if (workingList == null || workingList.Count < 1)
            {
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
@@ -3222,16 +3224,15 @@
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                var dlg = new SimulationSingleWorkingPumpAnalyDlg();
                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult);
                var dlg = new SimulationPumpAnalyDlg();
                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.Working, workingHelper.CalcuResult, isHead, allEvaluationList);
                dlg.ShowDialog();
                return;
            }
            else
            {
                var dlg = new SimulationMultiWorkingPumpAnalyDlg();
                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
                dlg.ShowDialog();
            }

            var workingDlg = new SimulationPumpAnalyWorkingDlg();
            workingDlg.SetBindingData(_hydroInfo, workingList, isHead, allEvaluationList);
            workingDlg.ShowDialog();
        }

        //能效分析
@@ -3298,31 +3299,23 @@
        //综合分析
        private async void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_visual == null)
            if (_hydroInfo == null)
            {
                if (_visual == null)
                {
                    SelectInputSource();
                    if (_visual == null)
                    {
                        TipFormHelper.ShowWarn("请选择构件后重试！");
                        return;
                    }
                }
            }
            HydroVisualInfo visual = _visual;
            if (_visual is HydroLinkInfo linkInfo)
            {
                var visualListHelper = GetVisualListHelper();
                visual = visualListHelper.GetVisual(linkInfo.StartCode);
                return;
            }

            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.GetAll();
            var selectNode = GetSelectNode();
            if (selectNode == null)
            {
                return;
            }

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            var allMonitorList = await GetMonitorList();
            var isHead = _calcuPressModeIsHead;
            var allEvaluationList = await GetEvaluationList();

            var workingList = GetCheckedWorkingList();
            if (workingList == null || workingList.Count < 1)
            {
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
@@ -3330,16 +3323,15 @@
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                var dlg = new SimulationSingleWorkingAnalyDlg();
                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, visual);
                var dlg = new SimulationMultiAnalyDlg();
                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, selectNode, workingHelper.CalcuResult, isHead, allEvaluationList);
                dlg.ShowDialog();
                return;
            }
            else
            {
                var dlg = new SimulationMultiWorkingAnalyDlg();
                dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList, visual);
                dlg.ShowDialog();
            }

            var workingDlg = new SimulationMultiAnalyWorkingDlg();
            workingDlg.SetBindingData(_hydroInfo, allMonitorList, workingList, selectNode, isHead, allEvaluationList);
            workingDlg.ShowDialog();
        }

        #endregion
@@ -3445,7 +3437,7 @@
            dlg.ShowDialog();
        }

        #endregion
        #endregion 损失曲线

        #region 方案管理

@@ -3521,9 +3513,6 @@
        }

        #endregion 方案管理





    }