diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 9d3a279..e766ab8 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -158,7 +158,7 @@

油气回收系统类型

油气回收泵类型

油气回收处理装置

-

油气回收监测装置

+

油气回收监测装置

@@ -170,7 +170,7 @@

-

+

diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index b1852e6..7a8df38 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -89,18 +89,17 @@ export class LeftDomainComponent implements OnInit { }) this.FacilityList = list this.selectFacilityId = null - if (this.beforeFence === 1 || this.beforeFence === 7) { //加油机/阀门 - this.FacilityList.forEach(item => { - window.setTimeout(()=>{ - this.textInput(item) - },0) - }) - } else if (this.beforeFence === 2) { //油罐设备 + if (this.beforeFence === 1 || this.beforeFence === 2 || this.beforeFence === 6 || this.beforeFence === 7) { //加油机/油罐设备/油气回收/阀门 this.FacilityList.forEach(item => { window.setTimeout(()=>{ this.textInput(item) },0) }) + } + if (this.beforeFence === 3) { //消防设施 + this.handleTreeData(this.FacilityList) + } + if (this.beforeFence === 2) { //油罐设备 PlanComponent.instance.tankFarm.isHave = false; this.FacilityList.forEach(item => { if (item.getPropertyData().tankFarm != undefined) { @@ -109,9 +108,8 @@ export class LeftDomainComponent implements OnInit { return; } }) - } else if (this.beforeFence === 3) { //消防设施 - this.handleTreeData(this.FacilityList) - } else if (this.beforeFence === 5 || this.beforeFence === 6) { //初始化 Viewer + } + if (this.beforeFence === 5 || this.beforeFence === 6) { //初始化 Viewer let id: string = this.beforeFence === 5 ? "pipelineViewer" : "orvrViewer" this.FacilityList.forEach(item => { if (item.getPropertyData() && item.getPropertyData().img) { @@ -121,6 +119,7 @@ export class LeftDomainComponent implements OnInit { } }) } + } //选中 设备