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

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

@@ -2,7 +2,7 @@
 
   <div class="childCenter">
     <!-- 基本信息 -->
-    <div class="baseInfo" *ngIf="beforeFence === 0">
+    <div class="publicBox baseInfo" *ngIf="beforeFence === 0">
       <div class="interval">
         <p class="title">北京市第十九加油站<button class="titleBotton">自营</button></p>
         <p class="text"><img src="../../../assets/images/baseInfo/position.png" class="textIcon">北京市朝阳区朝外大街关东店33号</p>
@@ -16,6 +16,59 @@
       </div>
     </div>
     <!-- 基本信息 -->
+    <!-- 加油机 -->
+    <div class="publicBox refueller" *ngIf="beforeFence === 1">
+      <div class="interval">
+        <p class="title">1类加油机</p>
+        <div class="table">
+          <div class="tableHeader">
+            <p>品牌</p>
+            <p>超大牌</p>
+            <p>油枪数量</p>
+            <p>油品品号</p>
+            <p>油泵类型</p>
+          </div>
+          <div class="tableContent">
+            <p>超大牌</p>
+            <p>2</p>
+            <p>4</p>
+            <p>92#</p>
+            <p>自吸泵</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 加油机 -->
+    <!-- 油罐设备 -->
+    <div class="publicBox refueller oilTank" *ngIf="beforeFence === 2">
+      <div class="interval">
+        <p class="title">1号油罐</p>
+        <div class="table">
+          <div class="tableHeader">
+            <p>油品品号</p>
+            <p>油罐容积</p>
+            <p>安全容积</p>
+            <p>数量</p>
+            <p>罐区</p>
+            <p>油罐类型</p>
+          </div>
+          <div class="tableContent">
+            <p>92#</p>
+            <p>200L</p>
+            <p>180L</p>
+            <p>1</p>
+            <p>独立罐区</p>
+            <p>防渗罐池</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 油罐设备 -->
+    <!-- 消防设施 -->
+    <div class="publicBox fireFacilities" *ngIf="beforeFence === 3">
+      <nz-tree #nzTreeComponent [nzData]="treeData"></nz-tree>
+    </div>
+    <!-- 消防设施 -->
   </div>
 
   <div class="childBottom" *ngIf="beforeFence === 0">

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

@@ -33,16 +33,45 @@
   }
 }
 
