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

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 }">
+    <div class="leftChildComponent" *ngIf="isShowChildComponent" [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>
@@ -28,7 +28,7 @@
 
     <!-- 左侧建筑栏 -->
     <div class="showLeftBuilding" title="显示" *ngIf="!isShowLeftBuilding" (click)="toggleLeftBuilding(true)"><i nz-icon nzType="right" nzTheme="outline"></i></div>
-    <div class="leftBuilding" [ngClass]="{'isShowLeftBuilding': isShowLeftBuilding === false}">
+    <div class="leftBuilding" [ngClass]="{'isShowLeftBuilding': isShowLeftBuilding === false, 'publicMoveUp': selectFence === 7}">
       <div class="hideLeft"><i nz-icon nzType="close" nzTheme="outline" title="隐藏" (click)="toggleLeftBuilding(false)"></i></div>
       <div class="leftHeader">
         <h1><label>模型列表</label></h1>
@@ -48,7 +48,7 @@
     <!-- 左侧建筑栏 -->
 
     <!-- 右侧图标栏 -->
-    <div class="rightIcons" *ngIf="selectFence === 0 || selectFence === 7">
+    <div class="rightIcons" *ngIf="selectFence === 0 || selectFence === 7" [ngClass]="{'publicMoveUp': selectFence === 7}">
       <div class="bottomCenter" id="bottomCenter">
         <ng-container *ngIf="selectFence === 0">
           <div class="everyIcon" (click)='selectBottomIcon(item)' *ngFor="let item of allFacilityUIItemes" [ngClass]="{'selectLeftIcon': beforeOneIcon == item.getIconID()}">
@@ -90,6 +90,21 @@
     </div>
     <!-- 右上角快捷栏 -->
 
+    <!-- 底部处置预案 -->
+    <div class="bottomPlan" *ngIf="selectFence === 7">
+      <div class="pulicPlanDiv bottomPlanHeader">
+        <div class="planHeaderText">
+          <p>灾情描述</p>
+          <textarea></textarea>
+        </div>
+        <div class="planHeaderImg"><a href="javascript:;" class="bottomPlanUpload"><input type="file"><img src="../../../assets/images/uploadImg.png"></a></div>
+        <div class="planHeaderVideo"><a href="javascript:;" class="bottomPlanUpload" style="width: 100px;"><input type="file"><img src="../../../assets/images/uploadVideo.png"></a></div>
+      </div>
+      <div style="height: 5px;"></div>
+      <div class="pulicPlanDiv bottomPlanCenter"></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

@@ -223,7 +223,7 @@
   height: 38px;
   position: absolute;
   right: 1px;
-  top: 3%;
+  top: 1%;
   display: flex;
   >div { height: 38px; border-radius: 5px; }
   button {
@@ -258,4 +258,39 @@
     margin-right: 10px;
   }
   .selectRightTopFast { border: 1px solid #fff; } //选种样式
+}
+
+//左右侧栏 上移
+.publicMoveUp{
+  height: 70%;
+  top: 10%;
+  bottom: auto;
+}
+//底部处置预案
+.bottomPlan{
+  width: 95%;
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 1%;
+  margin: auto;/*这行代码是关键*/
+  color: #fff;
+  .pulicPlanDiv{ width: 100%; padding: 0 15px; overflow: hidden; background: linear-gradient(360deg, #000D21 0%, rgba(0, 59, 110, 0.8) 100%); }
+  .bottomPlanHeader{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    box-shadow: 0px 0px 6px #2399FF;
+    .planHeaderText{
+      flex: 1;
+      font-size: 14px;
+      p{ margin: 0; height: 20px; line-height: 18px; }
+      textarea{ width: 100%; height: 50px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize:none; outline: none; }
+    }
+    .planHeaderImg{ width: 100px; height: 100%; text-align: center; }
+    .planHeaderVideo{ width: 120px; height: 100%; text-align: center; }
+  }
+  .bottomPlanCenter{
+    height: 35px;
+  }
 }

src/app/pages/plan/publicPop.scss

@@ -14,9 +14,22 @@
   overflow: hidden;
   display: inline-block;
 }
-.uploadBackGround input {
+.bottomPlanUpload{
+  margin-top: 5px;
+  width: 70px;
+  height: 70px;
+  line-height: 65px;
+  position: relative;
+  cursor: pointer;
+  background: rgba(145, 204, 255, 0.41);
+  border: 1px dashed #91CCFF;
+  overflow: hidden;
+  display: inline-block;
+}
+.uploadBackGround input,.bottomPlanUpload input {
   position: absolute;
   width: 100%;
+  height: 100%;
   right: 0;
   top: 0;
   opacity: 0;