From 6171f94b5ca6c804ac2892d214943ff0ac400d26 Mon Sep 17 00:00:00 2001 From: ningshuxia <ningshuxia0927@outlook.com> Date: 星期三, 26 三月 2025 16:07:42 +0800 Subject: [PATCH] 模型编辑 --- WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/01-core/QuickModelingPage.cs | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/01-core/QuickModelingPage.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/01-core/QuickModelingPage.cs index 6d2f794..5cde71f 100644 --- a/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/01-core/QuickModelingPage.cs +++ b/WinFrmUI/PBS.WinFrmUI.Hydro/02-quick-modeling/01-core/QuickModelingPage.cs @@ -18,8 +18,7 @@ private QuickModelingManager _wizard = null;//绠$悊鍣� private List<IWizardPageAsync<QuickModelingViewModel>> _allPageList = null;//鎵�鏈夐〉闈㈠垪琛� private List<IWizardPageAsync<QuickModelingViewModel>> _bindingPageList = null;//缁戝畾椤甸潰鍒楄〃 - - + /// <summary> /// 鍒濆鍖栨暟鎹簮 @@ -30,7 +29,21 @@ _vm = new QuickModelingViewModel(); _vm.Place = new(); _vm.Facility = new(); - _vm.AssetsPackageList =await BLLFactory<HStation.BLL.AssetsPackageMain>.Instance.GetAll(); + + + _vm.Place.Name = "鍢夊畾鍦烘墍"; + _vm.Facility.Name = "鍢夊畾璁炬柦"; + _vm.Facility.WaterSupply = eWaterSupply.Low; + _vm.Facility.SupplyMode = eSupplyMode.Municipal; + _vm.Facility.Floor = 7; + _vm.Facility.FloorHeight = 3; + _vm.Facility.Households = 40; + _vm.Facility.MaxWaterDemand = 44; + _vm.Facility.ConstantPressure = 22.5; + _vm.Facility.TerminalPressure = 15; + _vm.Facility.MaxHeight = 40; + + _vm.AssetsPackageList = await BLLFactory<HStation.BLL.AssetsPackageMain>.Instance.GetAll(); InitialManager(); } @@ -89,18 +102,18 @@ this.navigationFrame.AddPage(pageFacility); - //var pageModelEdit = _allPageList.Find(x => x is QuickModelingFacilityWizardPage) as QuickModelingFacilityWizardPage; - //if (pageModelEdit == null) - //{ - // pageModelEdit = new QuickModelingFacilityWizardPage(); - // pageModelEdit.Dock = DockStyle.Fill; - // _allPageList.Add(pageModelEdit); - //} + var pageModelEdit = _allPageList.Find(x => x is QuickModelingModelDrawWizardPage) as QuickModelingModelDrawWizardPage; + if (pageModelEdit == null) + { + pageModelEdit = new QuickModelingModelDrawWizardPage(); + pageModelEdit.Dock = DockStyle.Fill; + _allPageList.Add(pageModelEdit); + } - //_bindingPageList.Add(pageModelEdit); - //this.navigationFrame.AddPage(pageModelEdit); + _bindingPageList.Add(pageModelEdit); + this.navigationFrame.AddPage(pageModelEdit); - + } //鍒濆鍖栨楠� @@ -119,10 +132,10 @@ { AddStepItem("璁炬柦"); } - //else if (page is QuickModelingFacilityWizardPage) - //{ - // AddStepItem("妯″瀷"); - //} + else if (page is QuickModelingModelDrawWizardPage) + { + AddStepItem("妯″瀷"); + } } } @@ -190,7 +203,8 @@ { //this.ReloadDataEvent?.Invoke(_vm.Scheme); //this.DialogResult = DialogResult.OK; - this.Close(); + TipFormHelper.ShowInfo("蹇�熷缓妯℃垚鍔�,椤甸潰鑷姩鍏抽棴!"); + this.ClosePage(this.PageGuid); } } } -- Gitblit v1.9.3