From 75edc311d15b61fdb2666fe6b6a1453cceab665a Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Wed, 30 Mar 2022 09:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=B9=E6=B3=B5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=B0=E6=B2=B9=E7=BD=90=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 ++++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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 58bd81c..0dbd8d5 100644
--- a/src/app/babylon/model/data/institution/building/export-data.ts
+++ b/src/app/babylon/model/data/institution/building/export-data.ts
@@ -75,7 +75,6 @@ export class ExportData_JYJ {
     油枪数量: string;
     油品品号: string;
     油枪编号: string;
-    油泵类型: string;
     流量: string;
     功率: string;
     constructor(jyj_property: PropertyData_JYJ) {
@@ -84,7 +83,6 @@ export class ExportData_JYJ {
         this.油枪数量 = jyj_property.oilGunNum;
         this.油品品号 = jyj_property.oilProductNo;
         this.油枪编号 = jyj_property.oilGunNo;
-        this.油泵类型 = jyj_property.oilPumpType;
         this.流量 = jyj_property.flow;
         this.功率 = jyj_property.power;
     }
@@ -103,6 +101,7 @@ export class ExportData_YG {
     安全容积: string;
     罐区: string;
     油罐类型: string;
+    油泵类型: string;
 
     constructor(yg_property: PropertyData_YG) {
         this.名称 = yg_property.name;
@@ -112,6 +111,7 @@ export class ExportData_YG {
         this.安全容积 = yg_property.safeVolume;
         this.罐区 = yg_property.tankFarm;
         this.油罐类型 = yg_property.oilTankType;
+        this.油泵类型 = yg_property.oilPumpType;
     }
 
 }
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 c380ea3..0504d57 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
@@ -12,11 +12,10 @@ export class PropertyData_JYJ extends PropertyData_Base {
   oilGunNum: string = ""; //油枪数量
   oilProductNo: string = ""; //油品品号
   oilGunNo: string = ""; //油枪编号 
-  oilPumpType: string = ""; //油泵类型
   flow: string = ""; //流量
   power: string = ""; //功率
 
-  constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilGunNo: string, oilPumpType: string) {
+  constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilGunNo: string) {
     super(key, FacilityType.JY_JYJ);
     this.name = "未命名";
     this.brand = brand
@@ -24,13 +23,12 @@ export class PropertyData_JYJ extends PropertyData_Base {
     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.oilGunNo, this.oilPumpType);
+    let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilGunNo);
     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 7a7ea82..a38e3da 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,8 +14,9 @@ export class PropertyData_YG extends PropertyData_Base {
   quantity: string = ""; //数量
   tankFarm: string = ""; //罐区
   oilTankType: string = ""; //油罐类型
+  oilPumpType: string = ""; //油泵类型
 
-  constructor(key: string,oilProductNo: string,oilGunNo: 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, oilPumpType: string) {
     super(key, FacilityType.JY_YG);
     this.name = "未命名";
     this.oilProductNo = oilProductNo
@@ -25,10 +26,11 @@ export class PropertyData_YG extends PropertyData_Base {
     this.quantity = quantity
     this.tankFarm = tankFarm
     this.oilTankType = oilTankType
+    this.oilPumpType = oilPumpType
   }
 
   clone(key: string) {
-    let result = new PropertyData_YG(key,this.oilProductNo,this.oilGunNo,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, this.oilPumpType);
     result.name = this.name;
     return result;
   }