From 4a16246d7e0543d57d97f27fcb2a8c1f8e223fdd Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 23 Dec 2021 11:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B2=B9=E6=9C=BA,=E6=B2=B9=E7=BD=90?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=B2=B9=E6=9E=AA=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/controller/data-manager.ts                  | 4 ++--
 .../babylon/model/data/institution/building/export-data.ts  | 4 ++++
 .../facility/property-data/in/property-data-jyj.ts          | 6 ++++--
 .../facility/property-data/in/property-data-yg.ts           | 6 ++++--
 src/app/pages/left-domain/left-domain.component.html        | 4 ++++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts
index bf268db..4a0c15c 100644
--- a/src/app/babylon/controller/data-manager.ts
+++ b/src/app/babylon/controller/data-manager.ts
@@ -481,8 +481,8 @@ export class DataManager {
       case FacilityType.XF_MHQ_GF_8:
       case FacilityType.XF_MHQ_GF_25:
       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_JYJ: result = new PropertyData_JYJ(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/building/export-data.ts b/src/app/babylon/model/data/institution/building/export-data.ts
index 8f56d9a..bd607bc 100644
--- a/src/app/babylon/model/data/institution/building/export-data.ts
+++ b/src/app/babylon/model/data/institution/building/export-data.ts
@@ -66,6 +66,7 @@ export class ExportData_JYJ {
     品牌: string;
     油枪数量: string;
     油品品号: string;
+    油枪编号: string;
     油泵类型: string;
     流量: string;
     功率: string;
@@ -74,6 +75,7 @@ export class ExportData_JYJ {
         this.品牌 = jyj_property.brand;
         this.油枪数量 = jyj_property.oilGunNum;
         this.油品品号 = jyj_property.oilProductNo;
+        this.油枪编号 = jyj_property.oilGunNo;
         this.油泵类型 = jyj_property.oilPumpType;
         this.流量 = jyj_property.flow;
         this.功率 = jyj_property.power;
@@ -88,6 +90,7 @@ export class ExportData_YG {
 
     名称: string;
     油品品号: string;
+    油枪编号: string;
     油罐容积: string;
     安全容积: string;
     罐区: string;
@@ -96,6 +99,7 @@ export class ExportData_YG {
     constructor(yg_property: PropertyData_YG) {
         this.名称 = yg_property.name;
         this.油品品号 = yg_property.oilProductNo;
+        this.油枪编号 = yg_property.oilGunNo;
         this.油罐容积 = yg_property.oilTankVolume;
         this.安全容积 = yg_property.safeVolume;
         this.罐区 = yg_property.tankFarm;
diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts
index ea673a0..c380ea3 100644
--- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts
+++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts
@@ -11,24 +11,26 @@ export class PropertyData_JYJ extends PropertyData_Base {
   superBrand: string = ""; //超大牌
   oilGunNum: string = ""; //油枪数量
   oilProductNo: string = ""; //油品品号
+  oilGunNo: string = ""; //油枪编号 
   oilPumpType: string = ""; //油泵类型
   flow: string = ""; //流量
   power: string = ""; //功率
 
-  constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilPumpType: string) {
+  constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilGunNo: string, oilPumpType: string) {
     super(key, FacilityType.JY_JYJ);
     this.name = "未命名";
     this.brand = brand
     this.superBrand = superBrand
     this.oilGunNum = oilGunNum
     this.oilProductNo = oilProductNo
+    this.oilGunNo = oilGunNo
     this.oilPumpType = oilPumpType
     this.flow = "0.5kg/s"
     this.power = "1kw"
   }
 
   clone(key: string) {
-    let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilPumpType);
+    let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilGunNo, this.oilPumpType);
     result.name = this.name;
     result.flow = this.flow;
     result.power = this.power;
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 41892e3..7a7ea82 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
@@ -8,16 +8,18 @@ import { PropertyData_Base } from "../property-data-base";
 export class PropertyData_YG extends PropertyData_Base {
 
   oilProductNo: string = ""; //油品品号
+  oilGunNo: string = ""; //油枪编号 
   oilTankVolume: string = ""; //油罐容积
   safeVolume: string = ""; //安全容积
   quantity: string = ""; //数量
   tankFarm: string = ""; //罐区
   oilTankType: string = ""; //油罐类型
 
-  constructor(key: string,oilProductNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) {
+  constructor(key: string,oilProductNo: string,oilGunNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) {
     super(key, FacilityType.JY_YG);
     this.name = "未命名";
     this.oilProductNo = oilProductNo
+    this.oilGunNo = oilGunNo
     this.oilTankVolume = oilTankVolume
     this.safeVolume = safeVolume
     this.quantity = quantity
@@ -26,7 +28,7 @@ export class PropertyData_YG extends PropertyData_Base {
   }
 
   clone(key: string) {
-    let result = new PropertyData_YG(key,this.oilProductNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType);
+    let result = new PropertyData_YG(key,this.oilProductNo,this.oilGunNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType);
     result.name = this.name;
     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 41d6a4a..7887279 100644
--- a/src/app/pages/left-domain/left-domain.component.html
+++ b/src/app/pages/left-domain/left-domain.component.html
@@ -67,12 +67,14 @@
             <p>品牌</p>
             <p>油枪数量</p>
             <p>油品品号</p>
+            <p>油枪编号</p>
             <p>油泵类型</p>
           </div>
           <div class="tableContent">
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().brand" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNum" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></p>
             <p style="padding-left: 8px;" (click)="stopBubbling($event)">
               <nz-select class="tableSelect" [nzBorderless]="true" [nzDisabled]="!editMode" [(ngModel)]="item.getPropertyData().oilPumpType">
                 <nz-option nzValue="zxb" nzLabel="自吸泵"></nz-option>
@@ -91,6 +93,7 @@
         <div class="table">
           <div class="tableHeader">
             <p>油品品号</p>
+            <p>油枪编号</p>
             <p>油罐容积</p>
             <p>安全容积</p>
             <p>罐区</p>
@@ -98,6 +101,7 @@
           </div>
           <div class="tableContent">
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilTankVolume" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().safeVolume" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().tankFarm" (click)="stopBubbling($event)"></p>