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

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

@@ -205,6 +205,21 @@
       </nz-collapse>
     </div>
     <!-- 处置预案 -->
+    <!-- 阀门 -->
+    <div class="publicBox refueller" *ngIf="beforeFence === 8">
+      <div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility($event, item)" [ngClass]="{'selectFacility': selectFacilityId === item.getID()}">
+        <p class="title"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().name" (click)="stopBubbling($event)"></p>
+        <div class="table">
+          <div class="tableHeader">
+            <p class="overflowP" id="title{{item.modelInfo.key}}">描述</p>
+          </div>
+          <div class="tableContent"> 
+            <p [title]="item.getPropertyData().describe" class="overflowP" id="content{{item.modelInfo.key}}"><textarea nz-input nzAutosize id="num{{item.modelInfo.key}}" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().describe" (click)="stopBubbling($event)" (input)="textInput(item)"></textarea></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 阀门 -->
     <!-- 弹窗 -->
     <nz-modal nzClassName="baseInfoDialog" [(nzVisible)]="isShowBaseDialog" nzFooter="null" (nzOnCancel)="closeBaseInfoDialog()" nzWidth="70%">
       <app-oil-station-info *ngIf="isShowBaseDialog"></app-oil-station-info>

src/app/pages/left-domain/left-domain.component.ts

@@ -83,11 +83,13 @@ export class LeftDomainComponent implements OnInit {
         item.getType() === "JY_SYGX" ? list.push(item) : null
       } else if (this.beforeFence === 6) { //油气回收
         item.getType() === "JY_YQHSGX" ? list.push(item) : null
+      } else if (this.beforeFence === 8) { //阀门
+        item.getType() === "JY_FM" ? list.push(item) : null
       }
     })
     this.FacilityList = list
     this.selectFacilityId = null
-    if (this.beforeFence === 1 || this.beforeFence === 2) { //加油机/油罐设备
+    if (this.beforeFence === 1 || this.beforeFence === 2 || this.beforeFence === 8) { //加油机/油罐设备/阀门
       this.FacilityList.forEach(item => {
         window.setTimeout(()=>{
           this.textInput(item)

src/app/pages/plan/plan.component.ts

@@ -173,7 +173,7 @@ export class PlanComponent implements OnInit {
   //开发模式 选择单位 弹窗
   modelInit(InsList) { }
 
-  allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急预案"]; //头部 功能栏
+  allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急预案", "阀门"]; //头部 功能栏
   baseInfoMarks: baseInfoMark[] = [new baseInfoMark("毗邻"), new baseInfoMark("区域"), new baseInfoMark("图片"), new baseInfoMark("点位")] //基本信息 设备筛选list
   selectFence: number = -1; //选中 头部功能栏
   isShowChildComponent: boolean = false; //是否 显示左侧子组件
@@ -238,6 +238,8 @@ export class PlanComponent implements OnInit {
       fenceType = JYZInfoMoudleType.YQHSGX
     } else if (type === 7) {
       fenceType = JYZInfoMoudleType.YJCZ
+    } else if (type === 8) {
+      fenceType = JYZInfoMoudleType.FM
     }
     return fenceType
   }