优化权限

duheng

2025-01-10 2b31b7e3926134da96d384ab3bdac345691a179c

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

@@ -1,17 +1,10 @@
using DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
using DevExpress.Utils.MVVM;
using DevExpress.XtraMap;
using HStation.WinFrmUI.PhartRelation;
using Mapster;
using NPOI.OpenXmlFormats.Dml;
using NPOI.SS.Formula.Functions;
using System.Diagnostics;
using Yw.EPAnet;
using Yw.Hydro;
using Yw.Model;
using Yw.Vmo;
using Yw.WinFrmUI.Q3d;

namespace HStation.WinFrmUI
{
@@ -30,11 +23,6 @@
        /// 新增工况事件
        /// </summary>
        public event Action<HydroWorkingVmo> AppendWorkingEvent;

        /// <summary>
        /// 保存模型事件
        /// </summary>
        public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;

        /// <summary>
        /// 刷新模型事件
@@ -96,7 +84,204 @@
            ShowBimfaceCtrl();
            ShowQ3dCtrl();
            ShowPropertyCtrl();
            InitialSvgImages();
        }

        //初始化Svg图片
        private void InitialSvgImages()
        {
            //监测
            this.barBtnDockingMonitor.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Docking;
            this.barBtnAnalyseMonitor.ImageOptions.SvgImage = HydroMonitorSvgImageHelper.Analyse;

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

            //水池
            this.barBtnSetTankList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
            this.barBtnSetTankList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetTankList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetTankList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //水箱
            this.barBtnSetWaterboxList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Tank;
            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.barBtnSetBluntheadList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Blunthead;
            this.barBtnSetBluntheadList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetBluntheadList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetBluntheadList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //弯头
            this.barBtnSetElbowsList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Elbow;
            this.barBtnSetElbowsList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetElbowsList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetElbowsList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //三通
            this.barBtnSetThreelinkList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Threelink;
            this.barBtnSetThreelinkList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetThreelinkList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetThreelinkList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //四通
            this.barBtnSetFourlinkList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Fourlink;
            this.barBtnSetFourlinkList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetFourlinkList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetFourlinkList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //消火栓
            this.barBtnSetHydrantList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Hydrant;
            this.barBtnSetHydrantList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetHydrantList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetHydrantList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //喷头
            this.barBtnSetNozzleList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Nozzle;
            this.barBtnSetNozzleList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetNozzleList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetNozzleList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //冷却塔
            this.barBtnSetCoolingList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Cooling;
            this.barBtnSetCoolingList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetCoolingList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetCoolingList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //水表
            this.barBtnSetMeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Meter;
            this.barBtnSetMeterList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetMeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetMeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //流量计
            this.barBtnSetFlowmeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Flowmeter;
            this.barBtnSetFlowmeterList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetFlowmeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetFlowmeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //压力表
            this.barBtnSetPressmeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pressmeter;
            this.barBtnSetPressmeterList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetMeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetMeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //管道
            this.barBtnSetPipeList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pipe;
            this.barBtnSetPipeList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetPipeList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetPipeList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //过渡件
            this.barBtnSetTranslationList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Translation;
            this.barBtnSetTranslationList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetTranslationList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetTranslationList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //水泵
            this.barBtnSetPumpList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pump;
            this.barBtnSetPumpList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetPumpList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetPumpList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //阀门
            this.barBtnSetValveList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Valve;
            this.barBtnSetValveList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetValveList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetValveList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //换热器
            this.barBtnSetExchangerList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Exchanger;
            this.barBtnSetExchangerList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetExchangerList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetExchangerList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;

            //压缩机
            this.barBtnSetCompressorList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Compressor;
            this.barBtnSetCompressorList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetCompressorList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetCompressorList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
        }

        #region 属性状态

        //属性状态辅助类
        private HydroPropStatusHelper _propStatusHelper = null;

        //获取属性状态辅助类
        private async Task<HydroPropStatusHelper> GetPropStatusHelper()
        {
            if (_propStatusHelper == null)
            {
                var allPropStatusList = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.GetByModelID(_hydroInfo.ID);
                _propStatusHelper = new HydroPropStatusHelper(_hydroInfo, allPropStatusList);
            }
            return _propStatusHelper;
        }

        //获取属性状态Db列表
        private async Task<List<HydroParterPropStatusInfo>> GetPropStatusDbList()
        {
            var helper = await GetPropStatusHelper();
            return helper.GetPropStatusDbList();
        }

        #endregion

        #region 更改状态

        //改变辅助类
        private HydroChangeHelper _changeHelper = null;

        //获取改变辅助类
        private HydroChangeHelper GetChangeHelper()
        {
            if (_hydroInfo == null)
            {
                return default;
            }
            if (_changeHelper == null)
            {
                _changeHelper = new HydroChangeHelper(_hydroInfo);
            }
            return _changeHelper;
        }

        //附加改变构件
        private void AppendChangeParter(HydroParterInfo parter, eChangeType changeType)
        {
            var helper = GetChangeHelper();
            helper.Append(parter, changeType);
        }

        //获取增加构件列表
        private List<HydroParterInfo> GetAddParterList()
        {
            var helper = GetChangeHelper();
            return helper.GetAddParterList();
        }

        //获取更新构件列表
        private List<HydroParterInfo> GetUpdateParterList()
        {
            var helper = GetChangeHelper();
            return helper.GetUpdateParterList();
        }

        //获取移除构件列表
        private List<string> GetRemoveParters()
        {
            var helper = GetChangeHelper();
            return helper.GetRemoveParters();
        }

        #endregion

        #region BIM控件

