Browse Source

对接输油管线, 油气回收

dev
陈鹏飞 3 years ago
parent
commit
5430d4e302
  1. 9
      src/app/babylon/model/data/institution/facility/property-data/in/property-data-sygx.ts
  2. 24
      src/app/babylon/model/data/institution/facility/property-data/in/property-data-yqhsgx.ts
  3. 55
      src/app/pages/left-domain/left-domain.component.html
  4. 4
      src/app/pages/left-domain/left-domain.component.scss
  5. 6
      src/app/pages/left-domain/left-domain.component.ts
  6. 2
      src/app/pages/plan/plan.component.html
  7. 2
      src/app/pages/plan/plan.component.ts

9
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;
}

24
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;
}
}

55
src/app/pages/left-domain/left-domain.component.html

@ -49,7 +49,7 @@
</div>
<!-- 加油机 -->
<!-- 油罐设备 -->
<div class="publicBox refueller oilTank" *ngIf="beforeFence === 2">
<div class="publicBox refueller" *ngIf="beforeFence === 2">
<div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility(item)">
<!-- 选中样式 -->
<div class="positionLeftTop" *ngIf="selectFacilityId === item.getID()"></div><div class="positionLeftBottom" *ngIf="selectFacilityId === item.getID()"></div>
@ -91,6 +91,59 @@
</ng-template>
</div>
<!-- 消防设施 -->
<!-- 输油管线 -->
<div class="publicBox refueller" *ngIf="beforeFence === 5">
<div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility(item)">
<!-- 选中样式 -->
<div class="positionLeftTop" *ngIf="selectFacilityId === item.getID()"></div><div class="positionLeftBottom" *ngIf="selectFacilityId === item.getID()"></div>
<div class="positionRightTop" *ngIf="selectFacilityId === item.getID()"></div><div class="positionRightBottom" *ngIf="selectFacilityId === item.getID()"></div>
<!-- 选中样式 -->
<p class="title"><input type="text" class="tableInput" [(ngModel)]="item.getPropertyData().name"></p>
<div class="table">
<div class="tableHeader">
<p class="tableImg">图片</p>
</div>
<div class="tableContent">
<p class="tableImg">
<img *ngIf="item.getPropertyData().img" [src]="item.getPropertyData().img">
<a href="javascript:;" class="bottomPlanUpload uploadImgBox" [ngStyle]="{'float': item.getPropertyData().img? 'right' : 'left'}"><input type="file"><i nz-icon nzType="plus" nzTheme="outline"></i></a>
</p>
</div>
</div>
</div>
</div>
<!-- 输油管线 -->
<!-- 油气回收 -->
<div class="publicBox refueller" *ngIf="beforeFence === 6">
<div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility(item)">
<!-- 选中样式 -->
<div class="positionLeftTop" *ngIf="selectFacilityId === item.getID()"></div><div class="positionLeftBottom" *ngIf="selectFacilityId === item.getID()"></div>
<div class="positionRightTop" *ngIf="selectFacilityId === item.getID()"></div><div class="positionRightBottom" *ngIf="selectFacilityId === item.getID()"></div>
<!-- 选中样式 -->
<p class="title"><input type="text" class="tableInput" [(ngModel)]="item.getPropertyData().name"></p>
<div class="table">
<div class="tableHeader">
<p>油气回收系统类型</p>
<p>油气回收泵类型</p>
<p class="tableImg">图片</p>
</div>
<div class="tableContent">
<p style="padding-left: 8px;">
<nz-select class="tableSelect" [nzBorderless]="true" [nzDisabled]="!editModel" [(ngModel)]="item.getPropertyData().VRUType">
<nz-option nzValue="fss" nzLabel="分散式"></nz-option>
<nz-option nzValue="jzs" nzLabel="集中式"></nz-option>
</nz-select>
</p>
<p><input type="text" class="tableInput" [disabled]="!editModel" [(ngModel)]="item.getPropertyData().VRUPumpType"></p>
<p class="tableImg">
<img *ngIf="item.getPropertyData().img" [src]="item.getPropertyData().img">
<a href="javascript:;" class="bottomPlanUpload uploadImgBox" [ngStyle]="{'float': item.getPropertyData().img? 'right' : 'left'}"><input type="file"><i nz-icon nzType="plus" nzTheme="outline"></i></a>
</p>
</div>
</div>
</div>
</div>
<!-- 油气回收 -->
<!-- 处置预案 -->
<div class="publicBox disposalPlan" *ngIf="beforeFence === 7 && allMarkPlanData">
<div class="interval" *ngFor="let item of allMarkPlanData.datas;let key = index;">

4
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; } } }
}

6
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

2
src/app/pages/plan/plan.component.html

@ -16,7 +16,7 @@
<canvas id="center"></canvas>
<!-- 左侧子组件 -->
<div class="leftChildComponent" *ngIf="isShowChildComponent" [ngStyle]="{ 'left': isShowLeftBuilding? '15%' : null }" [ngClass]="{'publicMoveUp': selectFence === 7}">
<div class="leftChildComponent" *ngIf="isShowChildComponent && selectFence != 4" [ngStyle]="{ 'left': isShowLeftBuilding? '15%' : null }" [ngClass]="{'publicMoveUp': selectFence === 7}">
<div class="leftChildHeader">
<div><i nz-icon nzType="star" nzTheme="outline"></i></div>
<div>{{allFence[selectFence]}}<i nz-icon nzType="plus-circle" nzTheme="outline" *ngIf="selectFence === 7" (click)="noticeChildComponent(true)"></i><i nz-icon nzType="save" nzTheme="outline" *ngIf="selectFence === 7" (click)="noticeChildComponent(false)"></i></div>

2
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)

Loading…
Cancel
Save