油气回收数据结构变化

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.VRUType;
-        this.油气回收泵类型 = yqhs_property.VRUPumpType;
+        this.二次油气回收系统类型 = yqhs_property.VRUType_2;
+        this.二次油气回收泵类型 = yqhs_property.VRUPumpType;
+        this.三次油气回收处理装置 = yqhs_property.VRUPumpDevice;
+        this.油气回收在线监测装置 = yqhs_property.MonitoringDevice;
     }
 }
 

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 = ""; //油气回收系统类型
+  VRUType: string = "将卸油时产生的油气进行回收"; //一次油气回收系统类型
-    VRUPumpType: string = ""; //油气回收泵类型
+  VRUType_2: string = "集中式"; //二次油气回收系统类型
-    
+  VRUPumpType: string = "mini9000"; //二次油气回收泵类型
-    constructor(key: string) {
+  VRUPumpDevice: string = "冷凝+吸附"; //三次油气回收处理装置
-      super(key, "", "", "", FacilityType.JY_YQHSGX);
+  MonitoringDevice: string = "监测气液比、密闭性，出现异常可及时预警";//油气回收在线监测装置
-      this.name = "未命名";
-    }
 
-    clone(key: string) {
+  constructor(key: string) {
-      let result = new PropertyData_YQHSGX(key);
+    super(key, "", "", "", FacilityType.JY_YQHSGX);
-      result.name = this.name;
+    this.name = "未命名";
-      result.VRUType = this.VRUType;
+  }
-      result.VRUPumpType = this.VRUPumpType;
+
-      result.img = this.img;
+  clone(key: string) {
-      result.pos = this.pos;
+    let result = new PropertyData_YQHSGX(key);
-      result.info = this.info,
+    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;
-    }
+  }
 
 }