修改匹配细节

duheng

2024-09-26 88c13046c69ebeb0bc323c8d81501f5933f5a81f

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs

@@ -1,5 +1,6 @@
using DevExpress.Utils.Svg;
using HStation.Vmo;
using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Xhs.PumpProduct;
using Yw.WinFrmUI.Page;

@@ -43,6 +44,7 @@
        {
            _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()
@@ -109,9 +111,9 @@
        }

        //跳转事件
        private async void homeXhsProjectPropertyCtrl1_JumpDirectEvent(XhsProjectVmo 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,16 +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);
                    // await page.SetMatching(obj.ID);

                    var page = new XhsProjectSimulationMgrPage();
                    await page.SetBindingData(obj.ID);
                    await page.SetBindingData(PrjID);
                    //var page = new XhsProjectSimulationMgrPage();
                    CreatePage(page, guid);
                }
@@ -185,7 +187,7 @@
                    {
                        Modular = "Xhs",
                        MoudingType = eMoudingType.Tab,
                        Function = "PumpMgr",
                        Function = "pumpMgr",
                    };
                    if (!IsExistPage(pumpGuid, true))
                    {
@@ -195,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;
            }
        }