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

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

@@ -7,7 +7,7 @@
     <div class="hideLeft"><i nz-icon nzType="close" nzTheme="outline" title="隐藏" (click)="toggleLeftBuilding(false)"></i></div>
     <div class="leftHeader">
       <h1><label>模型列表</label></h1>
-      <button nz-button nzType="primary" (click)="addModelBuilding()">新建</button>
+      <button nz-button nzType="primary" (click)="isShowBuildingPop = true">新建</button>
     </div>
     <div class="leftCenter">
       <div class="everyBuilding" *ngFor="let item of buildingUIItems" (click)='selectLeftBuilding(item)' [ngClass]="{'selectLeftBuilding': beforeOneBuildingID == item.getBuildingID()}">
@@ -21,4 +21,17 @@
   </div>
   <!-- 左侧建筑 -->
 
+  <!-- 新增/编辑左侧建筑弹窗 -->
+  <nz-modal [(nzVisible)]="isShowBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="isShowBuildingPop = false" (nzOnOk)="addModelBuilding()">
+    <form nz-form>
+      <nz-form-item>
+        <nz-form-label [nzSpan]="5">名称</nz-form-label>
+        <nz-form-control [nzSpan]="12" nzErrorTip="请输入必填项">
+          <input nz-input ngModel name="name" required/>
+        </nz-form-control>
+      </nz-form-item>
+    </form>
+  </nz-modal>
+  <!-- 新增/编辑左侧建筑弹窗 -->
+
 </div>

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

@@ -13,7 +13,7 @@ import { ObjectsService } from 'src/app/service/objects.service';
 @Component({
   selector: 'app-plan',
   templateUrl: './plan.component.html',
-  styleUrls: ['./plan.component.scss']
+  styleUrls: ['./plan.component.scss','./publicPop.scss']
 })
 export class PlanComponent implements OnInit {
 
@@ -71,6 +71,7 @@ export class PlanComponent implements OnInit {
 
   buildingUIItems: any[] = []; //左侧 建筑list
   beforeOneBuildingID: string = null; //选中 左侧建筑ID
+  isShowBuildingPop: boolean = false; //显隐 新增/编辑左侧建筑弹窗
   isShowLeftBuilding: boolean = true; //显隐 建筑
   toggleLeftBuilding(e) { this.isShowLeftBuilding = e }; //显隐 建筑
 
@@ -81,7 +82,7 @@ export class PlanComponent implements OnInit {
 
   //创建建筑
   addModelBuilding() {
-
+    console.log('add')
   }
 
   //编辑建筑

src/app/pages/plan/publicPop.scss

@@ -0,0 +1,30 @@
+.keyMargin {
+  width: 100%;
+  margin-bottom: 10px;
+  text-align: center;
+  .mat-form-field { width: 100%; }
+  //上传CAD弹窗 inputfile
+  .uploadBackGround {
+    width: 125px;
+    padding: 0 25px;
+    height: 30px;
+    line-height: 30px;
+    position: relative;
+    cursor: pointer;
+    color: #0275e7;
+    font-size: 14px;
+    background: #fafafa;
+    border: 1px solid #0275e7;
+    border-radius: 5px;
+    overflow: hidden;
+    display: inline-block;
+  }
+  .uploadBackGround input {
+    position: absolute;
+    width: 100%;
+    right: 0;
+    top: 0;
+    opacity: 0;
+    cursor: pointer
+  }
+}