From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:20 +0800
Subject: [PATCH] 泵曲线修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 120 +++++++++++++++++++++++++++++------------------------------
1 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
index 46f4c51..39fd51a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
@@ -1,7 +1,5 @@
锘縰sing DevExpress.Utils;
using DevExpress.XtraTreeList;
-using HStation.WinFrmUI.Xhs;
-using Timer = System.Threading.Timer;
namespace HStation.WinFrmUI
{
@@ -33,10 +31,6 @@
}
private List<XhsProjectMgrViewModel> _allBindingList = null;
-
- private BLL.XhsProjectExtensions _bll = null;
-
- private event Action ImportProjectCompletedEvent = null;
/// <summary>
/// 鍒濆鍖栨暟鎹簮
@@ -120,23 +114,71 @@
#region 鍩虹鎿嶄綔
- //娣诲姞
- private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ //瀵煎叆椤圭洰
+ private void barBtnImport_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
if (_allBindingList == null)
{
TipFormHelper.ShowError("鏁版嵁鍒濆鍖栧け璐ワ紒");
return;
}
- var dlg = new AddXhsProjectDlg();
- dlg.ReloadDataEvent += (project) =>
+ var dlg = new ImportXhsProjectDlg();
+ dlg.SetBindingData();
+ if (dlg.ShowDialog() == DialogResult.OK)
{
- var vm = new XhsProjectMgrViewModel(project, null, null);
+ var viewModel = dlg.ViewModel;
+ var vm = new XhsProjectMgrViewModel(viewModel.Project, viewModel.MapInfo, viewModel.BimfaceFile);
_allBindingList.Add(vm);
this.treeList1.RefreshDataSource();
- };
- dlg.SetBindingData();
- dlg.ShowDialog();
+ }
+ }
+
+ //涓婁紶妯″瀷
+ private void barBtnUploadBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ if (vm.BimfaceFile != null)
+ {
+ TipFormHelper.ShowWarn("妯″瀷宸蹭笂浼狅紝涓嶈兘閲嶅涓婁紶锛�");
+ return;
+ }
+ var dlg = new ImportXhsProjectDlg();
+ dlg.SetBindingData(vm.Project, vm.MapInfo);
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ var viewModel = dlg.ViewModel;
+ var project = viewModel.Project;
+ if (project == null)
+ {
+ return;
+ }
+ if (project.ID < 1)
+ {
+ return;
+ }
+ var mapInfo = viewModel.MapInfo;
+ if (mapInfo != null)
+ {
+ if (mapInfo.ID < 1)
+ {
+ mapInfo = null;
+ }
+ }
+ var bimfaceFile = viewModel.BimfaceFile;
+ if (bimfaceFile != null)
+ {
+ if (bimfaceFile.ID < 1)
+ {
+ bimfaceFile = null;
+ }
+ }
+ vm.Reset(project, mapInfo, bimfaceFile);
+ this.treeList1.RefreshDataSource();
+ }
}
//缂栬緫
@@ -184,7 +226,7 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, scheme.ID, HStation.Xhs.Purpose.Simulation);
if (schemeRelation != null)
{
- if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(schemeRelation.ID))
+ if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(schemeRelation.ModelID))
{
TipFormHelper.ShowError("椤圭洰鏂规妯″瀷鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
@@ -211,7 +253,7 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, projectSite.ID, HStation.Xhs.Purpose.Simulation);
if (hydroRelation != null)
{
- if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(hydroRelation.ID))
+ if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(hydroRelation.ModelID))
{
TipFormHelper.ShowError("椤圭洰妯″瀷鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
@@ -275,50 +317,6 @@
var dlg = new ViewXhsProjectDlg();
dlg.SetBindingData(vm.Project);
dlg.ShowDialog();
- }
-
- //瀵煎叆鏂囦欢
- private void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- if (_allBindingList == null)
- {
- TipFormHelper.ShowError("鏁版嵁鍒濆鍖栧け璐ワ紒");
- return;
- }
- var dlg = new ImportXhsProjectDlg();
- dlg.SetBindingData();
- if (dlg.ShowDialog() == DialogResult.OK)
- {
- var viewModel = dlg.ViewModel;
- var project = viewModel.Project;
- if (project == null)
- {
- return;
- }
- if (project.ID < 1)
- {
- return;
- }
- var mapInfo = viewModel.MapInfo;
- if (mapInfo != null)
- {
- if (mapInfo.ID < 1)
- {
- mapInfo = null;
- }
- }
- var bimfaceFile = viewModel.BimfaceFile;
- if (bimfaceFile != null)
- {
- if (bimfaceFile.ID < 1)
- {
- bimfaceFile = null;
- }
- }
- var vm = new XhsProjectMgrViewModel(project, mapInfo, bimfaceFile);
- _allBindingList.Add(vm);
- this.treeList1.RefreshDataSource();
- }
}
#endregion
@@ -441,7 +439,7 @@
this.RefreshData();
}
- #endregion 鏇村鎿嶄綔
+ #endregion
#region 鏍戜簨浠�
--
Gitblit v1.9.3