diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-sygx.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-sygx.ts index a396beb..f3fa99d 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-sygx.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-sygx.ts @@ -4,21 +4,22 @@ import { PropertyData_Base_IMG } from "../base/property-data-base-img"; import { PropertyData_Base } from "../property-data-base"; /** - * 输油管 + * 输油管线 */ export class PropertyData_SYGX extends PropertyData_Base_IMG { constructor(key: string) { - super(key, "", "", "", FacilityType.JY_SYGX); - + super(key, "", "", "", FacilityType.JY_SYGX); + this.name = "未命名"; } clone(key: string) { let result = new PropertyData_SYGX(key); + result.name = this.name; result.img = this.img; result.pos = this.pos; result.info = this.info, - result.is360 = this.is360; + result.is360 = this.is360; return result; } 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 22bdab0..a8c62f0 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 @@ -4,22 +4,28 @@ import { PropertyData_Base_IMG } from "../base/property-data-base-img"; 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); - + super(key, "", "", "", FacilityType.JY_YQHSGX); + this.name = "未命名"; } clone(key: string) { - let result = new PropertyData_YQHSGX(key); - result.img = this.img; - result.pos = this.pos; - result.info = this.info, - result.is360 = this.is360; - return result; + 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; } } \ No newline at end of file diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 3bd7838..9f246ed 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -49,7 +49,7 @@ -
+
@@ -91,6 +91,59 @@
+ +
+
+ +
+
+ +

+
+
+

图片

+
+
+

+ + +

+
+
+
+
+ + +
+
+ +
+
+ +

+
+
+

油气回收系统类型

+

油气回收泵类型

+

图片

+
+
+

+ + + + +

+

+

+ + +

+
+
+
+
+
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index 2c2b629..87afcd5 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -58,6 +58,7 @@ border-bottom: none; display: flex; p{ height: 32px; line-height: 32px; margin: 0px; } + .tableImg{ height: 120px; line-height: 120px; img{ max-height: 100px; width: auto; }.uploadImgBox{ margin: 35px 0 0 0; width: 50px; height: 50px; line-height: 50px; text-align: center; } } .tableHeader{ flex: 4; text-align: right; @@ -71,9 +72,6 @@ } } } -// .oilTank{ //油管设备 - -// } .fireFacilities{ //消防设施 .treeRow{ width: 100%; display: flex; height: 30px; line-height: 30px; p:first-child{ flex: 1; }; p{ margin: 0; padding: 0; .anticon{ margin-right: 5px; font-size: 16px; } } } } diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index ff45bc5..3dfb457 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -14,7 +14,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'; @Component({ selector: 'app-left-domain', templateUrl: './left-domain.component.html', - styleUrls: ['./left-domain.component.scss'] + styleUrls: ['./left-domain.component.scss','../plan/publicPop.scss'] }) export class LeftDomainComponent implements OnInit { @@ -57,6 +57,10 @@ export class LeftDomainComponent implements OnInit { item.getType() === "JY_YG"? list.push(item) : null } else if (this.beforeFence === 3) { //消防设施 (item.getType()).slice(0,3) === "XF_"? list.push(item) : null + } else if (this.beforeFence === 5) { //输油管线 + item.getType() === "JY_SYGX"? list.push(item) : null + }else if (this.beforeFence === 6) { //油气回收 + item.getType() === "JY_YQHSGX"? list.push(item) : null } }) this.FacilityList = list diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index be2c7c5..2585b0e 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -16,7 +16,7 @@ -
+
{{allFence[selectFence]}}
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 3b168a1..e2aeadb 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -107,7 +107,7 @@ export class PlanComponent implements OnInit { let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow; let fenceType: JYZInfoMoudleType = this.getFenceType(type) if (this.selectFence != type) { - this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 + this.isShowChildComponent && this.leftDomain && type != 4 ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type this.isShowChildComponent = true buildingWindow.changeJYZInfoModel(fenceType, true)