@@ -112,13 +297,13 @@
            }
            if (_bimfaceCtrl == null)
            {
                var overlay = this.ShowOverlay();
                _bimfaceCtrl = new SimulationBimfaceCtrl();
                _bimfaceCtrl.Dock = DockStyle.Fill;
                WaitFormHelper.ShowWaitForm(this.FindForm(), "正在加载模型，请稍后...");
                await _bimfaceCtrl.InitialData(_project, _projectSite);
                _bimfaceCtrl.LoadCompletedEvent += () =>
                {//view加载完成事件
                    overlay.Close();
                    WaitFormHelper.HideWaitForm();
                    this.barCkDecorator.Checked = false;
                    this.barCkGrading.Checked = true;
                };
@@ -140,7 +325,7 @@
            this.tabPageBimface.Controls.Add(bimfaceCtrl);
        }

        #endregion BIM控件
        #endregion

        #region Q3d控件

@@ -177,7 +362,7 @@
            this.tabPageQ3d.Controls.Add(q3dCtrl);
        }

        #endregion Q3d控件
        #endregion

        #region 属性控件

@@ -185,7 +370,7 @@
        private SimulationPropertyCtrl _propertyCtrl = null;

        //获取属性控件
        private SimulationPropertyCtrl GetPropertyCtrl()
        private async Task<SimulationPropertyCtrl> GetPropertyCtrl()
        {
            if (_hydroInfo == null)
            {
@@ -193,9 +378,13 @@
            }
            if (_propertyCtrl == null)
            {
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                _propertyCtrl = new SimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
                _propertyCtrl.AllowEdit = true;
                _propertyCtrl.InitialData(changeHelper, propStatusHelper);
                _propertyCtrl.CalcuResult = () => GetCalcuResult();
                _propertyCtrl.HydroViewEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Property);
@@ -261,13 +450,6 @@
                    var gradingHelper = await GetGradingHelper();
                    gradingHelper.Set(visual);
                };
                _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
                {
                    //流向属性发生改变
                    //判断流向是否加载，如果加载则更新流向，最好是更新单个流向
                    var flowEffectHelper = await GetFlowEffectHelper();
                    flowEffectHelper.Set(visual);
                };
            }
            return _propertyCtrl;
        }
@@ -292,13 +474,13 @@
        }

        //显示属性控件
        private void ShowPropertyCtrl()
        private async void ShowPropertyCtrl()
        {
            if (IsPropertyCtrlVisible)
            {
                return;
            }
            var propertyCtrl = GetPropertyCtrl();
            var propertyCtrl = await GetPropertyCtrl();
            this.controlContainerRight.Controls.Clear();
            this.controlContainerRight.Controls.Add(propertyCtrl);
            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -322,7 +504,7 @@
            _propertyCtrl?.UpdateRows();
        }

        #endregion 属性控件
        #endregion

        #region 选择构件

