方案修改

lixiaojun

2024-12-09 4607e20cecf567ee2e86f9a07158deaa1b74d622

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

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

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

@@ -42,12 +43,14 @@
            (
                XhsProjectVmo project,
                XhsProjectSiteVmo projectSite,
                XhsSchemeVmo scheme,
                Yw.Model.HydroModelInfo hydroInfo,
                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
            )
        {
            _project = project;
            _projectSite = projectSite;
            _scheme = scheme;
            _hydroInfo = hydroInfo;
            _allWorkingCheckedListDict = allWorkingCheckedListDict;
        }
@@ -160,6 +163,7 @@
            {
                _propertyCtrl = new SimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
                _propertyCtrl.AllowEdit = true;
                _propertyCtrl.HydroViewEvent += (visual) =>
                {
                    SelectVisual(visual, eVisualSource.Property);
@@ -278,6 +282,7 @@
            var visualVmListHelper = GetVisualVmListHelper();
            var vm = visualVmListHelper.GetVisual(visual);
            _propertyCtrl.SelectedObject = vm;
            _propertyCtrl.UpdateRows();
        }

        //更新属性控件
@@ -2105,10 +2110,10 @@
                    return;
                }

                //WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");
                //await Task.Delay(3000);
                WaitFormHelper.ShowWaitForm(this, "正在计算分析中，请稍候...");
                await Task.Delay(3000);
                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
                //WaitFormHelper.HideWaitForm();
                WaitFormHelper.HideWaitForm();
                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
                if (calcuResult.Succeed)
                {
@@ -2144,6 +2149,13 @@

                #endregion

                #region 颜色分级

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

                #endregion

                #region 计算标签

                var calcuResultLabelHelper = await GetCalcuResultLabelHelper();