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

cloudflight

2024-12-24 97a43bf839f59cdda1641d61706e6e71a0c5e172

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

@@ -1,4 +1,6 @@
using DevExpress.Diagram.Core.Native;
using Castle.Core.Logging;
using DevExpress.CodeParser;
using DevExpress.Diagram.Core.Native;
using DevExpress.Mvvm.Native;
using DevExpress.Utils.MVVM;
using DevExpress.XtraMap;
@@ -96,6 +98,129 @@
            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 BIM控件
@@ -112,13 +237,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;
                };
@@ -196,6 +321,7 @@
                _propertyCtrl = new SimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
                _propertyCtrl.AllowEdit = true;
                _propertyCtrl.CalcuResult = () => GetCalcuResult();
                _propertyCtrl.HydroViewEvent += (visual) =>
                {
                    SelectVisual(visual, eSimulationVisualSource.Property);
@@ -338,14 +464,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 +481,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 +490,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 +507,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 +516,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 +525,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 +534,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 +543,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 +552,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;
@@ -673,10 +810,30 @@

        #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);
@@ -904,10 +1061,6 @@
                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
            {
                var allVisualViewModelList = GetVisualViewModelList();
@@ -925,10 +1078,6 @@
                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
            {
                var allVisualViewModelList = GetVisualViewModelList();
@@ -946,10 +1095,6 @@
                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
            {
                var allVisualViewModelList = GetVisualViewModelList();
@@ -1566,13 +1711,11 @@
        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var flowEffectHelper = await GetFlowEffectHelper();
            flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
            flowEffectHelper.Set();
            //flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
            //flowEffectHelper.Set();
        }

        #endregion 水流动画

        #region 监测列表
        #endregion

        #region 监测点

@@ -1582,10 +1725,6 @@
        //获取监测点辅助类
        private SimulationMonitorHelper GetMonitorHelper()
        {
            if (_hydroInfo == null)
            {
                return default;
            }
            if (_monitorHelper == null)
            {
                var visualListHelper = GetVisualListHelper();
@@ -1598,43 +1737,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 +1768,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 +1778,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 +1807,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 +1892,8 @@
            }
        }

        //显示监测值列表控件
        private async void ShowMonitorValueListCtrl()
        //显示监测对接值列表控件
        private async void ShowMonitorDockingValueListCtrl()
        {
            var monitorValueListCtrl = GetMonitorValueListCtrl();
            if (!IsMonitorValueListCtrlVisible)
@@ -1726,22 +1901,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 +1973,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 +2250,7 @@

        #endregion 计算标签

        #endregion
        #endregion 模型计算

        #region 导出INP

@@ -2151,7 +2364,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 +2498,7 @@
                {
                    return;
                }
                var reportHelper = new SimulationWorkingReportHelper();
                var reportHelper = new HStation.ReportFile.SimulationWorkingReportHelper();
                reportHelper.Create(fileName, vm);
                TipFormHelper.ShowInfo("导出成功！");
            };
@@ -2480,16 +2693,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);
            }
        }

@@ -2499,7 +2710,7 @@
            ShowMonitorAnalyListCtrl();
        }

        #endregion
        #endregion 监测分析

        #region 工况分析

@@ -2527,8 +2738,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 +2813,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 +2861,7 @@
            }

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

            var workingCheckedListHelper = GetWorkingCheckedListHelper();
            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
@@ -2724,7 +2885,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 方案管理

@@ -2800,7 +3061,5 @@
        }

        #endregion 方案管理


    }
}