From 1c2490e4009efa2c6322f1bb7d0318d06daa986d Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 12 Nov 2021 14:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B2=B9=E6=9C=BA=EF=BC=8C=E6=B2=B9?=
 =?UTF-8?q?=E7=BD=90=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/controller/data-manager.ts    |  2 +-
 .../property-data/in/property-data-yg.ts      | 10 +++++--
 .../left-domain/left-domain.component.html    | 30 +++++++++----------
 .../left-domain/left-domain.component.scss    |  4 ++-
 .../left-domain/left-domain.component.ts      |  1 -
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts
index aed716a..de28f8a 100644
--- a/src/app/babylon/controller/data-manager.ts
+++ b/src/app/babylon/controller/data-manager.ts
@@ -444,7 +444,7 @@ export class DataManager {
       case FacilityType.XF_MHQ_GF_8:
       case FacilityType.XF_MHQ_GF_35: result = new PropertyData_MHQ(key, facilityType); break;
       case FacilityType.JY_JYJ: result = new PropertyData_JYJ(key,"", "","", "","",); break;
-      case FacilityType.JY_YG: result = new PropertyData_YG(key); break;
+      case FacilityType.JY_YG: result = new PropertyData_YG(key,"", "","", "","",""); break;
       case FacilityType.JY_SYGX: result = new PropertyData_SYGX(key); break;
       case FacilityType.JY_YQHSGX: result = new PropertyData_YQHSGX(key); break;
 
diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts
index c0b1888..a491273 100644
--- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts
+++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts
@@ -14,12 +14,18 @@ export class PropertyData_YG extends PropertyData_Base {
   tankFarm: string = ""; //罐区
   oilTankType: string = ""; //油罐类型
 
-  constructor(key: string) {
+  constructor(key: string,oilProductNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) {
     super(key, FacilityType.JY_YG);
+    this.oilProductNo = oilProductNo
+    this.oilTankVolume = oilTankVolume
+    this.safeVolume = safeVolume
+    this.quantity = quantity
+    this.tankFarm = tankFarm
+    this.oilTankType = oilTankType
   }
 
   clone(key: string) {
-    let result = new PropertyData_YG(key);
+    let result = new PropertyData_YG(key,this.oilProductNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType);
     return result;
   }
 
diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html
index 2b3196f..65c0b73 100644
--- a/src/app/pages/left-domain/left-domain.component.html
+++ b/src/app/pages/left-domain/left-domain.component.html
@@ -18,8 +18,8 @@
     <!-- 基本信息 -->
     <!-- 加油机 -->
     <div class="publicBox refueller" *ngIf="beforeFence === 1">
-      <div class="interval">
-        <p class="title">1类加油机</p>
+      <div class="interval" *ngFor="let item of FacilityList">
+        <p class="title">{{item.getName()}}</p>
         <div class="table">
           <div class="tableHeader">
             <p>品牌</p>
@@ -29,11 +29,11 @@
             <p>油泵类型</p>
           </div>
           <div class="tableContent">
-            <p>超大牌</p>
-            <p>2</p>
-            <p>4</p>
-            <p>92#</p>
-            <p>自吸泵</p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().brand"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().superBrand"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilGunNum"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilProductNo"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilPumpType"></p>
           </div>
         </div>
       </div>
@@ -41,8 +41,8 @@
     <!-- 加油机 -->
     <!-- 油罐设备 -->
     <div class="publicBox refueller oilTank" *ngIf="beforeFence === 2">
-      <div class="interval">
-        <p class="title">1号油罐</p>
+      <div class="interval" *ngFor="let item of FacilityList">
+        <p class="title">{{item.getName()}}</p>
         <div class="table">
           <div class="tableHeader">
             <p>油品品号</p>
@@ -53,12 +53,12 @@
             <p>油罐类型</p>
           </div>
           <div class="tableContent">
-            <p>92#</p>
-            <p>200L</p>
-            <p>180L</p>
-            <p>1</p>
-            <p>独立罐区</p>
-            <p>防渗罐池</p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilProductNo"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilTankVolume"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().safeVolume"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().quantity"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().tankFarm"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().oilTankType"></p>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss
index 2f23f94..1238ac9 100644
--- a/src/app/pages/left-domain/left-domain.component.scss
+++ b/src/app/pages/left-domain/left-domain.component.scss
@@ -33,8 +33,10 @@
   }
 }
 
-.title{ font-size: 16px; height: 20px; line-height: 20px; margin-bottom: 20px; } //头部header
 .publicBox{ width: 100%; height: 100%; overflow-y: auto; padding: 0 20px; }
+.title{ font-size: 16px; height: 20px; line-height: 20px; margin-bottom: 20px; } //头部header
+.tableInput{ border: none; outline: none; background-color: transparent; width: 100%; height: 100%; }
+
 .baseInfo{ //基本信息
   .interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } //分隔div
   p{ height: 20px; line-height: 20px; }
diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts
index 71bc4be..eb3d85b 100644
--- a/src/app/pages/left-domain/left-domain.component.ts
+++ b/src/app/pages/left-domain/left-domain.component.ts
@@ -49,7 +49,6 @@ export class LeftDomainComponent implements OnInit {
       }
     })
     this.FacilityList = list
-    console.log(this.FacilityList,this.FacilityList[0].getPropertyData(),'筛选设备')
     if (this.beforeFence === 3) { //消防设施
       this.handleTreeData(this.FacilityList)
     }