From ce9006c475f8534395bbf0a7637b6ed323a6a418 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 25 Jun 2021 11:13:00 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=BE=85=E5=8A=A9=E6=A5=BC?=
 =?UTF-8?q?=E5=B1=82=E4=BF=AE=E6=94=B9=E7=B4=A0=E6=9D=90=E7=9A=84=E6=A5=BC?=
 =?UTF-8?q?=E5=B1=82ID=EF=BC=9B=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A4=A7=E4=BA=8E10M=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entry-plan-look/AddPlanone.html                |  2 +-
 .../collection-tools.component.ts                  | 14 ++++++++++++++
 .../collection-tools.component.ts                  | 14 +++++++++++++-
 .../collection-tools-plan/leftFunctionalDomain.ts  |  2 +-
 .../collection-tools/collection-tools.component.ts | 12 ++++++++++++
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index d32cdd5..3668d9a 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -62,7 +62,7 @@
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
                         <div *ngIf="inputword">
-                          <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button>
+                          <!-- <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button> -->
                           <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                         </div>
                         <!-- <div *ngIf="inputword">
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 9622a17..14de846 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -1935,6 +1935,12 @@ export class CollectionToolsBuildingComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/SitePlans', item).subscribe((data: any) => {
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",
@@ -1991,6 +1997,14 @@ export class CollectionToolsBuildingComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/BuildingAreas', item, { params: this.params }).subscribe((data: any) => {
+        // console.log('复制出的新楼层',data.id)
+        // console.log('复制的数据',paramsData)
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index e836a91..a6dc2e4 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -864,7 +864,7 @@ export class CollectionToolsPlanComponent implements OnInit {
 
             //保存建筑数据
             // console.log('CompanyData',CompanyData)
-            // CompanyData.data = "{\"图例\":{\"Id\":\"图例\",\"Name\":\"图例\",\"Angle\":0,\"Color\":\"#066EED80\",\"Point\":{\"x\":200,\"y\":200},\"Scale\":1,\"Width\":32,\"Border\":null,\"Height\":32,\"PivotX\":0,\"PivotY\":0,\"Enabled\":true,\"FloorId\":\"60d42db743d691776496cf7c\",\"DrawMode\":null,\"FillMode\":null,\"GameMode\":0,\"ImageUrl\":null,\"FixedSize\":null,\"Thickness\":null,\"MultiPoint\":null,\"TemplateId\":null,\"FireElementId\":null,\"PropertyInfos\":[{\"Tag\":\"\",\"Order\":0,\"Enabled\":true,\"Visible\":true,\"Required\":false,\"RuleName\":\"\",\"RuleValue\":\"\",\"PhysicalUnit\":\"\",\"PropertyName\":\"列\",\"PropertyType\":2,\"PropertyValue\":\"2\"}],\"IsFromBuilding\":null,\"InteractiveMode\":null}}"
+            CompanyData.data = "{\"图例\":{\"Id\":\"图例\",\"Name\":\"图例\",\"Angle\":0,\"Color\":\"#066EED80\",\"Point\":{\"x\":200,\"y\":200},\"Scale\":1,\"Width\":32,\"Border\":null,\"Height\":32,\"PivotX\":0,\"PivotY\":0,\"Enabled\":true,\"FloorId\":\"60d43256660b093f1c3b5aa5\",\"DrawMode\":null,\"FillMode\":null,\"GameMode\":0,\"ImageUrl\":null,\"FixedSize\":null,\"Thickness\":null,\"MultiPoint\":null,\"TemplateId\":null,\"FireElementId\":null,\"PropertyInfos\":[{\"Tag\":\"\",\"Order\":0,\"Enabled\":true,\"Visible\":true,\"Required\":false,\"RuleName\":\"\",\"RuleValue\":\"\",\"PhysicalUnit\":\"\",\"PropertyName\":\"列\",\"PropertyType\":2,\"PropertyValue\":\"2\"}],\"IsFromBuilding\":null,\"InteractiveMode\":null}}"
 
             this.http.post("/api/CompanyData", CompanyData, {
               params: {
@@ -1896,6 +1896,12 @@ export class CollectionToolsPlanComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/SitePlans', item).subscribe((data: any) => {
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",
@@ -1952,6 +1958,12 @@ export class CollectionToolsPlanComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/BuildingAreas', item, { params: this.params }).subscribe((data: any) => {
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",
diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
index 9be4be3..007d30b 100644
--- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
@@ -113,7 +113,7 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
             }
           }
         }) //post
-      } else if (this.file.size>5*1024*1024 && this.file.size<=10*1024*1024) { //大于5MB
+      } else if (this.file.size>5*1024*1024 && this.file.size<=100*1024*1024) { //大于5MB
         let upload = this.canvasData.sectionUpload(sessionStorage.getItem('companyId'),this.file)
         upload.then(res=>{ 
           let imgURL = '/api/Objects/PlanPlatform/' + res
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 676b4da..7771edd 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -2004,6 +2004,12 @@ export class CollectionToolsComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/SitePlans', item).subscribe((data: any) => {
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",
@@ -2060,6 +2066,12 @@ export class CollectionToolsComponent implements OnInit {
       item.name = item.name + '(副本)'
       item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
       this.http.post('/api/BuildingAreas', item, { params: this.params }).subscribe((data: any) => {
+        for (const key in paramsData) {
+          if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
+            const element = paramsData[key];
+            element.FloorId = data.id
+          }
+        }
         let newData = {
           version: "2.0",
           id: "",