@@ -338,14 +520,16 @@
                case eSimulationVisualSource.None:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;

                case eSimulationVisualSource.Bimface:
                    {
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -353,7 +537,8 @@
                case eSimulationVisualSource.Q3d:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -361,14 +546,16 @@
                case eSimulationVisualSource.Property:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                    }
                    break;

                case eSimulationVisualSource.List:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -376,7 +563,8 @@
                case eSimulationVisualSource.Set:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -384,7 +572,8 @@
                case eSimulationVisualSource.Search:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -392,7 +581,8 @@
                case eSimulationVisualSource.Monitor:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -400,7 +590,8 @@
                case eSimulationVisualSource.Check:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -408,7 +599,8 @@
                case eSimulationVisualSource.Calcu:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -416,7 +608,8 @@
                case eSimulationVisualSource.Warning:
                    {
                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
                        this.barBtnSetMonitor.Enabled = visual != null;
                        this.barBtnDockingMonitor.Enabled = visual != null;
                        this.barBtnAnalyseMonitor.Enabled = visual != null;
                        SetPropertyCtrl(visual);
                    }
                    break;
@@ -564,7 +757,7 @@
        }

        //显示构件明细控件
        private void ShowVisualListCtrl()
        private async void ShowVisualListCtrl()
        {
            if (_hydroInfo == null)
            {
@@ -580,8 +773,10 @@
                this.docPnlBottom.Height = 350;
            }
            var visualVmListHelper = GetVisualVmListHelper();
            var changeHelper = GetChangeHelper();
            var propStatusHelper = await GetPropStatusHelper();
            var allVisualVmList = visualVmListHelper.GetVisualList();
            visualListCtrl.SetBindingData(allVisualVmList);
            visualListCtrl.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
            var calcuResult = GetCalcuResult();
            if (calcuResult != null && calcuResult.Succeed)
            {
@@ -618,7 +813,7 @@
            ShowVisualListCtrl();
        }

        #endregion 明细控件
        #endregion

        #region 构件显示

@@ -669,14 +864,34 @@

        #endregion 构件显示

        #endregion 构件明细
        #endregion

        #region 一键显隐

        private List<string> _allDecoratorCodes = null;

        //获取装饰件code列表
        private async Task<List<string>> GetDecoratorCodes()
        {
            if (_hydroInfo == null)
            {
                return default;
            }
            if (_allDecoratorCodes == null)
            {
                _allDecoratorCodes = await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.GetCodeListByModelID(_hydroInfo.ID, null);
            }
            if (_allDecoratorCodes == null)
            {
                _allDecoratorCodes = new List<string>();
            }
            return _allDecoratorCodes;
        }

        //设置装饰件可见性
        private async void SetDecoratorVisible(bool isDecoratorVisible)
        {
            var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
            var codes = await GetDecoratorCodes();
            if (isDecoratorVisible)
            {
                await _bimfaceCtrl?.ShowComponents(codes);
@@ -697,6 +912,10 @@

        #region 保存信息

        //保存锁定对象
        private object _locker_save = new();
        private bool _isSaving = false;//正在保存

        //保存
        private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
@@ -704,19 +923,68 @@
            {
                return;
            }
            if (this.SaveModelEvent == null)
            {
                return;
            }
            var hydroInfo = await this.SaveModelEvent.Invoke(_hydroInfo);
            if (hydroInfo == null)
            {
                TipFormHelper.ShowError("保存失败！");
                return;
            }
            _hydroInfo = hydroInfo;

            lock (_locker_save)
            {
                if (_isSaving)
                {
                    this.FindForm().ShowAlertInfo("保存", "正在保存，请稍后重试！");
                    return;
                }
            }

            _isSaving = true;

            var changeHelper = GetChangeHelper();

            var addParterList = changeHelper.GetAddParterList();
            var updateParterList = changeHelper.GetUpdateParterList();
            var removeParters = changeHelper.GetRemoveParters();

            if (addParterList == null || addParterList.Count < 1)
            {
                if (updateParterList == null || updateParterList.Count < 1)
                {
                    if (removeParters == null || removeParters.Count < 1)
                    {
                        TipFormHelper.ShowWarn("未检测到修改，无需保存！");
                        _isSaving = false;
                        return;
                    }
                }
            }

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

            var bol = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance
                .Update(_hydroInfo, addParterList, updateParterList, removeParters);
            if (!bol)
            {
                WaitFormHelper.HideWaitForm();
                TipFormHelper.ShowError("水力信息更新失败！");
                _isSaving = false;
                return;
            }
            changeHelper.Reset();

            var propStatusHelper = await GetPropStatusHelper();
            var updatePropStatusList = propStatusHelper.GetUpdatePropStatusDbList();
            if (updatePropStatusList != null && updatePropStatusList.Count > 0)
            {
                bol = await BLLFactory<Yw.BLL.HydroParterPropStatusInfo>.Instance.Update(_hydroInfo.ID, updatePropStatusList);
                if (!bol)
                {
                    WaitFormHelper.HideWaitForm();
                    TipFormHelper.ShowWarn("属性状态更新失败！");
                    _isSaving = false;
                    return;
                }
            }
            propStatusHelper.Reset();

            WaitFormHelper.HideWaitForm();
            TipFormHelper.ShowSucceed("保存成功！");
            _isSaving = false;

            //Stopwatch sw = new Stopwatch();
            //sw.Start();
@@ -734,11 +1002,13 @@
        private void RegistBulkSetEvents()
        {
            //水库
            this.barBtnSetReservoirList.ItemClick += delegate
            this.barBtnSetReservoirList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroReservoirListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -751,11 +1021,13 @@
                dlg.ShowDialog();
            };
            //水池
            this.barBtnSetTankList.ItemClick += delegate
            this.barBtnSetTankList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroTankListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -768,11 +1040,13 @@
                dlg.ShowDialog();
            };
            //水箱
            this.barBtnSetWaterboxList.ItemClick += delegate
            this.barBtnSetWaterboxList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroWaterboxListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -785,11 +1059,13 @@
                dlg.ShowDialog();
            };
            //连接节点
            this.barBtnSetJunctionList.ItemClick += delegate
            this.barBtnSetJunctionList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroJunctionListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -802,11 +1078,13 @@
                dlg.ShowDialog();
            };
            //闷头
            this.barBtnSetBluntheadList.ItemClick += delegate
            this.barBtnSetBluntheadList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroBluntheadListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -819,11 +1097,13 @@
                dlg.ShowDialog();
            };
            //弯头
            this.barBtnSetElbowsList.ItemClick += delegate
            this.barBtnSetElbowsList.ItemClick += async delegate
            {
                var allVisualVmList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroElbowListDlg();
                dlg.SetBindingData(allVisualVmList);
                dlg.SetBindingData(allVisualVmList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -836,11 +1116,13 @@
                dlg.ShowDialog();
            };
            //三通
            this.barBtnSetThreelinkList.ItemClick += delegate
            this.barBtnSetThreelinkList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroThreelinkListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -853,11 +1135,13 @@
                dlg.ShowDialog();
            };
            //四通
            this.barBtnSetFourlinkList.ItemClick += delegate
            this.barBtnSetFourlinkList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroFourlinkListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -870,11 +1154,13 @@
                dlg.ShowDialog();
            };
            //水表
            this.barBtnSetMeterList.ItemClick += delegate
            this.barBtnSetMeterList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroMeterListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -887,11 +1173,13 @@
                dlg.ShowDialog();
            };
            //流量计
            this.barBtnSetFlowmeterList.ItemClick += delegate
            this.barBtnSetFlowmeterList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroFlowmeterListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -904,15 +1192,13 @@
                dlg.ShowDialog();
            };
            //压力表
            this.barBtnSetPressmeterList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetPressmeterList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Pressmeter;
            this.barBtnSetPressmeterList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetPressmeterList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
            this.barBtnSetPressmeterList.ItemClick += delegate
            this.barBtnSetPressmeterList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroPressmeterListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -925,15 +1211,13 @@
                dlg.ShowDialog();
            };
            //喷嘴
            this.barBtnSetNozzleList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetNozzleList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Nozzle;
            this.barBtnSetNozzleList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetNozzleList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
            this.barBtnSetNozzleList.ItemClick += delegate
            this.barBtnSetNozzleList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroNozzleListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -946,15 +1230,13 @@
                dlg.ShowDialog();
            };
            //冷却塔
            this.barBtnSetCoolingList.ItemAppearance.Normal.ForeColor = Color.FromArgb(0, 122, 204);
            this.barBtnSetCoolingList.ImageOptions.SvgImage = AssetsMainSvgImageHelper.Cooling;
            this.barBtnSetCoolingList.ImageOptions.SvgImageSize = new Size(32, 32);
            this.barBtnSetCoolingList.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
            this.barBtnSetCoolingList.ItemClick += delegate
            this.barBtnSetCoolingList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroCoolingListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -967,11 +1249,13 @@
                dlg.ShowDialog();
            };
            //管道
            this.barBtnSetPipeList.ItemClick += delegate
            this.barBtnSetPipeList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroPipeListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -984,11 +1268,13 @@
                dlg.ShowDialog();
            };
            //过渡件
            this.barBtnSetTranslationList.ItemClick += delegate
            this.barBtnSetTranslationList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroTranslationListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1001,11 +1287,13 @@
                dlg.ShowDialog();
            };
            //水泵
            this.barBtnSetPumpList.ItemClick += delegate
            this.barBtnSetPumpList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroPumpListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1018,11 +1306,13 @@
                dlg.ShowDialog();
            };
            //阀门
            this.barBtnSetValveList.ItemClick += delegate
            this.barBtnSetValveList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroValveListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1035,11 +1325,13 @@
                dlg.ShowDialog();
            };
            //换热器
            this.barBtnSetExchangerList.ItemClick += delegate
            this.barBtnSetExchangerList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroExchangerListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1052,11 +1344,13 @@
                dlg.ShowDialog();
            };
            //压缩机
            this.barBtnSetCompressorList.ItemClick += delegate
            this.barBtnSetCompressorList.ItemClick += async delegate
            {
                var allVisualViewModelList = GetVisualViewModelList();
                var changeHelper = GetChangeHelper();
                var propStatusHelper = await GetPropStatusHelper();
                var dlg = new SetHydroCompressorListDlg();
                dlg.SetBindingData(allVisualViewModelList);
                dlg.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
                dlg.HydroClickInfoEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Set);
