From 0e54c48e8190937f5b483c79e3cc9d17ec7c9af0 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 15:45:37 +0800
Subject: [PATCH] 提交自动匹配界面优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
index 03ea776..22d964e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
@@ -1,4 +1,6 @@
锘縰sing DevExpress.Utils.Svg;
+using HStation.Vmo;
+using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Xhs.PumpProduct;
using Yw.WinFrmUI.Page;
@@ -24,8 +26,7 @@
public SvgImage Image { get; set; }
}
- private Lazy<BLL.XhsProjectStd> _bllProjectStd = new(() => new BLL.XhsProjectStd());
- private List<XhsProjectStdDto> _allProjectList = null;
+ private List<XhsProjectVmo> _allProjectList = null;
private Lazy<BLL.PumpMain> _bllPump = new(() => new BLL.PumpMain());
@@ -41,8 +42,9 @@
private async void SetBindingData()
{
- _allProjectList = await _bllProjectStd.Value.GetAll();
+ _allProjectList = await BLLFactory<HStation.BLL.XhsProject>.Instance.GetAll();
var allPump = await _bllPump.Value.GetAll();
+ var allValveList = await new BLL.ValveMain().GetAll();
var vm = new CurrentViewModel()
{
Name = "椤圭洰鏁伴噺",
@@ -60,7 +62,7 @@
var vm3 = new CurrentViewModel()
{
Name = "闃�闂ㄥ瀷鍙锋暟閲�",
- Count = 0,
+ Count = allValveList?.Count ?? 0,
Image = ImageLib.Valve
};
var vm4 = new CurrentViewModel()
@@ -81,7 +83,7 @@
public override async void RefreshData()
{
base.RefreshData();
- _allProjectList = await _bllProjectStd.Value.GetAll();
+ _allProjectList = await BLLFactory<HStation.BLL.XhsProject>.Instance.GetAll();
await this.mapViewProjectListContainer1.SetProjectList(_allProjectList);
this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList);
SetBindingData();
@@ -95,7 +97,7 @@
}
//閫夋嫨椤圭洰浜嬩欢
- private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(XhsProjectStdDto obj)
+ private async void homeXhsProjectTreeListCtrl1_SelectProjectEvent(XhsProjectVmo obj)
{
await this.mapViewProjectListContainer1.SelectProject(obj.ID);
var vm = new HomeXhsProjectPropertyViewModel(obj);
@@ -109,9 +111,9 @@
}
//璺宠浆浜嬩欢
- private async void homeXhsProjectPropertyCtrl1_JumpDirectEvent(XhsProjectStdDto obj)
+ private async void homeXhsProjectPropertyCtrl1_JumpDirectEvent(long PrjID)
{
- var bimfacefile = await BimfaceFileStateHelper.IsHaveBimFace(obj.ID);
+ var bimfacefile = await BimfaceFileStateHelper.IsHaveBimFace(PrjID);
if (bimfacefile == null)
{
if (!MessageBoxHelper.IsClickOk("褰撳墠椤圭洰鏈笂浼犳枃浠�,鏄惁鍓嶅幓涓婁紶妯″瀷鏂囦欢?"))
@@ -137,13 +139,16 @@
Modular = Yw.WinFrmUI.PageModular.Bimface,
MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
Function = Yw.WinFrmUI.PageFunction.ViewBimface3d,
- TagName = $"{obj.ID}"
+ TagName = $"{PrjID}"
};
if (!IsExistPage(guid, true))
{
- var page = new XhsSchemeMultiMgrPage();
- await page.SetBindingData(obj.ID);
+ // var page = new XhsSchemeMultiMgrPage();
+ // await page.SetMatching(obj.ID);
+
+ var page = new XhsProjectSimulationMgrPage();
+ await page.SetBindingData(PrjID);
//var page = new XhsProjectSimulationMgrPage();
CreatePage(page, guid);
}
@@ -182,7 +187,7 @@
{
Modular = "Xhs",
MoudingType = eMoudingType.Tab,
- Function = "PumpMgr",
+ Function = "pumpMgr",
};
if (!IsExistPage(pumpGuid, true))
{
@@ -192,6 +197,17 @@
break;
case "闃�闂ㄥ瀷鍙锋暟閲�":
+ var valveGuid = new PageGuid()
+ {
+ Modular = "Xhs",
+ MoudingType = eMoudingType.Tab,
+ Function = "ValveMgr",
+ };
+ if (!IsExistPage(valveGuid, true))
+ {
+ var page = new ValveManageMainPanel();
+ CreatePage(page, valveGuid);
+ }
break;
}
}
--
Gitblit v1.9.3