From 651d1f87d2e0e26021c20f3667e1db7b1349b478 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:27:44 +0800
Subject: [PATCH] 冲突缺少文件补充
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs
index 8651228..ece24ca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs
@@ -22,7 +22,7 @@
public async Task SetBindingData(long projectId)
{
_projectId = projectId;
- var projectSite = await new HStation.BLL.XhsProjectSiteStd().GetDefaultByProjectID(projectId);
+ var projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(projectId);
if (projectSite == null)
{
return;
@@ -80,9 +80,9 @@
//涓存椂---閫夋嫨娉靛瀷鍙�
private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new ChoicePumpMainDlg();
- dlg.SetBindingData();
- dlg.ShowDialog();
+ // var dlg = new AssetsAutoMatchingMainDlg();
+ // dlg.SetMatching();
+ // dlg.ShowDialog();
}
private async void barButtonItem2_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -109,8 +109,16 @@
private async void barButtonItem4_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
-
await this.xhsProjectAssetsBimfaceCtrl1.ShowAllComponents();
}
+
+ //鑷姩鍖归厤
+ private void barBtnAutoMatch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ /* var dlg = new AssetsAutoMatchingMainDlg();
+ dlg.SetMatching();
+ dlg.ShowDialog();
+ */
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3