From 0f8ab9b81c5801869a1b620dbc74a95e07c0a566 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 08 十月 2024 17:47:14 +0800
Subject: [PATCH] 增加喷头界面字段
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 205 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 143 insertions(+), 62 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 b4bcdad..ce4f749 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
@@ -14,11 +14,18 @@
{
InitializeComponent();
this.treeList1.InitialMultiColSettings();
+ this.treeList1.Appearance.Row.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Default;
this.PageTitle.Caption = "椤圭洰绠＄悊";
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.PageTitle.SvgImageSize = new Size(24, 24);
- repositoryItemImageComboBox1.Items.AddEnum(typeof(Yw.WinFrmUI.Bimface.eFileStatus));
- var a = typeof(Yw.WinFrmUI.Bimface.eFileStatus);
+ this.Load += XhsProjectMgrPage_Load;
+ }
+
+ private void XhsProjectMgrPage_Load
+ (object sender, EventArgs e)
+ {
+ repositoryItemImageComboBox1.Items.AddEnum(typeof(XhsProjectMgrViewModel.eFileStatus));
+ var a = typeof(XhsProjectMgrViewModel.eFileStatus);
repositoryItemImageComboBox1.Items[0].ImageIndex = 0;
repositoryItemImageComboBox1.Items[1].ImageIndex = 1;
repositoryItemImageComboBox1.Items[2].ImageIndex = 2;
@@ -27,11 +34,14 @@
repositoryItemImageComboBox1.Items[5].ImageIndex = 5;
repositoryItemImageComboBox1.Items[6].ImageIndex = 6;
repositoryItemImageComboBox1.Items[7].ImageIndex = 7;
+ repositoryItemImageComboBox1.Items[8].ImageIndex = 8;
}
private List<XhsProjectMgrViewModel> _allProjectList = null;
private BLL.XhsProjectExtensions _bll = null;
+
+ private event Action ImportProjectCompletedEvent = null;
/// <summary>
/// 鍒濆鍖栨暟鎹簮
@@ -51,6 +61,7 @@
{
foreach (var project in allProjectList)
{
+ var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, project.ID, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
var bimFile = await BimfaceFileStateHelper.IsHaveBimFace(project.ID);
if (bimFile != null)
{
@@ -62,12 +73,12 @@
StartTimer(300, bimFile.ID);
});
}
- var vm = new XhsProjectMgrViewModel(project, true, bimFile.FileStatus);
+ var vm = new XhsProjectMgrViewModel(project, true, bimFile.FileStatus, mapinfo);
_allProjectList.Add(vm);
}
else
{
- var vm = new XhsProjectMgrViewModel(project, false);
+ var vm = new XhsProjectMgrViewModel(project, false, 8, mapinfo);
_allProjectList.Add(vm);
}
}
@@ -106,38 +117,6 @@
}
}
- //鍏ㄩ儴灞曞紑
- private void barBtnExpandAll_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- this.treeList1.ExpandAll();
- }
-
- //鍏ㄩ儴鎶樺彔
- private void barBtnCollpseAll_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- this.treeList1.CollapseAll();
- }
-
- /// <summary>
- /// 鏍戠嚎
- /// </summary>
- private void barCkTreeLine_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- this.treeList1.OptionsView.ShowTreeLines = this.barCkTreeLine.Checked ? DefaultBoolean.True : DefaultBoolean.False;
- }
-
- //鏌ヨ
- private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- this.treeList1.OptionsFind.AlwaysVisible = !this.treeList1.OptionsFind.AlwaysVisible;
- }
-
- //鍒锋柊
- private void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- this.SetBindingData();
- }
-
#region 褰撳墠
//鑾峰彇褰撳墠
@@ -167,40 +146,75 @@
#region 鍩虹鎿嶄綔
//娣诲姞
- private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddProjectDlg();
- dlg.ReloadDataEvent += async (rhs, mapinfo) =>
- {
- var bll = new BLL.XhsProjectExtensions();
- var id = await bll.Insert(rhs);
- if (id > 0)
- {
- rhs.ID = id;
- var vmo = await _bll.GetByID(id);
- _allProjectList.Add(new XhsProjectMgrViewModel(vmo, false));
- this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
- if (mapinfo != null)
- {
- mapinfo.ObjectID = id;
- mapinfo.ObjectName = rhs.Name;
- var mapinfoid = await new Yw.BLL.MapInfo().Insert(mapinfo);
- if (mapinfoid < 0)
+ /* var dlg = new AddProjectDlg();
+ dlg.ReloadDataEvent += async (rhs, mapinfo) =>
{
- TipFormHelper.ShowError("鍦板浘淇℃伅娣诲姞閿欒");
- }
- }
- return true;
+ var bll = new BLL.XhsProjectExtensions();
+ var id = await bll.Insert(rhs);
+ if (id > 0)
+ {
+ rhs.ID = id;
+ var vmo = await _bll.GetByID(id);
+ _allProjectList.Add(new XhsProjectMgrViewModel(vmo, false));
+ this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
+ if (mapinfo != null)
+ {
+ mapinfo.ObjectID = id;
+ mapinfo.ObjectName = rhs.Name;
+ var mapinfoid = await new Yw.BLL.MapInfo().Insert(mapinfo);
+ if (mapinfoid < 0)
+ {
+ TipFormHelper.ShowError("鍦板浘淇℃伅娣诲姞閿欒");
+ }
+ }
+ return true;
+ }
+ return false;
+ };
+ dlg.ShowDialog();
+ */
+ var dlg = new ImportXhsProjectDlg();
+ dlg.SetBindingData();
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ var prj = dlg.ViewModel;
+ if (prj.ProjectID == null)
+ return;
+ var vmo = await _bll.GetByID((long)prj.ProjectID);
+ if (vmo == null)
+ {
+ TipFormHelper.ShowError("瀵煎叆澶辫触!");
+ return;
}
- return false;
- };
- dlg.ShowDialog();
+ else
+ {
+ TipFormHelper.ShowSucceed("瀵煎叆鎴愬姛!");
+ 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)
+ {
+ _allProjectList.Add(new XhsProjectMgrViewModel(vmo, true, bimFile.FileStatus, mapinfo));
+ }
+ else
+ {
+ _allProjectList.Add(new XhsProjectMgrViewModel(vmo, false, 8, mapinfo));
+ }
+ this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
+ }
+ }
}
//缂栬緫
private void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var currentVm = this.GetCurrentViewModel();
+ if (currentVm == null)
+ {
+ MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
+ return;
+ }
var dlg = new EditProjectDlg();
dlg.SetBindingData(currentVm.ID);
dlg.ReloadDataEvent += async (rhs, mapinfo) =>
@@ -289,11 +303,47 @@
if (!IsExistPage(guid, true))
{
- var page = new XhsSchemeMultiMgrPage();
+ var page = new XhsProjectSimulationMgrPage();
await page.SetBindingData(vm.ID);
CreatePage(page, guid);
}
}
+
+ #region 鏇村鎿嶄綔
+
+ //鍏ㄩ儴灞曞紑
+ private void barBtnExpandAll_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.ExpandAll();
+ }
+
+ //鍏ㄩ儴鎶樺彔
+ private void barBtnCollpseAll_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.CollapseAll();
+ }
+
+ /// <summary>
+ /// 鏍戠嚎
+ /// </summary>
+ private void barCkTreeLine_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.OptionsView.ShowTreeLines = this.barCkTreeLine.Checked ? DefaultBoolean.True : DefaultBoolean.False;
+ }
+
+ //鏌ヨ
+ private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.treeList1.OptionsFind.AlwaysVisible = !this.treeList1.OptionsFind.AlwaysVisible;
+ }
+
+ //鍒锋柊
+ private void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ this.SetBindingData();
+ }
+
+ #endregion 鏇村鎿嶄綔
//鏌ョ湅bimface妯″瀷
private async void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -352,5 +402,36 @@
CreatePage(page, guid);
}
}
+
+ //瀵煎叆鏂囦欢
+ private async void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var currentVm = this.GetCurrentViewModel();
+ if (currentVm == null)
+ {
+ 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);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3