@@ -1285,7 +1579,7 @@
            }
        }

        #endregion 批量配置
        #endregion

        #region 构件查询

@@ -1428,7 +1722,7 @@
            markHelper.Set();
        }

        #endregion 模型标注
        #endregion

        #region 颜色分级

@@ -1539,41 +1833,6 @@

        #endregion 人工刷新

        #region 水流动画

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

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

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

        #endregion 水流动画

        #region 监测列表

        #region 监测点

        //监测点辅助类
@@ -1582,10 +1841,6 @@
        //获取监测点辅助类
        private SimulationMonitorHelper GetMonitorHelper()
        {
            if (_hydroInfo == null)
            {
                return default;
            }
            if (_monitorHelper == null)
            {
                var visualListHelper = GetVisualListHelper();
@@ -1598,43 +1853,21 @@
        private async Task<List<HydroMonitorVmo>> GetMonitorList()
        {
            var helper = GetMonitorHelper();
            return await helper.Get();
            return await helper.GetAll();
        }

        //设置监测点列表
        private async void SetMonitorList(HydroVisualInfo visual)
        //获取监测对接列表
        private async Task<List<HydroMonitorVmo>> GetMonitorDockingList()
        {
            if (_hydroInfo == null)
            {
                return;
            }
            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.Get();
            var dlg = new SetHydroMonitorListDlg();
            dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
            dlg.ReloadDataEvent += async (list) =>
            {
                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
                if (!bol)
                {
                    TipFormHelper.ShowError("设置失败！");
                    return;
                }
                TipFormHelper.ShowSucceed("设置成功！");
                var monitorList = await monitorHelper.Update(visual.Code);
                var monitorValueHelper = GetMonitorValueHelper();
                monitorValueHelper.Update(visual.Code, monitorList);
                var monitorMarkerHelper = await GetMonitorMarkerHelper();
                monitorMarkerHelper.Update(visual.Code, monitorList);
                monitorMarkerHelper.Set();
            };
            dlg.ShowDialog();
            var helper = GetMonitorHelper();
            return await helper.GetDockingList();
        }

        //设置监测点
        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        //获取监测分析列表
        private async Task<List<HydroMonitorVmo>> GetMonitorAnalyseList()
        {
            SetMonitorList(_visual);
            var helper = GetMonitorHelper();
            return await helper.GetAnalyseList();
        }

        #endregion 监测点
@@ -1651,7 +1884,8 @@
            {
                var visualListHelper = GetVisualListHelper();
                var monitorHelper = GetMonitorHelper();
                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
                var calcuResultHelper = GetCalcuResultHelper();
                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper, calcuResultHelper);
            }
            return _monitorValueHelper;
        }
