From 366a336e699dfdb51058cf2f82f14daa52f67758 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Sat, 30 Oct 2021 13:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/plan/plan.component.html        | 19 ++++++++++++++-----
 src/app/pages/plan/plan.component.ts          |  8 ++++----
 .../babylon/building-basic-infos.service.ts   |  4 ++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html
index bfe24c5..f9d83ab 100644
--- a/src/app/pages/plan/plan.component.html
+++ b/src/app/pages/plan/plan.component.html
@@ -22,12 +22,21 @@
   <!-- 左侧建筑 -->
 
   <!-- 新增/编辑左侧建筑弹窗 -->
-  <nz-modal [(nzVisible)]="isShowBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="isShowBuildingPop = false" (nzOnOk)="addModelBuilding()">
-    <form nz-form>
+  <nz-modal [(nzVisible)]="isShowBuildingPop" nzTitle="创建/编辑建筑" (nzOnCancel)="isShowBuildingPop = false" (nzOnOk)="addModelBuilding(form.value)" [nzOkDisabled]='name.invalid'>
+    <form nz-form #form='ngForm'>
       <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-label [nzSpan]="6">名称</nz-form-label>
+        <nz-form-control [nzSpan]="18" nzErrorTip="请输入必填项">
+          <input nz-input #name='ngModel' ngModel name="name" required/>
+        </nz-form-control>
+      </nz-form-item>
+      <nz-form-item>
+        <nz-form-label [nzSpan]="6">请选择模型类型</nz-form-label>
+        <nz-form-control [nzSpan]="18" nzErrorTip="请输入必填项" style="background-color: none;">
+          <nz-select #modelType='ngModel' ngModel name="modelType" required>
+            <nz-option nzValue="normal" nzLabel="建筑物"></nz-option>
+            <nz-option nzValue="environment" nzLabel="场景"></nz-option>
+          </nz-select>
         </nz-form-control>
       </nz-form-item>
     </form>
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 83cea65..feb5a64 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -72,8 +72,8 @@ export class PlanComponent implements OnInit {
   buildingUIItems: any[] = []; //左侧 建筑list
   beforeOneBuildingID: string = null; //选中 左侧建筑ID
   isShowBuildingPop: boolean = false; //显隐 新增/编辑左侧建筑弹窗
-  isShowLeftBuilding: boolean = true; //显隐 建筑
-  toggleLeftBuilding(e) { this.isShowLeftBuilding = e }; //显隐 建筑
+  isShowLeftBuilding: boolean = true; //显隐 建筑list
+  toggleLeftBuilding(e) { this.isShowLeftBuilding = e }; //显隐 建筑list
 
   //选择建筑
   selectLeftBuilding(e) {
@@ -81,8 +81,8 @@ export class PlanComponent implements OnInit {
   }
 
   //创建建筑
-  addModelBuilding() {
-    console.log('add')
+  addModelBuilding(form) {
+    console.log(form)
   }
 
   //编辑建筑
diff --git a/src/app/service/babylon/building-basic-infos.service.ts b/src/app/service/babylon/building-basic-infos.service.ts
index 799c9bb..a4d292d 100644
--- a/src/app/service/babylon/building-basic-infos.service.ts
+++ b/src/app/service/babylon/building-basic-infos.service.ts
@@ -24,7 +24,7 @@ export class BuildingBasicInfosService {
    * 获取三维信息
    */
   getBuildingBasicInfos(name: string): Observable<string> {
-    return this.http.get<string>(this.baseUrl + '?name=' + name);
+    return this.http.get<string>(this.baseUrl + '/Get' + '?name=' + name);
   }
   /**
    * 保存三维信息
@@ -32,7 +32,7 @@ export class BuildingBasicInfosService {
    * @param data 
    */
   postBuildingBasicInfos(name: string, data: any): Observable<any> {
-    return this.http.post<any>(this.baseUrl + '?name=' + name, data)
+    return this.http.post<any>(this.baseUrl + '/PostOrPut' + '?name=' + name, data)
       .pipe(
         catchError((err) => this.handleError(err))
       );