冲突

duheng

2024-09-27 32b2fee0421e7997672fe4a14fe5bf9a6de926c2

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -20,7 +20,6 @@
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.xhsProjectSimulationMatchingListCtrl1.FormRowClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
        }

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
@@ -74,12 +73,7 @@
            await this.xhsProjectSimulationBimfaceCtrl1.SetBindingData(_project, _projectSite, () => _hydroInfo);
            this.xhsProjectSimulationQ3dCtrl1.SetBindingData(_hydroInfo);
            this.xhsProjectSimulationL3dCtrl1.SetBindingData(_hydroInfo);
        }

        //属性面板获取水力信息事件
        private Yw.Model.HydroModelInfo xhsProjectSimulationPropertyCtrl1_GetHydroInfoEvent()
        {
            return _hydroInfo;
            this.xhsProjectSimulationPropertyCtrl1.SetBindingData(() => _hydroInfo);
        }

        //水力计算
@@ -204,10 +198,16 @@

        #endregion Bimface

        #region 属性面板



        #endregion

        #region 自动匹配

        //自动匹配
        private void barBtnMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private void barBtnMatchingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
            {
@@ -221,15 +221,32 @@

            var input = AssetsMatchingParasHelper.Create(_hydroInfo);
            this.xhsProjectSimulationMatchingListCtrl1.SetBindingData(input);
            this.xhsProjectSimulationMatchingListCtrl1.RelaodEvent += (output) =>
            {
                return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
            };
            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            this.docPnlMatchingList.Height = 350;
        }

        #endregion 自动匹配
        //水力信息点击
        private async void xhsProjectSimulationMatchingListCtrl1_HydroClickEvent(string code)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            var allParterList = _hydroInfo.GetAllParters();
            _parter = allParterList.Find(x => x.Code == code);
            var elementIds = new List<string>() { _parter.Code };
            await this.xhsProjectSimulationBimfaceCtrl1.ZoomAndSelectComponents(elementIds);
            ShowProperty();
            SetBimfaceLinkColor();
        }

        //应用匹配事件
        private bool xhsProjectSimulationMatchingListCtrl1_ApplyMatchingEvent(AssetsMatchingViewModel output)
        {
            return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
        }

        #endregion

        #region 未匹配列表

@@ -301,7 +318,7 @@
            }
        }

        #endregion 一键显隐
        #endregion

        #region 水力校验

@@ -344,7 +361,7 @@
            ShowProperty();
        }

        #endregion 水力校验
        #endregion

        #region 保存水力信息

@@ -365,7 +382,7 @@
            TipFormHelper.ShowSucceed("保存成功！");
        }

        #endregion 保存水力信息
        #endregion

        #region 业务方法

@@ -432,5 +449,7 @@
        #endregion




    }
}