@@ -1660,7 +1894,21 @@
        private async Task<List<HydroMonitorValueViewModel>> GetMonitorValueList()
        {
            var helper = GetMonitorValueHelper();
            return await helper.Get();
            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();
        }

        //重置
@@ -1675,9 +1923,52 @@
            }
        }

        #endregion
        #endregion 监测值

        #region 监测值控件
        #region 传感器测点

        //设置可见构件对接测点列表
        private async void SetMonitorDockingList(HydroVisualInfo visual)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            if (visual == null)
            {
                return;
            }
            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.GetAll();
            var monitorValueHelper = GetMonitorValueHelper();
            var allMonitorValueList = await monitorValueHelper.GetAll();
            var calcuResult = GetCalcuResult();
            var dlg = new SetHydroMonitorDockingListDlg();
            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);
                var monitorMarkerHelper = await GetMonitorMarkerHelper();
                monitorMarkerHelper.Set();
            };
            dlg.SetBindingData(_hydroInfo, visual, allMonitorList, allMonitorValueList, calcuResult);
            dlg.ShowDialog();
        }

        //设置传感器测点
        private void barBtnDockingMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_visual == null)
            {
                return;
            }
            SetMonitorDockingList(_visual);
        }

        #endregion 传感器测点

        #region 传感器测值

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

        //显示监测值列表控件
        private async void ShowMonitorValueListCtrl()
        //显示监测对接值列表控件
        private async void ShowMonitorDockingValueListCtrl()
        {
            var monitorValueListCtrl = GetMonitorValueListCtrl();
            if (!IsMonitorValueListCtrlVisible)
@@ -1726,22 +2017,62 @@
                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 allMonitorValueList = await GetMonitorValueList();
            monitorValueListCtrl.SetBindingData(allMonitorValueList, _visual);
            var allValueList = await GetMonitorDockingValueList();
            var calcuResult = GetCalcuResult();
            monitorValueListCtrl.SetBindingData(allValueList);
        }

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

        #endregion
        #endregion 传感器测值

        #region 监测点标记
        #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 分析测点

        #region 测点标记

        //监测标记辅助类
        private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
