From be00ba6f6ca9f90ceeb5d914dfa06bc5d03ba3ac Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Wed, 30 Mar 2022 09:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E6=B0=94=E5=9B=9E=E6=94=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/institution/building/export-data.ts  | 16 ++++++--
 .../property-data/in/property-data-yqhsgx.ts  | 37 ++++++++++---------
 2 files changed, 32 insertions(+), 21 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 0dbd8d5..36e0f3a 100644
--- a/src/app/babylon/model/data/institution/building/export-data.ts
+++ b/src/app/babylon/model/data/institution/building/export-data.ts
@@ -1,3 +1,4 @@
+import { StringTools } from "@babylonjs/core";
 import { Type } from "class-transformer";
 import { ConfigManager } from "src/app/babylon/controller/config-manager";
 import { TsTool } from "src/app/babylon/tool/ts-tool";
@@ -140,12 +141,19 @@ export class ExportData_SYGX {
  */
 export class ExportData_YQHS {
     名称: string;
-    油气回收系统类型: string;
-    油气回收泵类型: string;
+    一次油气回收系统类型: string;
+    二次油气回收系统类型: string;
+    二次油气回收泵类型: string;
+    三次油气回收处理装置: string;
+    油气回收在线监测装置: string;
+
     constructor(yqhs_property: PropertyData_YQHSGX) {
         this.名称 = yqhs_property.name;
-        this.油气回收系统类型 = yqhs_property.VRUType;
-        this.油气回收泵类型 = yqhs_property.VRUPumpType;
+        this.一次油气回收系统类型 = yqhs_property.VRUType;
+        this.二次油气回收系统类型 = yqhs_property.VRUType_2;
+        this.二次油气回收泵类型 = yqhs_property.VRUPumpType;
+        this.三次油气回收处理装置 = yqhs_property.VRUPumpDevice;
+        this.油气回收在线监测装置 = yqhs_property.MonitoringDevice;
     }
 }
 
diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yqhsgx.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yqhsgx.ts
index a8c62f0..519fa15 100644
--- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yqhsgx.ts
+++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yqhsgx.ts
@@ -8,24 +8,27 @@ import { PropertyData_Base } from "../property-data-base";
  */
 export class PropertyData_YQHSGX extends PropertyData_Base_IMG {
 
-    VRUType: string = ""; //油气回收系统类型
-    VRUPumpType: string = ""; //油气回收泵类型
-    
-    constructor(key: string) {
-      super(key, "", "", "", FacilityType.JY_YQHSGX);
-      this.name = "未命名";
-    }
+  VRUType: string = "将卸油时产生的油气进行回收"; //一次油气回收系统类型
+  VRUType_2: string = "集中式"; //二次油气回收系统类型
+  VRUPumpType: string = "mini9000"; //二次油气回收泵类型
+  VRUPumpDevice: string = "冷凝+吸附"; //三次油气回收处理装置
+  MonitoringDevice: string = "监测气液比、密闭性，出现异常可及时预警";//油气回收在线监测装置
 
-    clone(key: string) {
-      let result = new PropertyData_YQHSGX(key);
-      result.name = this.name;
-      result.VRUType = this.VRUType;
-      result.VRUPumpType = this.VRUPumpType;
-      result.img = this.img;
-      result.pos = this.pos;
-      result.info = this.info,
+  constructor(key: string) {
+    super(key, "", "", "", FacilityType.JY_YQHSGX);
+    this.name = "未命名";
+  }
+
+  clone(key: string) {
+    let result = new PropertyData_YQHSGX(key);
+    result.name = this.name;
+    result.VRUType = this.VRUType;
+    result.VRUPumpType = this.VRUPumpType;
+    result.img = this.img;
+    result.pos = this.pos;
+    result.info = this.info,
       result.is360 = this.is360;
-      return result;
-    }
+    return result;
+  }
 
 }
\ No newline at end of file