From 0a8e230270a7aa5021bdca7130c7d46d4bed583e Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 14 Jan 2021 09:27:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20vresion=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=BF=AE=E6=AD=A32.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools/collection-tools.component.ts   | 12 ++++++------
 src/app/ui/plan/plan.component.html                  |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index aa15c59..79f2b87 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1140,7 +1140,7 @@ export class CollectionToolsComponent implements OnInit {
       this.http.get('/api/CompanyAccount/CompanyData').subscribe((data:any)=>{
         this.canvasData.originalcompanyBuildingData = data || {} // 单位原数据
         this.canvasData.originalcompanyBuildingData.data? this.canvasData.originalcompanyBuildingData.data = JSON.parse(this.canvasData.originalcompanyBuildingData.data) : this.canvasData.originalcompanyBuildingData.data = {}
-        this.canvasData.originalcompanyBuildingData.version? null : this.canvasData.originalcompanyBuildingData.version = "2.0"
+        this.canvasData.originalcompanyBuildingData.version = "2.0"
         this.canvasData.originalcompanyBuildingData.companyId? null : this.canvasData.originalcompanyBuildingData.companyId = sessionStorage.getItem('companyId')
         resolve('success')
       })
@@ -1153,7 +1153,7 @@ export class CollectionToolsComponent implements OnInit {
     this.http.get(`/api/CompanyAccount/SitePlanData`,{params}).subscribe((data:any)=>{
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
       this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
-      this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
+      this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null
       this.renovateTreeData()
     })
@@ -1165,7 +1165,7 @@ export class CollectionToolsComponent implements OnInit {
       this.http.get(`/api/CompanyAccount/BuildingData`,{params:e}).subscribe((data:any)=>{
         this.canvasData.originalcompanyBuildingData = data || {} // 建筑原数据
         this.canvasData.originalcompanyBuildingData.data? this.canvasData.originalcompanyBuildingData.data = JSON.parse(this.canvasData.originalcompanyBuildingData.data) : this.canvasData.originalcompanyBuildingData.data = {}
-        this.canvasData.originalcompanyBuildingData.version? null : this.canvasData.originalcompanyBuildingData.version = "2.0"
+        this.canvasData.originalcompanyBuildingData.version = "2.0"
         this.canvasData.originalcompanyBuildingData.buildingId? null : this.canvasData.originalcompanyBuildingData.buildingId = e.buildingId
         resolve('success')
       })
@@ -1178,7 +1178,7 @@ export class CollectionToolsComponent implements OnInit {
     this.http.get(`/api/CompanyAccount/BuildingAreaData`,{params}).subscribe((data:any)=>{
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
       this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
-      this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
+      this.canvasData.originaleveryStoreyData.version = "2.0"
       this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null
       this.renovateTreeData()
     })
@@ -1417,7 +1417,7 @@ export class CollectionToolsComponent implements OnInit {
       item.order = this.sitePlanData[this.sitePlanData.length-1].order+1
       this.http.post('/api/CompanyAccount/SitePlans',item).subscribe((data:any)=>{
         let newData = {
-          version: this.canvasData.originaleveryStoreyData.version || "2.0",
+          version: "2.0",
           id: "",
           data: JSON.stringify( paramsData ) || null,
           sitePlanId: data.id
@@ -1434,7 +1434,7 @@ export class CollectionToolsComponent implements OnInit {
       item.order = this.sitePlanData[this.sitePlanData.length-1].order+1
       this.http.post('/api/CompanyAccount/BuildingAreas',item).subscribe((data:any)=>{
         let newData = {
-          version: this.canvasData.originaleveryStoreyData.version || "2.0",
+          version: "2.0",
           id: "",
           data: JSON.stringify( paramsData ) || null,
           buildingAreaId: data.id
diff --git a/src/app/ui/plan/plan.component.html b/src/app/ui/plan/plan.component.html
index 00adef4..0f6cc34 100644
--- a/src/app/ui/plan/plan.component.html
+++ b/src/app/ui/plan/plan.component.html
@@ -1,2 +1 @@
-<!-- <app-unity></app-unity> -->
-<iframe src="unityApp/index.html" name="unityApp" frameborder="0" width="100%" height="100%"></iframe>
+<!-- <iframe src="unityApp/index.html" name="unityApp" frameborder="0" width="100%" height="100%"></iframe> -->