From 8eb1a19c55846f70b3b6bf43e32c2e94333d52e7 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:07:34 +0800
Subject: [PATCH] epanet 计算完善
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 1e6b686..60c0b84 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,9 +1,6 @@
-锘縰sing DevExpress.CodeParser;
-using DevExpress.Utils;
+锘縰sing DevExpress.Utils;
using DevExpress.XtraTreeList;
using HStation.WinFrmUI.Xhs;
-using NetTaste;
-using System;
using Timer = System.Threading.Timer;
namespace HStation.WinFrmUI
@@ -21,7 +18,8 @@
this.Load += XhsProjectMgrPage_Load;
}
- private void XhsProjectMgrPage_Load(object sender, EventArgs e)
+ private void XhsProjectMgrPage_Load
+ (object sender, EventArgs e)
{
repositoryItemImageComboBox1.Items.AddEnum(typeof(XhsProjectMgrViewModel.eFileStatus));
var a = typeof(XhsProjectMgrViewModel.eFileStatus);
@@ -302,7 +300,7 @@
if (!IsExistPage(guid, true))
{
- var page = new XhsSchemeMultiMgrPage();
+ var page = new XhsProjectSimulationMgrPage();
await page.SetBindingData(vm.ID);
CreatePage(page, guid);
}
@@ -403,7 +401,7 @@
}
//瀵煎叆鏂囦欢
- private void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var currentVm = this.GetCurrentViewModel();
if (currentVm == null)
@@ -411,10 +409,25 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
return;
}
+ if (currentVm.ModelState != XhsProjectMgrViewModel.eFileStatus.Noupload)
+ {
+ MessageBoxHelper.ShowWarning("宸茬粡瀛樺湪妯″瀷鏂囦欢!");
+ return;
+ }
var dlg = new ImportXhsProjectFileDlg();
dlg.SetBindingData(currentVm.ID);
if (dlg.ShowDialog() == DialogResult.OK)
{
+ var prj = dlg.ViewModel;
+ if (prj.ProjectID == null)
+ return;
+ var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, (long)prj.ProjectID, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
+ var bimFile = await BimfaceFileStateHelper.IsHaveBimFace((long)prj.ProjectID);
+ if (bimFile != null)
+ {
+ currentVm.Reset(currentVm, bimFile.FileStatus);
+ this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
+ }
}
}
}
--
Gitblit v1.9.3