-.interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); }
-.baseInfo{
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-  padding: 0 10px;
-  p{ height: 20px; line-height: 20px; padding-left: 10px; }
-  .title{ font-size: 16px; margin-bottom: 20px; }
+.title{ font-size: 16px; height: 20px; line-height: 20px; margin-bottom: 20px; } //头部header
+.publicBox{ width: 100%; height: 100%; overflow-y: auto; padding: 0 20px; }
+.baseInfo{ //基本信息
+  .interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } //分隔div
+  p{ height: 20px; line-height: 20px; }
   .titleBotton{ background: #2399FF; border-radius: 3px; height: 20px; line-height: 20px; font-size: 12px; margin-left: 5px; padding: 0 5px; border: none; outline: none; }
   .text{ font-size: 14px; margin-bottom: 15px; }
   .textIcon{ width: 20px; height: 20px; vertical-align: top; margin-right: 5px; }
   .textImage{ margin-bottom: 15px; height: auto; line-height: normal; img{ width: auto; height: 130px; } }
+}
+.refueller{ //加油机
+  .interval{ margin-top: 10px; } //分隔div
+  .table{
+    width: 100%;
+    border: 1px solid #91CCFF;
+    border-bottom: none;
+    display: flex;
+    p{ height: 32px; line-height: 32px; margin: 0px; }
+    .tableHeader{
+      flex: 4;
+      text-align: right;
+      color: #23D9FF;
+      p{ padding-right: 15px; border-right: 1px solid #91CCFF; border-bottom: 1px solid #91CCFF; background: rgba(145, 204, 255, 0.2); }
+    }
+    .tableContent{
+      flex: 6;
+      text-align: left;
+      p{ padding-left: 20px; border-bottom: 1px solid #91CCFF; }
+    }
+  }
+}
+.oilTank{ //油管设备
+
+}
+.fireFacilities{ //消防设施
+  .ant-tree{
+    height: 32px;
+    line-height: 32px;
+    background-color: transparent;
+    color: #C4E2FC;
+  }
 }

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

@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
 import { PlanComponent } from '../plan/plan.component';
 
 @Component({
@@ -15,6 +16,8 @@ export class LeftDomainComponent implements OnInit {
   }
 
   beforeFence: number; //当前选中功能栏
+  @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+  treeData: NzTreeNodeOptions[] = treeData.nodes; //tree data
 
   //初始化组件
   initComponent(type?: number) {
@@ -38,3 +41,31 @@ export class LeftDomainComponent implements OnInit {
 
 
 }
+
+export class treeData {
+  static nodes: NzTreeNodeOptions[] = [
+    {
+      title: '灭火器',
+      key: '1',
+      selectable: false,
+      children: [
+        { title: '4KG手提干粉灭火器', key: '1', selectable: false, },
+        { title: '4KG手提泡沫灭火器', key: '2', selectable: false, },
+        { title: '4KG手提二氧化碳灭火器', key: '3', selectable: false, },
+        { title: '35KG手推灭火器', key: '4', selectable: false, },
+      ]
+    },
+    {
+      title: '灭火毯',
+      key: '2',
+      selectable: false,
+      children: []
+    },
+    {
+      title: '消防锹',
+      key: '3',
+      selectable: false,
+      children: []
+    },
+  ];
+}

src/app/pages/pages.module.ts

@@ -29,6 +29,7 @@ import { NzPaginationModule } from 'ng-zorro-antd/pagination';
 import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
 import { NzMessageModule } from 'ng-zorro-antd/message';
 import { NzSpinModule } from 'ng-zorro-antd/spin';
+import { NzTreeModule } from 'ng-zorro-antd/tree';
 import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
 import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
 import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
@@ -63,7 +64,8 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip
     NzPaginationModule,
     NzDropDownModule,
     NzMessageModule,
-    NzSpinModule
+    NzSpinModule,
+    NzTreeModule
   ]
 })
 export class PagesModule { }

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

@@ -59,7 +59,7 @@
       <div class="autoScroll"><i nz-icon nzType="right" nzTheme="outline" (click)="bottomScroll(1)"></i></div>
     </div>
     <!-- 底部图标栏 -->
-  
+
     <!-- 右上角快捷栏 -->
     <div class="rightTopFast">
       <div class="publicFast leftFunction">
@@ -73,10 +73,13 @@
         <button title="吸附" (click)="adsorb()" [ngClass]="{'leftFastIsTure': selectAdsorb }"></button>
         <button title="切换至顶视图" (click)="toggleTopLevelView()" [ngClass]="{'leftFastIsTure': topLevelView }"></button>
       </div>
-      <div style="margin: 0 10px;background-color: #0080FF;" title="保存"><button (click)="preserve()"><i nz-icon nzType="save" nzTheme="outline" style="font-size: 20px;"></i></button></div>
+      <div class="save">
+        <button (click)="preserve(false)" title="保存模块"><i nz-icon nzType="file-done" nzTheme="outline"></i></button>
+        <button (click)="preserve(true)" title="保存"><i nz-icon nzType="save" nzTheme="outline"></i></button>
+      </div>
     </div>
     <!-- 右上角快捷栏 -->
-  
+
     <!-- 新增/编辑左侧建筑弹窗 -->
     <nz-modal [(nzVisible)]="addBuildingPop || editBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="addBuildingPop = false; editBuildingPop = null;" (nzOnOk)="addModelBuilding(form.value)" [nzOkDisabled]='name.invalid||modelType.invalid'>
       <form nz-form #form='ngForm'>

src/app/pages/plan/plan.component.scss

@@ -212,27 +212,31 @@
 
 //右上角快捷栏
 .rightTopFast{
-  width: 340px;
+  width: 400px;
   height: 38px;
   position: absolute;
   right: 1px;
   top: 3%;
-  overflow: hidden;
-  box-sizing: border-box;
   display: flex;
   >div { height: 38px; border-radius: 5px; }
   button {
-    width: 36px;
-    height: 36px;
+    width: 38px;
+    height: 38px;
     border: none;
     outline: none;
     background-color: transparent;
     color: #fff;
     cursor: pointer;
+    padding: 0;
+  }
+  .save{
+    margin: 0 10px;
+    button{ background-color: #0080FF; border-radius: 5px; }
+    button:first-child{ margin-right: 10px; }
+    .anticon{ font-size: 20px; line-height: 40px; } //字体图标
   }
   .publicFast {
-    box-sizing: border-box;
-    padding: 1px 3px;
+    padding: 0px 3px;
     background-color: rgba(0,0,0,0.5);
   }
   .leftFast {
@@ -244,7 +248,7 @@
     .leftFastIsTure { border: 1px solid #fff; } //吸附样式
   }
   .leftFunction {
-    margin: 0 10px;
+    margin-right: 10px;
   }
   .selectRightTopFast { border: 1px solid #fff; } //选种样式
 }

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

@@ -110,18 +110,20 @@ export class PlanComponent implements OnInit {
       this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件
       this.selectFence = type
       this.isShowChildComponent = true
-      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, true) : null
+      buildingWindow.showJYZInfoModel(fenceType, true)
     } else { //取消选中
       this.selectFence = -1
       this.isShowChildComponent = false
-      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, false) : null
+      buildingWindow.showJYZInfoModel(fenceType, false)
     }
   }
 
   //获取 头部功能栏Type
   getFenceType(type: number): JYZInfoMoudleType {
     let fenceType
-    if (type === 1) {
+    if (type === 0) {
+      fenceType = JYZInfoMoudleType.JBXX
+    } else if (type === 1) {
       fenceType = JYZInfoMoudleType.JYJ
     } else if (type === 2) {
       fenceType = JYZInfoMoudleType.YG
@@ -133,6 +135,8 @@ export class PlanComponent implements OnInit {
       fenceType = JYZInfoMoudleType.SYG
     } else if (type === 6) {
       fenceType = JYZInfoMoudleType.YQHSGX
+    } else if (type === 7) {
+      fenceType = JYZInfoMoudleType.YJCZ
     }
     return fenceType
   }
@@ -324,8 +328,12 @@ export class PlanComponent implements OnInit {
   }
 
   //保存
-  preserve() {
-    ToolbarWindow.instance.onBtnSave();
+  preserve(type: boolean) {
+    if (type) {
+      ToolbarWindow.instance.onBtnSave();
+    } else {
+      ToolbarWindow.instance.saveShowMoudleData();
+    }
   }
 
   //通用 消息通知栏

src/styles.scss

@@ -102,5 +102,15 @@ h1 {
   font-size: 16px;
 }
 
+//滚动条样式	
+::-webkit-scrollbar {
+  width: 5px;	
+}
+::-webkit-scrollbar-thumb {
+  background-image: linear-gradient(#2495f8,#1c73c2,#02233f,);	
+}
+::-webkit-scrollbar-track {
+  background-color: #0d4070;	
+}