diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts index 07765c2..8c628ef 100644 --- a/src/app/babylon/model/info/model/model-info.ts +++ b/src/app/babylon/model/info/model/model-info.ts @@ -145,7 +145,6 @@ export class ModelInfo { if (this.modelBox != null) { if (play) { SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Green()); - console.log("高亮", this.modelBox.name); } else { SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh); diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index dd4ac7e..2cc2a71 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -644,7 +644,6 @@ export class BuildingWindow extends UIBase { * @param show */ showJYZModules(type: JYZInfoMoudleType, show: boolean) { - console.log("切换页签", type, show); if (this.currentBuidngItem == null) { return; } @@ -655,7 +654,6 @@ export class BuildingWindow extends UIBase { if (this.facilitysByMoudle.has(type)) { facilityByType = this.facilitysByMoudle.get(type); } - console.log("显示设备", facilityByType); for (let i = 0; i < facilityByType.length; i++) { let infos = facilityByType[i].facilityInfo; if (infos != null) { @@ -670,12 +668,10 @@ export class BuildingWindow extends UIBase { if (this.zdByMoudle.has(type)) { zdByType = this.zdByMoudle.get(type); } - console.log("阻挡物", zdByType); for (let i = 0; i < zdByType.length; i++) { let infos = zdByType[i].facilityInfo; if (infos != null) { for (let j = 0; j < infos.length; j++) { - console.log("隐藏阻挡物", infos[j]); infos[j].setEnable(!show); } } @@ -684,7 +680,6 @@ export class BuildingWindow extends UIBase { this.currentJYZInfoMoudleType = type; } else { - console.log("隐藏", this.currentJYZInfoMoudleType); this.currentJYZInfoMoudleType = null; // SceneManager.Instance.highLightLayer.removeAllMeshes(); @@ -733,9 +728,8 @@ export class BuildingWindow extends UIBase { * @param show false 表示隐藏罩棚 */ showZP(show: boolean) { - console.log("展示罩棚", show) this.initFacilityTypeByMoudleType(JYZInfoMoudleType.ZP, this.currentBuidngItem.buildingInfo); - let zpInfoByTypes = this.facilitysByMoudle.get(JYZInfoMoudleType.ZP); + let zpInfoByTypes = this.zdByMoudle.get(JYZInfoMoudleType.ZP); if (zpInfoByTypes != null) { for (let i = 0; i < zpInfoByTypes.length; i++) { let infos = zpInfoByTypes[i].facilityInfo; diff --git a/src/app/babylon/view/toolbar-window/toobar-window.ts b/src/app/babylon/view/toolbar-window/toobar-window.ts index 6f9d582..19987bb 100644 --- a/src/app/babylon/view/toolbar-window/toobar-window.ts +++ b/src/app/babylon/view/toolbar-window/toobar-window.ts @@ -115,7 +115,6 @@ export class ToolbarWindow extends UIBase { * @param show false表示隐藏罩棚 */ showZP(show: boolean) { - console.log("显示罩棚", show); BuildingWindow.instance.showZP(show); } diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 4c1043f..c1e90c3 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -96,7 +96,7 @@ export class PlanComponent implements OnInit { allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急处置"]; //头部 功能栏 selectFence: number = -1; //选中 头部功能栏 isShowChildComponent: boolean = false; //是否 显示左侧子组件 - @ViewChild('leftDomain')leftDomain: LeftDomainComponent; //子组件引用 + @ViewChild('leftDomain') leftDomain: LeftDomainComponent; //子组件引用 isOpenAwning: boolean = true; //是否 打开罩棚 selectMeasure: number = 0; //当前选择 测量工具 @@ -106,14 +106,14 @@ export class PlanComponent implements OnInit { let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow; let fenceType: JYZInfoMoudleType = this.getFenceType(type) if (this.selectFence != type) { - this.isShowChildComponent && this.leftDomain? this.leftDomain.initComponent(type) : null; //手动初始化子组件 + this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type this.isShowChildComponent = true - type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, true) : null + type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, true) : null } else { //取消选中 this.selectFence = -1 this.isShowChildComponent = false - type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, false) : null + type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, false) : null } } @@ -138,7 +138,7 @@ export class PlanComponent implements OnInit { //切换 头部罩棚 toggleHeaderAwning(isOpen: boolean) { - this.isOpenAwning = isOpen + this.isOpenAwning = isOpen; ToolbarWindow.instance.showZP(isOpen) }