@@ -1758,17 +2089,15 @@
            return _monitorMarkerHelper;
        }

        //显示状态改变
        private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        //测点显示状态改变
        private async void barCkMonitorVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var monitorMarkerHelper = await GetMonitorMarkerHelper();
            monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
            monitorMarkerHelper.Visible = this.barCkMonitorVisible.Checked;
            monitorMarkerHelper.Set();
        }

        #endregion

        #endregion 监测列表
        #endregion 测点标记

        #region 模型检查

@@ -2037,7 +2366,7 @@

        #endregion 计算标签

        #endregion
        #endregion 模型计算

        #region 导出INP

@@ -2151,7 +2480,7 @@
            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allWorkingList = workingCheckedListHelper.GetWorkingList();
            var monitorValueHelper = GetMonitorValueHelper();
            var allMonitorValueList = await monitorValueHelper.Get();
            var allMonitorValueList = await monitorValueHelper.GetAll();
            var dlg = new SetHydroWorkingDlg();
            dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
            dlg.HydroViewEvent += (visual) =>
@@ -2285,7 +2614,7 @@
                {
                    return;
                }
                var reportHelper = new SimulationWorkingReportHelper();
                var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
                reportHelper.Create(fileName, vm);
                TipFormHelper.ShowInfo("导出成功！");
            };
@@ -2358,7 +2687,7 @@
            AddWorking();
        }

        #endregion 当前工况
        #endregion

        #region 选择工况

@@ -2480,16 +2809,14 @@
                this.docPnlBottom.Text = "监测分析";
                this.docPnlBottom.Height = 350;
            }
            var allMontorList = await GetMonitorList();
            var allMonitorValueList = await GetMonitorValueList();

            var allMontorList = await GetMonitorAnalyseList();
            if (allWorkingList == null || allWorkingList.Count < 1)
            {
                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, allMonitorValueList, GetWorking(), GetCalcuResult(), _visual);
                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, GetCalcuResult());
            }
            else
            {
                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, allMonitorValueList, allWorkingList, _visual);
                monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, allWorkingList);
            }
        }

