From 920315563b014498ed9ad11f29d69638bc2223ca Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期六, 21 十二月 2024 11:15:55 +0800 Subject: [PATCH] 导入修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 396 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 264 insertions(+), 132 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs index 67f21d2..e5f6f59 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs @@ -30,24 +30,26 @@ /// 鏂板宸ュ喌浜嬩欢 /// </summary> public event Action<HydroWorkingVmo> AppendWorkingEvent; + /// <summary> /// 淇濆瓨妯″瀷浜嬩欢 /// </summary> public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent; + /// <summary> /// 鍒锋柊妯″瀷浜嬩欢 /// </summary> public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent; + /// <summary> /// 鏇存柊鏂规浜嬩欢 /// </summary> public event Action<XhsSchemeVmo> UpdateSchemeEvent; + /// <summary> /// 绉婚櫎鏂规浜嬩欢 /// </summary> public event Action<XhsSchemeVmo> RemoveSchemeEvent; - - private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰 private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔� @@ -138,7 +140,7 @@ this.tabPageBimface.Controls.Add(bimfaceCtrl); } - #endregion + #endregion BIM鎺т欢 #region Q3d鎺т欢 @@ -175,7 +177,7 @@ this.tabPageQ3d.Controls.Add(q3dCtrl); } - #endregion + #endregion Q3d鎺т欢 #region 灞炴�ф帶浠� @@ -218,7 +220,7 @@ { return; } - var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList(); + var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != link.Code).ToList(); if (linkList == null || linkList.Count < 1) { return; @@ -266,7 +268,6 @@ var flowEffectHelper = await GetFlowEffectHelper(); flowEffectHelper.Set(visual); }; - } return _propertyCtrl; } @@ -321,7 +322,7 @@ _propertyCtrl?.UpdateRows(); } - #endregion + #endregion 灞炴�ф帶浠� #region 閫夋嫨鏋勪欢 @@ -341,12 +342,14 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Bimface: { this.barBtnSetMonitor.Enabled = visual != null; SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Q3d: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -354,12 +357,14 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Property: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); this.barBtnSetMonitor.Enabled = visual != null; } break; + case eSimulationVisualSource.List: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -367,6 +372,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Set: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -374,6 +380,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Search: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -381,6 +388,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Monitor: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -388,6 +396,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Check: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -395,6 +404,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Calcu: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -402,6 +412,7 @@ SetPropertyCtrl(visual); } break; + case eSimulationVisualSource.Warning: { _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code); @@ -409,6 +420,7 @@ SetPropertyCtrl(visual); } break; + default: break; } } @@ -420,7 +432,7 @@ SelectVisual(visual, source); } - #endregion + #endregion 閫夋嫨鏋勪欢 #region 鏋勪欢鏄庣粏 @@ -469,7 +481,7 @@ return helper.GetSourceList(); } - #endregion + #endregion 鍙鍒楄〃 #region 瑙嗗浘鍒楄〃 @@ -499,7 +511,14 @@ return helper.GetVisualList(); } - #endregion + //鑾峰彇鍙瑙嗗浘 + private HydroVisualViewModel GetVisualViewModel(string code) + { + var helper = GetVisualVmListHelper(); + return helper.GetVisual(code); + } + + #endregion 瑙嗗浘鍒楄〃 #region 鏄庣粏鎺т欢 @@ -599,7 +618,7 @@ ShowVisualListCtrl(); } - #endregion + #endregion 鏄庣粏鎺т欢 #region 鏋勪欢鏄剧ず @@ -648,9 +667,9 @@ SetVisualVisible(); } - #endregion + #endregion 鏋勪欢鏄剧ず - #endregion + #endregion 鏋勪欢鏄庣粏 #region 涓�閿樉闅� @@ -674,7 +693,7 @@ SetDecoratorVisible(this.barCkDecorator.Checked); } - #endregion + #endregion 涓�閿樉闅� #region 淇濆瓨淇℃伅 @@ -699,16 +718,15 @@ TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�"); - //Stopwatch sw = new Stopwatch(); //sw.Start(); - //鑰楁椂宸ㄥぇ鐨勪唬鐮� + //鑰楁椂宸ㄥぇ鐨勪唬鐮� //sw.Stop(); //TimeSpan ts2 = sw.Elapsed; //Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds); } - #endregion + #endregion 淇濆瓨淇℃伅 #region 鎵归噺閰嶇疆 @@ -886,10 +904,56 @@ 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(); var dlg = new SetHydroPressmeterListDlg(); + dlg.SetBindingData(allVisualViewModelList); + dlg.HydroClickInfoEvent += (visual) => + { + SelectVisual(visual, eSimulationVisualSource.Set); + }; + dlg.HydroChangedInfoEvent += visuals => + { + SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set); + UpdateVisualListCtrl(); + }; + 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(); + var dlg = new SetHydroNozzleListDlg(); + dlg.SetBindingData(allVisualViewModelList); + dlg.HydroClickInfoEvent += (visual) => + { + SelectVisual(visual, eSimulationVisualSource.Set); + }; + dlg.HydroChangedInfoEvent += visuals => + { + SelectVisual(visuals?.FirstOrDefault(), eSimulationVisualSource.Set); + UpdateVisualListCtrl(); + }; + 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(); + var dlg = new SetHydroCoolingListDlg(); dlg.SetBindingData(allVisualViewModelList); dlg.HydroClickInfoEvent += (visual) => { @@ -987,7 +1051,7 @@ }; dlg.ShowDialog(); }; - //鎹㈢儹鍣� + //鍘嬬缉鏈� this.barBtnSetCompressorList.ItemClick += delegate { var allVisualViewModelList = GetVisualViewModelList(); @@ -1005,7 +1069,6 @@ dlg.ShowDialog(); }; } - //鏄剧ずRadialMenu private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) @@ -1079,6 +1142,16 @@ else { this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always; + } + + //鍐峰嵈濉� + if (_hydroInfo.Coolings == null || _hydroInfo.Coolings.Count < 1) + { + this.barBtnSetCoolingList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + } + else + { + this.barBtnSetCoolingList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always; } //闂峰ご @@ -1210,11 +1283,9 @@ { this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always; } - - } - #endregion + #endregion 鎵归噺閰嶇疆 #region 鏋勪欢鏌ヨ @@ -1305,7 +1376,7 @@ ShowSearchDlg(); } - #endregion + #endregion 鏋勪欢鏌ヨ #region 妯″瀷鏍囨敞 @@ -1357,7 +1428,7 @@ markHelper.Set(); } - #endregion + #endregion 妯″瀷鏍囨敞 #region 棰滆壊鍒嗙骇 @@ -1439,7 +1510,7 @@ gradingHelper.Set(); } - #endregion + #endregion 棰滆壊鍒嗙骇 #region 浜哄伐鍒锋柊 @@ -1452,7 +1523,6 @@ } if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes) { - var hydroInfo = await this.RefreshModelEvent.Invoke(); if (hydroInfo == null) { @@ -1467,7 +1537,7 @@ } } - #endregion + #endregion 浜哄伐鍒锋柊 #region 姘存祦鍔ㄧ敾 @@ -1500,7 +1570,7 @@ flowEffectHelper.Set(); } - #endregion + #endregion 姘存祦鍔ㄧ敾 #region 鐩戞祴鍒楄〃 @@ -1567,7 +1637,7 @@ SetMonitorList(_visual); } - #endregion + #endregion 鐩戞祴鐐� #region 鐩戞祴鍊� @@ -1586,6 +1656,13 @@ return _monitorValueHelper; } + //鑾峰彇鐩戞祴鍊煎垪琛� + private async Task<List<HydroMonitorValueViewModel>> GetMonitorValueList() + { + var helper = GetMonitorValueHelper(); + return await helper.Get(); + } + //閲嶇疆 private void ResetMonitorValue() { @@ -1596,7 +1673,6 @@ var helper = GetMonitorValueHelper(); helper.Reset(working.MonitorInfo); } - } #endregion @@ -1615,8 +1691,7 @@ _monitorValueListCtrl.Dock = DockStyle.Fill; _monitorValueListCtrl.HydroViewEvent += (code) => { - var visualListHelper = GetVisualListHelper(); - var visual = visualListHelper.GetVisual(code); + var visual = GetVisual(code); SelectVisual(visual, eSimulationVisualSource.Monitor); }; } @@ -1654,9 +1729,8 @@ this.docPnlBottom.Text = "鐩戞祴鍊�"; this.docPnlBottom.Height = 350; } - var monitorValueHelper = GetMonitorValueHelper(); - var allMonitorValueList = await monitorValueHelper.Get(); - monitorValueListCtrl.SetBindingData(allMonitorValueList); + var allMonitorValueList = await GetMonitorValueList(); + monitorValueListCtrl.SetBindingData(allMonitorValueList, _visual); } //璁剧疆鐩戞祴鍊� @@ -1694,7 +1768,7 @@ #endregion - #endregion + #endregion 鐩戞祴鍒楄〃 #region 妯″瀷妫�鏌� @@ -1778,7 +1852,7 @@ ShowCheckCtrl(checkResult); } - #endregion + #endregion 妯″瀷妫�鏌� #region 妯″瀷璁$畻 @@ -1798,7 +1872,7 @@ return _calcuResultHelper; } - #endregion + #endregion 璁$畻缁撴灉 #region 璁$畻澶辫触 @@ -1862,7 +1936,7 @@ calcuFailedCtrl.SetBindingData(calcuResult.FailedList); } - #endregion + #endregion 璁$畻澶辫触 #region 璁$畻璀﹀憡 @@ -1934,7 +2008,7 @@ calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict); } - #endregion + #endregion 璁$畻璀﹀憡 #region 璁$畻鏍囩 @@ -1961,72 +2035,7 @@ calcuResultLabelHelper.Set(); } - #endregion - - #endregion - - #region 绠$綉淇 - - //淇绠$綉 - private void Repair() - { - if (_hydroInfo == null) - { - return; - } - var checkResult = _hydroInfo.Check(); - if (!checkResult.Succeed) - { - ShowCheckCtrl(checkResult); - TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�"); - return; - } - var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple); - if (!calcuResult.Succeed) - { - ShowCalcuFailedCtrl(calcuResult); - TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒"); - return; - } - var visualListHelper = GetVisualListHelper(); - var allLinkList = visualListHelper.GetLinkList(); - if (allLinkList != null && allLinkList.Count < 1) - { - TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒"); - return; - } - int count = 0; - foreach (var link in allLinkList) - { - var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code); - if (calcuLink == null) - { - continue; - } - if (!calcuLink.CalcuFlow.HasValue) - { - continue; - } - if (calcuLink.CalcuFlow.Value < 0) - { - var tempCode = link.StartCode; - link.StartCode = link.EndCode; - link.EndCode = tempCode; - count++; - } - } - var visualVmListHelper = GetVisualVmListHelper(); - visualVmListHelper.UpdateProperty(); - UpdateVisualListCtrl(); - UpdatePropertyCtrl(); - TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒"); - } - - //绠$綉淇 - private void barBtnRepair_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) - { - Repair(); - } + #endregion 璁$畻鏍囩 #endregion @@ -2050,7 +2059,7 @@ TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛"); } - #endregion + #endregion 瀵煎嚭INP #region 姘存车鍒楄〃 @@ -2125,11 +2134,10 @@ //骞惰仈妯℃嫙 private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - PumpParallel(); } - #endregion + #endregion 姘存车鍒楄〃 #region 姘村姏璁$畻 @@ -2161,7 +2169,11 @@ working.ModelID = vm.ModelID; working.Name = vm.Name; working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo); - working.MonitorInfo = JsonHelper.Object2Json(vm.MonitorInfo); + var useWorkingMonitorInfo = vm.MonitorInfo?.Where(x => x.PropValue.HasValue).ToList(); + if (useWorkingMonitorInfo != null && useWorkingMonitorInfo.Count > 0) + { + working.MonitorInfo = JsonHelper.Object2Json(useWorkingMonitorInfo); + } working.SortCode = vm.SortCode; working.Description = vm.Description; @@ -2202,38 +2214,35 @@ var visualVmListHelper = GetVisualVmListHelper(); visualVmListHelper.UpdateCalcuProperty(calcuResult); - #endregion + #endregion 瑙嗗浘鍒楄〃 #region 褰撳墠鏋勪欢 SelectVisual(_visual, eSimulationVisualSource.Calcu); - #endregion + #endregion 褰撳墠鏋勪欢 #region 鏋勪欢鏄庣粏 UpdateVisualListCtrl(); - #endregion + #endregion 鏋勪欢鏄庣粏 #region 棰滆壊鍒嗙骇 var gradingHelper = await GetGradingHelper(); gradingHelper.Set(); - #endregion + #endregion 棰滆壊鍒嗙骇 #region 璁$畻鏍囩 var calcuResultLabelHelper = await GetCalcuResultLabelHelper(); calcuResultLabelHelper.Set(); - #endregion - + #endregion 璁$畻鏍囩 }; - dlg.ShowDialog(); - } //姘村姏璁$畻 @@ -2242,25 +2251,49 @@ Calcu(); } - #endregion + #endregion 姘村姏璁$畻 #region 瀵煎嚭鎶ュ憡 - private void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) + private async void barBtnExportWord_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - var fileName = FileDialogHelper.SaveWordDoc("瀵煎嚭Word鎶ュ憡"); - if (string.IsNullOrEmpty(fileName)) + if (_visual == null) { - return; + SelectInputSource(); + if (_visual == null) + { + TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒"); + return; + } } - var vm = new ReportViewModel(); - vm.ProjectName = _project.Name; - vm.Description = _project.Description; - SimulationWordReport word = new SimulationWordReport(); - word.Create(fileName, vm); + HydroVisualInfo visual = _visual; + if (_visual is HydroLinkInfo linkInfo) + { + var visualListHelper = GetVisualListHelper(); + visual = visualListHelper.GetVisual(linkInfo.StartCode); + } + + var allMonitorList = await GetMonitorList(); + var working = GetWorking(); + var calcuResult = GetCalcuResult(); + + var dlg = new SimulationWorkingReportDlg(); + dlg.ReloadDataEvent += (vm) => + { + var fileName = FileDialogHelper.SaveWordDoc("瀵煎嚭Word鎶ュ憡"); + if (string.IsNullOrEmpty(fileName)) + { + return; + } + var reportHelper = new SimulationWorkingReportHelper(); + reportHelper.Create(fileName, vm); + TipFormHelper.ShowInfo("瀵煎嚭鎴愬姛锛�"); + }; + dlg.SetBindingData(_project, _hydroInfo, allMonitorList, working, calcuResult, visual); + dlg.ShowDialog(); } - #endregion + #endregion 瀵煎嚭鎶ュ憡 #region 褰撳墠宸ュ喌 @@ -2325,7 +2358,7 @@ AddWorking(); } - #endregion + #endregion 褰撳墠宸ュ喌 #region 閫夋嫨宸ュ喌 @@ -2351,6 +2384,13 @@ return helper.GetWorkingList(); } + //鑾峰彇閫夋嫨宸ュ喌鍒楄〃 + private List<HydroWorkingVmo> GetCheckedWorkingList() + { + var helper = GetWorkingCheckedListHelper(); + return helper.GetCheckedWorkingList(); + } + //鏇存柊宸ュ喌閫夋嫨鍒楄〃 public void UpdateWorkingCheckedList(HydroWorkingVmo working) { @@ -2372,6 +2412,92 @@ helper.Remove(working); } + #endregion 閫夋嫨宸ュ喌 + + #region 鐩戞祴鍒嗘瀽 + + //鐩戞祴鍒嗘瀽鍒楄〃鎺т欢 + private HydroWorkingMonitorAnalyListCtrl _monitorAnalyListCtrl = null; + + //鑾峰彇鐩戞祴鍒嗘瀽鍒楄〃鎺т欢 + private HydroWorkingMonitorAnalyListCtrl GetMonitorAnalyListCtrl() + { + if (_monitorAnalyListCtrl == null) + { + _monitorAnalyListCtrl = new HydroWorkingMonitorAnalyListCtrl(); + _monitorAnalyListCtrl.Dock = DockStyle.Fill; + _monitorAnalyListCtrl.HydroViewEvent += (code) => + { + var visual = GetVisual(code); + SelectVisual(visual, eSimulationVisualSource.Monitor); + }; + } + return _monitorAnalyListCtrl; + } + + //鐩戞祴鍒嗘瀽鍒楄〃鎺т欢鏄惁鍙 + private bool IsMonitorAnalyListCtrlVisible + { + get + { + if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible) + { + if (this.controlContainerBottom.Controls.Count > 0) + { + if (this.controlContainerBottom.Controls[0] is HydroWorkingMonitorAnalyListCtrl) + { + return true; + } + } + } + return false; + } + } + + //鏄剧ず鐩戞祴鍊煎垪琛ㄦ帶浠� + private async void ShowMonitorAnalyListCtrl() + { + if (_hydroInfo == null) + { + return; + } + var allWorkingList = GetCheckedWorkingList(); + if (allWorkingList == null || allWorkingList.Count < 1) + { + var workingHelper = GetWorkingHelper(); + if (!workingHelper.Initialized) + { + TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�"); + return; + } + } + var monitorAnalyListCtrl = GetMonitorAnalyListCtrl(); + if (!IsMonitorAnalyListCtrlVisible) + { + this.controlContainerBottom.Controls.Clear(); + this.controlContainerBottom.Controls.Add(monitorAnalyListCtrl); + this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible; + this.docPnlBottom.Text = "鐩戞祴鍒嗘瀽"; + this.docPnlBottom.Height = 350; + } + var allMontorList = await GetMonitorList(); + var allMonitorValueList = await GetMonitorValueList(); + + if (allWorkingList == null || allWorkingList.Count < 1) + { + monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, allMonitorValueList, GetWorking(), GetCalcuResult(), _visual); + } + else + { + monitorAnalyListCtrl.SetBindingData(_hydroInfo, allMontorList, allMonitorValueList, allWorkingList, _visual); + } + } + + //鐩戞祴鍒嗘瀽 + private void barBtnWorkingMonitorAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) + { + ShowMonitorAnalyListCtrl(); + } #endregion @@ -2471,7 +2597,6 @@ } else { - var dlg = new SimulationMultiWorkingEnergyDlg(); dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList); dlg.ShowDialog(); @@ -2636,6 +2761,11 @@ //鍒犻櫎鏂规 private async void DeleteScheme() { + var bol = XtraMessageBox.Show("璇烽棶鏄惁鍒犻櫎褰撳墠鏂规锛�", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes; + if (!bol) + { + return; + } if (_scheme == null) { return; @@ -2669,6 +2799,8 @@ DeleteScheme(); } - #endregion + #endregion 鏂规绠$悊 + + } } \ No newline at end of file -- Gitblit v1.9.3