部分bug修复

lixiaojun

2024-09-19 1062dfc5f3d522a880e54d94eb87478c08013c96

部分bug修复

 Hydro/HStation.Hydro.Core/TransferHelper.cs

@@ -549,6 +549,7 @@
                    var decorator = new Yw.Model.HydroDecoratorInfo();
                    decorator.Scene = HStation.Revit.ConstParas.Scene;
                    decorator.Name = revitDecorator.Name;
                    decorator.Code = revitDecorator.Code;
                    decorator.Category = revitDecorator.Category;
                    decorator.Decoration = revitDecorator.Decoration;
                    decorator.Description = revitDecorator.Description;

 Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs

@@ -743,11 +743,11 @@
                                }
                                if (exchanger.Diameter < 0.1)
                                {
                                    exchanger.Diameter = 0.1;
                                    exchanger.Diameter = 500;
                                }
                                if (exchanger.Roughness < 0.1)
                                {
                                    exchanger.Roughness = 0.1;
                                    exchanger.Roughness = 110;
                                }
                                model.Exchangers.Add(exchanger);
                            }
@@ -827,11 +827,11 @@
                                }
                                if (pipe.Diameter < 0.1)
                                {
                                    pipe.Diameter = 0.1;
                                    pipe.Diameter = 500;
                                }
                                if (pipe.Roughness < 0.1)
                                {
                                    pipe.Roughness = 0.1;
                                    pipe.Roughness = 110;
                                }
                                model.Pipes.Add(pipe);
                            }
@@ -911,11 +911,11 @@
                                }
                                if (translation.Diameter < 0.1)
                                {
                                    translation.Diameter = 0.1;
                                    translation.Diameter = 500;
                                }
                                if (translation.Roughness < 0.1)
                                {
                                    translation.Roughness = 0.1;
                                    translation.Roughness = 110;
                                }
                                model.Translations.Add(translation);
                            }
@@ -1057,6 +1057,11 @@
                                    valve.MinorLoss = minorLoss;
                                }

                                if (valve.Diameter < 0.1)
                                {
                                    valve.Diameter = 500;
                                }

                                valve.ValveType = jobject[RevitJsonProp.ValveType].ToString();
                                valve.ValveSetting = jobject[RevitJsonProp.ValveSetting].ToString();
                                model.Valves.Add(valve);

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

@@ -20,7 +20,7 @@
        private HStation.Vmo.XhsProjectVmo _project = null;//项目
        private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//项目站
        private Yw.Model.HydroModelInfo _hydroInfo = null;//水力信息
        private List<string> _showHideCodeList = null;//显隐编码列表
        private List<string> _fastShowHideCodeList = null;//显隐编码列表

        private Yw.Model.HydroParterInfo _parter = null;
        private Yw.EPAnet.CheckResult _checkResult = null;
@@ -73,14 +73,25 @@
        #region 模型

        //一键显隐
        private void barBtnShowHide_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        private async void barBtnShowHide_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_hydroInfo == null)
            {
                return;
            }
            if (_showHideCodeList == null)
            if (_hydroInfo.Decorators == null || _hydroInfo.Decorators.Count < 1)
            {
                return;
            }
            if (_fastShowHideCodeList == null)
            {
                _fastShowHideCodeList = _hydroInfo.Waterboxs.Select(x => x.Code).ToList();
                await this.xhsProjectSimulationBimfaceCtrl1.HideComponents(_fastShowHideCodeList);
            }
            else
            {
                await this.xhsProjectSimulationBimfaceCtrl1.ShowComponents(_fastShowHideCodeList);
                _fastShowHideCodeList = null;
            }
        }


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

@@ -41,6 +41,7 @@

        //视图对象
        var _viewer = null;
        var _modeler = null;
        let _callBackObj;//交互对象


@@ -79,6 +80,7 @@
                        _viewer.resize(document.documentElement.clientWidth, document.documentElement.clientHeight - 40)
                    }
                    // 渲染3D模型
                    _modeler = _viewer.getModel();
                    _viewer.render();
                    _callBackObj.LoadViewCompleted();
                });

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

@@ -1,13 +1,11 @@
//显示构件
function showComponents(ids) {
    alert(ids);
    _viewer.showComponents(ids);
    _viewer.render();
}

//隐藏构件
function hideComponents(ids) {
    alert(ids);
    _viewer.hideComponents(ids);
    _viewer.render();
}