@@ -2527,8 +2854,7 @@
        //精度评估
        private async void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.Get();
            var allMonitorList = await GetMonitorDockingList();

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
@@ -2603,55 +2929,6 @@
            }
        }

        //损失曲线
        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            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);
            }

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            {
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
                {
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                var dlg = new HydroSingleWorkingLossCurveDlg();
                dlg.HydroClickEvent += (code) =>
                {
                    SelectVisual(code, eSimulationVisualSource.None);
                };
                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
                dlg.ShowDialog();
            }
            else
            {
                var dlg = new HydroMultiWorkingLossCurveDlg();
                dlg.HydroClickEvent += (code) =>
                {
                    SelectVisual(code, eSimulationVisualSource.None);
                };
                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
                dlg.ShowDialog();
            }
        }

        //损失统计
        private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
@@ -2700,7 +2977,7 @@
            }

            var monitorHelper = GetMonitorHelper();
            var allMonitorList = await monitorHelper.Get();
            var allMonitorList = await monitorHelper.GetAll();

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
@@ -2724,7 +3001,107 @@
            }
        }

        #endregion
        #endregion 工况分析

        #region 损失曲线

        //单工况损失曲线控件
        private HydroSingleWorkingLossCurveCtrl _singleWorkingLossCurveCtrl = null;

        //获取单工况损失曲线控件
        private HydroSingleWorkingLossCurveCtrl GetSingleWorkingLossCurveCtrl()
        {
            if (_singleWorkingLossCurveCtrl == null)
            {
                _singleWorkingLossCurveCtrl = new HydroSingleWorkingLossCurveCtrl();
                _singleWorkingLossCurveCtrl.Dock = DockStyle.Fill;
                _singleWorkingLossCurveCtrl.HydroClickEvent += (code) =>
                {
                    var visual = GetVisual(code);
                    SelectVisual(visual, eSimulationVisualSource.None);
                };
            }
            return _singleWorkingLossCurveCtrl;
        }

        //单工况损失曲线控件是否可见
        private bool IsSingleWorkingLossCurveCtrlVisible
        {
            get
            {
                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
                {
                    if (this.controlContainerBottom.Controls.Count > 0)
                    {
                        if (this.controlContainerBottom.Controls[0] is HydroSingleWorkingLossCurveCtrl)
                        {
                            return true;
                        }
                    }
                }
                return false;
            }
        }

        //显示单工况损失曲线控件
        private void ShowSingleWorkingLossCurveCtrl(Yw.Model.HydroModelInfo hydroInfo, HydroCalcuResult calcuResult, HydroVisualInfo visual)
        {
            var singleWorkingLossCurveCtrl = GetSingleWorkingLossCurveCtrl();
            if (!IsSingleWorkingLossCurveCtrlVisible)
            {
                this.controlContainerBottom.Controls.Clear();
                this.controlContainerBottom.Controls.Add(singleWorkingLossCurveCtrl);
                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                this.docPnlBottom.Text = "损失曲线";
                this.docPnlBottom.Height = 350;
            }
            singleWorkingLossCurveCtrl.SetBindingData(hydroInfo, calcuResult, visual);
        }

        //损失曲线
        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            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);
            }

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
            {
                var workingHelper = GetWorkingHelper();
                if (!workingHelper.Initialized)
                {
                    TipFormHelper.ShowWarn("请计算后重试！");
                    return;
                }
                ShowSingleWorkingLossCurveCtrl(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
            }
            else
            {
                var dlg = new HydroMultiWorkingLossCurveDlg();
                dlg.HydroClickEvent += (code) =>
                {
                    SelectVisual(code, eSimulationVisualSource.None);
                };
                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
                dlg.ShowDialog();
            }
        }

        #endregion 损失曲线

        #region 方案管理

@@ -2777,7 +3154,7 @@
                TipFormHelper.ShowError("水力模拟方案删除失败，请重试！");
                return;
            }
            if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(relation.ID))
            if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(relation.ModelID))
            {
                TipFormHelper.ShowError("水力模拟方案删除失败，请重试！");
                return;
@@ -2800,7 +3177,5 @@
        }

        #endregion 方案管理


    }
}