diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 62534f4..09accd9 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -188,7 +188,7 @@ -
+
@@ -212,7 +212,7 @@
-
+

diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index 75c117a..dda1225 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -63,7 +63,7 @@ export class LeftDomainComponent implements OnInit { } return } - if (this.beforeFence === 7) { //应急预案 + if (this.beforeFence === 8) { //应急预案 this.selectPlanId = null this.selectNodeId = null if (MarkWindow.instance) { @@ -83,14 +83,14 @@ export class LeftDomainComponent implements OnInit { item.getType() === "JY_SYGX" ? list.push(item) : null } else if (this.beforeFence === 6) { //油气回收 item.getType() === "JY_YQHSGX" ? list.push(item) : null - } else if (this.beforeFence === 8) { //阀门 + } else if (this.beforeFence === 7) { //阀门 item.getType() === "JY_FM" ? list.push(item) : null } }) this.FacilityList = list console.log(this.FacilityList[0].getPropertyData()) this.selectFacilityId = null - if (this.beforeFence === 1 || this.beforeFence === 2 || this.beforeFence === 8) { //加油机/油罐设备/阀门 + if (this.beforeFence === 1 || this.beforeFence === 2 || this.beforeFence === 7) { //加油机/油罐设备/阀门 this.FacilityList.forEach(item => { window.setTimeout(()=>{ this.textInput(item) diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index cce3dcc..341bcf8 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -27,10 +27,10 @@ -
+
-
{{allFence[selectFence]}}
+
{{allFence[selectFence]}}
@@ -39,7 +39,7 @@
-
+

@@ -111,7 +111,7 @@ -
+
@@ -119,7 +119,7 @@

{{item.getIconName()}}

- +
@@ -153,7 +153,7 @@ -
+

diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 50e68d0..5069289 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -155,7 +155,7 @@ export class PlanComponent implements OnInit { } ngOnDestroy(): void { //组件销毁前 销毁canvas - if (this.selectFence === 7) { //初始化 应急预案模块 + if (this.selectFence === 8) { //初始化 应急预案模块 this.initializePlan() } this.game.pauseRender(); @@ -173,7 +173,7 @@ export class PlanComponent implements OnInit { //开发模式 选择单位 弹窗 modelInit(InsList) { } - allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急预案", "阀门"]; //头部 功能栏 + allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "阀门", "应急预案"]; //头部 功能栏 baseInfoMarks: baseInfoMark[] = [new baseInfoMark("毗邻"), new baseInfoMark("区域"), new baseInfoMark("图片"), new baseInfoMark("点位")] //基本信息 设备筛选list selectFence: number = -1; //选中 头部功能栏 isShowChildComponent: boolean = false; //是否 显示左侧子组件 @@ -188,10 +188,10 @@ export class PlanComponent implements OnInit { let fenceType: JYZInfoMoudleType = this.getFenceType(type) this.isShowNature = false //隐藏属性栏 if (this.selectFence != type) { - if (this.selectFence === 7) { //初始化 应急预案模块 + if (this.selectFence === 8) { //初始化 应急预案模块 this.initializePlan() } - if (type === 7) { //初始化 应急预案 data + if (type === 8) { //初始化 应急预案 data this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type this.editMode ? this.isShowChildComponent = true : this.isShowChildComponent = false @@ -213,7 +213,7 @@ export class PlanComponent implements OnInit { this.selectFence = -1 this.isShowChildComponent = false buildingWindow.changeJYZInfoModel(fenceType, false) - if (type === 7) { //初始化 应急预案模块 + if (type === 8) { //初始化 应急预案模块 this.initializePlan() } } @@ -237,9 +237,9 @@ export class PlanComponent implements OnInit { } else if (type === 6) { fenceType = JYZInfoMoudleType.YQHSGX } else if (type === 7) { - fenceType = JYZInfoMoudleType.YJCZ - } else if (type === 8) { fenceType = JYZInfoMoudleType.FM + } else if (type === 8) { + fenceType = JYZInfoMoudleType.YJCZ } return fenceType }