更改事件名称

lixiaojun

2024-09-27 ce1cc10e518ddac71cfefd433f8a6af9fb46ed40

更改事件名称

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs

@@ -172,8 +172,7 @@
                                    var curveqh = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQH);
                                    if (curveqh == null)
                                    {
                                        var allParterList = hydroInfo.GetAllParters();
                                        var parterNameList = allParterList?.Select(x => x.Code).Distinct().ToList();
                                        curveqh = new Yw.Model.HydroCurveInfo();
                                        curveqh.Catalog = Yw.Hydro.ParterCatalog.Curve;
                                        curveqh.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
                                        curveqh.Name = "匹配";
@@ -201,6 +200,7 @@
                                    var curveqp = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
                                    if (curveqp == null)
                                    {
                                        curveqp = new Yw.Model.HydroCurveInfo();
                                        curveqp.Catalog = Yw.Hydro.ParterCatalog.Curve;
                                        curveqp.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
                                        curveqp.Name = "匹配";
@@ -228,6 +228,7 @@
                                    var curveqe = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQE);
                                    if (curveqe == null)
                                    {
                                        curveqe = new Yw.Model.HydroCurveInfo();
                                        curveqe.Catalog = Yw.Hydro.ParterCatalog.Curve;
                                        curveqe.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", GetAllCodeList(hydroInfo));
                                        curveqe.Name = "匹配";

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs

@@ -186,24 +186,24 @@
                return true;
            }

            feedBackMsg?.Invoke("正在进行产品匹配...", Color.Black);
            hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
            var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
            if (await AssetsMatchingHelper.Matching(matchingParas))
            {
                if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
                {
                    feedBackMsg?.Invoke("产品匹配成功。。。", Color.Green);
                }
                else
                {
                    feedBackMsg?.Invoke("产品匹配失败！！！", Color.Red);
                }
            }
            else
            {
                feedBackMsg?.Invoke("产品匹配失败！！！", Color.Red);
            }
            //feedBackMsg?.Invoke("正在进行产品匹配...", Color.Black);
            //hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroId);
            //var matchingParas = AssetsMatchingParasHelper.Create(hydroInfo);
            //if (await AssetsMatchingHelper.Matching(matchingParas))
            //{
            //    if (AssetsMatchingParasHelper.Apply(hydroInfo, matchingParas))
            //    {
            //        feedBackMsg?.Invoke("产品匹配成功。。。", Color.Green);
            //    }
            //    else
            //    {
            //        feedBackMsg?.Invoke("产品匹配失败！！！", Color.Red);
            //    }
            //}
            //else
            //{
            //    feedBackMsg?.Invoke("产品匹配失败！！！", Color.Red);
            //}

            feedBackMsg?.Invoke("水力结构文件解析成功。。。", Color.Green);
            feedBackProgress?.Invoke(100, 30);

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.cs

@@ -18,9 +18,9 @@
            HydroClickEvent.Invoke(code);
        }

        public event Action<string> HydroClickEvent = null;
        public event Action<string> HydroClickEvent;

        public event Func<AssetsMatchingViewModel, bool> RelaodEvent = null;
        public event Func<AssetsMatchingViewModel, bool> ApplyMatchingEvent;

        private BLL.PumpMain _pumpMain = null;

@@ -85,7 +85,7 @@
        //确定
        private void btnComplete_Click(object sender, EventArgs e)
        {
            if (RelaodEvent.Invoke(_assetsAutoMatching))
            if (ApplyMatchingEvent.Invoke(_assetsAutoMatching))
            {
                TipFormHelper.ShowSucceed("修改成功!");
            }

 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.HydroClickEvent += xhsProjectSimulationHydroCheckFailedCtrl1_HydroClickEvent;
        }

        private HStation.Vmo.XhsProjectVmo _project = null;//项目
@@ -222,7 +221,7 @@

            var input = AssetsMatchingParasHelper.Create(_hydroInfo);
            this.xhsProjectSimulationMatchingListCtrl1.SetBindingData(input);
            this.xhsProjectSimulationMatchingListCtrl1.RelaodEvent += (output) =>
            this.xhsProjectSimulationMatchingListCtrl1.ApplyMatchingEvent += (output) =>
            {
                return AssetsMatchingParasHelper.Apply(_hydroInfo, output);
            };

 WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/html/Interop3d.html

@@ -120,6 +120,7 @@
<script src="../js/ComponentsColor.js"></script>
<script src="../js/CustomLabels.js"></script>


<script src="js/Background.js"></script>
<script src="js/CameraStatus.js"></script>
<script src="js/ContextMenu.js"></script>

 WinFrmUI/Yw.WinFrmUI.Bimface.Core/bimface/js/CustomLabels.js

@@ -66,3 +66,6 @@
    return html += '</table>';
}