Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/babylon/controller/config-manager.ts

@@ -79,8 +79,8 @@ export class ConfigManager {
             //自定义放置
             case FacilityType.PL: result = "毗邻"; break;
             case FacilityType.QY: result = "区域"; break;
-            case FacilityType.TPBZ: result = "图片标注"; break;
-            case FacilityType.DWBZ: result = "点位标注"; break;
+            case FacilityType.TPBZ: result = "图片"; break;
+            case FacilityType.DWBZ: result = "点位"; break;
             //内建
             case FacilityType.XF_MHQ_PT_4: result = "4kg普通灭火器"; break;
             case FacilityType.XF_MHQ_PT_8: result = "8kg普通灭火器"; break;
@@ -94,6 +94,10 @@ export class ConfigManager {
             case FacilityType.XF_XFCM: result = "消防长矛"; break;
             case FacilityType.XF_XFF: result = "消防斧"; break;
             case FacilityType.XF_XFS: result = "消防沙"; break;
+            case FacilityType.JY_JYJ: result = "加油机"; break;
+            case FacilityType.JY_YG: result = "油罐"; break;
+            case FacilityType.JY_SYGX: result = "输油管线"; break;
+            case FacilityType.JY_YQHSGX: result = "油气回收管线"; break;
         }
         return result;
     }

src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts

@@ -7,24 +7,26 @@ import { PropertyData_Base } from "../property-data-base";
  */
 export class PropertyData_JYJ extends PropertyData_Base {
 
-    brand: string = ""; //品牌
-    superBrand: string = ""; //超大牌
-    oilGunNum: string = ""; //油枪数量
-    oilProductNo: string = ""; //油品品号
-    oilPumpType: string = ""; //油泵类型
+  brand: string = ""; //品牌
+  superBrand: string = ""; //超大牌
+  oilGunNum: string = ""; //油枪数量
+  oilProductNo: string = ""; //油品品号
+  oilPumpType: string = ""; //油泵类型
 
-    constructor(key: string,brand: string,superBrand: string,oilGunNum: string,oilProductNo: string,oilPumpType: string) {
-      super(key, FacilityType.JY_JYJ);
-      this.brand = brand
-      this.superBrand = superBrand
-      this.oilGunNum = oilGunNum
-      this.oilProductNo = oilProductNo
-      this.oilPumpType = oilPumpType
-    }
+  constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilPumpType: string) {
+    super(key, FacilityType.JY_JYJ);
+    this.name = "未命名";
+    this.brand = brand
+    this.superBrand = superBrand
+    this.oilGunNum = oilGunNum
+    this.oilProductNo = oilProductNo
+    this.oilPumpType = oilPumpType
+  }
 
-    clone(key: string) {
-        let result = new PropertyData_JYJ(key,this.brand,this.superBrand,this.oilGunNum,this.oilProductNo,this.oilPumpType);
-        return result;
-    }
+  clone(key: string) {
+    let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilPumpType);
+    result.name = this.name;
+    return result;
+  }
 
 }

src/app/babylon/view/building-window/building-window.ts

@@ -777,12 +777,13 @@ export class BuildingWindow extends UIBase {
         let zdKey = "ZD_" + moudleType; //阻挡类物体特殊字段
 
         //编辑模式下，基本信息下的设备会随时变化
-        if (moudleType == JYZInfoMoudleType.JBXX && ModeManager.currentMode == ModeType.Edit) {
-            if (this.facilitysByMoudle.has(moudleType)) {
-                this.facilitysByMoudle.get(moudleType).length = 0;
+        if (ModeManager.currentMode == ModeType.Edit) {
+            let jbxxMoudle = JYZInfoMoudleType.JBXX;
+            if (this.facilitysByMoudle.has(jbxxMoudle)) {
+                this.facilitysByMoudle.get(jbxxMoudle).length = 0;
             }
             else {
-                this.facilitysByMoudle.set(moudleType, []);
+                this.facilitysByMoudle.set(jbxxMoudle, []);
             }
 
 
@@ -794,13 +795,13 @@ export class BuildingWindow extends UIBase {
             for (let i = 0; i < allFacilityByType.length; i++) {
                 let l_facilityByType = allFacilityByType[i];
                 if (ConfigManager.getPosType(l_facilityByType.type) == FacilityPosType.Out) {
-                    this.facilitysByMoudle.get(moudleType).push(l_facilityByType);
+                    this.facilitysByMoudle.get(jbxxMoudle).push(l_facilityByType);
                 }
             }
 
 
         }
-        else if (this.facilitysByMoudle.has(moudleType)) {
+        if (this.facilitysByMoudle.has(moudleType)) {
             //已经初始化过了
             return;
         }