From 6256b53b08ff0db309dbd91b5c78fbf329f8562b Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Sat, 30 Oct 2021 15:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=BB=BA=E7=AD=91=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/plan/plan.component.html |  4 ++--
 src/app/pages/plan/plan.component.ts   | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html
index 146f8eb..b16bd8c 100644
--- a/src/app/pages/plan/plan.component.html
+++ b/src/app/pages/plan/plan.component.html
@@ -28,7 +28,7 @@
   <!-- 右上角快捷栏 -->
 
   <!-- 新增/编辑左侧建筑弹窗 -->
-  <nz-modal [(nzVisible)]="isShowBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="isShowBuildingPop = false" (nzOnOk)="addModelBuilding(form.value)" [nzOkDisabled]='name.invalid||modelType.invalid||upload.invalid'>
+  <nz-modal [(nzVisible)]="isShowBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="isShowBuildingPop = false" (nzOnOk)="addModelBuilding(form.value)" [nzOkDisabled]='name.invalid||modelType.invalid'>
     <form nz-form #form='ngForm'>
       <nz-form-item>
         <nz-form-label [nzSpan]="6">名称</nz-form-label>
@@ -48,7 +48,7 @@
       <nz-form-item>
         <nz-form-label [nzSpan]="6">上传文件</nz-form-label>
         <nz-form-control [nzSpan]="18" nzErrorTip="请上传文件">
-          <a href="javascript:;" class="uploadBackGround"><input type="file" (change)='selectFile($event)' multiple #upload='ngModel' ngModel name="upload" required>上传文件<i nz-icon nzType="cloud-upload" nzTheme="outline"></i></a>
+          <a href="javascript:;" class="uploadBackGround"><input type="file" (change)='selectFile($event)' multiple>上传文件<i nz-icon nzType="cloud-upload" nzTheme="outline" style="font-size: 16px;"></i></a>
           <p *ngIf="uploadList.length" style="font-size: 14px; text-align: left; max-height: 500px; overflow: hidden;">选择文件: <label *ngFor="let item of uploadList">{{item.name}}, </label></p>
         </nz-form-control>
       </nz-form-item>
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 9ee9141..c3eda3b 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -8,6 +8,8 @@ import { ServeManager } from 'src/app/babylon/controller/serve-manager';
 import { BuildingBasicInfosService } from 'src/app/service/babylon/building-basic-infos.service';
 import { ObjectsService } from 'src/app/service/objects.service';
 import { ToolbarWindow } from 'src/app/babylon/view/toolbar-window/toobar-window';
+import { BuildingStatus } from 'src/app/babylon/controller/status/building-status';
+import { BuildingUIItem } from 'src/app/babylon/view/building-window/building-ui-item';
 
 
 
@@ -71,7 +73,7 @@ export class PlanComponent implements OnInit {
     console.log(InsList)
   }
 
-  buildingUIItems: any[] = []; //左侧 建筑list
+  buildingUIItems: BuildingUIItem[] = []; //左侧 建筑list
   beforeOneBuildingID: string = null; //选中 左侧建筑ID
   isShowBuildingPop: boolean = false; //显隐 新增/编辑左侧建筑弹窗
   isShowLeftBuilding: boolean = true; //显隐 建筑list
@@ -88,12 +90,21 @@ export class PlanComponent implements OnInit {
 
   //选择建筑
   selectLeftBuilding(e) {
-
+    let item: BuildingUIItem = e;
+    this.beforeOneBuildingID = item.getBuildingID()
+    item.select();
   }
 
   //创建建筑
-  addModelBuilding(form) {
-    console.log(form)
+  addModelBuilding(e) {
+    let order = this.buildingUIItems.length + 1;
+    this.beforeOneSatus = StatusManager.getStatus<BuildingStatus>(BuildingStatus);
+    let buildingWindow = this.beforeOneSatus.buildingWindow;
+    let newBuildingData = this.beforeOneSatus.createOneBuildingInData(e.name, e.name, e.modelType);
+    buildingWindow.changeModel(this.uploadList, newBuildingData);
+    buildingWindow.createOneBuildingItem(newBuildingData, order);
+    this.buildingUIItems = this.beforeOneSatus.buildingWindow.buildingUIItems //更新 建筑列表list
+    this.isShowBuildingPop = false; //关闭弹窗
   }
 
   //编辑建筑