From 48eacd38e45e9f0fe0c9d936f672633082f77ebf Mon Sep 17 00:00:00 2001
From: cpf <13562321995@163.com>
Date: Thu, 31 Mar 2022 11:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8FBUG=E4=BF=AE=E6=AD=A3=E3=80=82=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../left-domain/left-domain.component.html    |  4 ++--
 .../left-domain/left-domain.component.ts      | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

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 @@
             <p>油气回收系统类型</p>
             <p>油气回收泵类型</p>
             <p>油气回收处理装置</p>
-            <p>油气回收监测装置</p>
+            <p class="overflowP" id="title{{item.modelInfo.key}}">油气回收监测装置</p>
           </div>
           <div class="tableContent" style="flex: 45%;">
             <p [title]="item.getPropertyData().VRUType"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().VRUType" (click)="stopBubbling($event)"></p>
@@ -170,7 +170,7 @@
             </p>
             <p [title]="item.getPropertyData().VRUPumpType"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().VRUPumpType" (click)="stopBubbling($event)"></p>
             <p [title]="item.getPropertyData().VRUPumpDevice"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().VRUPumpDevice" (click)="stopBubbling($event)"></p>
-            <p [title]="item.getPropertyData().MonitoringDevice"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().MonitoringDevice" (click)="stopBubbling($event)"></p>
+            <p [title]="item.getPropertyData().MonitoringDevice" class="overflowP" id="content{{item.modelInfo.key}}"><textarea nz-input nzAutosize id="num{{item.modelInfo.key}}" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().MonitoringDevice" (click)="stopBubbling($event)" (input)="textInput(item)"></textarea></p>
           </div>
         </div>
         <div class="propertyImage" id="orvrViewer{{item.getID()}}">
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 {
         }
       })
     }
+  
   }
 
   //选中 设备