From c7e14ae5ba980195869681861ea66190298e08f1 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Tue, 25 Aug 2020 16:29:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E7=B4=A0=E6=9D=90=E5=AE=8C=E5=96=84,=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E6=8A=A5=E9=94=99=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/collection-tools/collection-tools.component.ts | 6 +++---
 src/app/working-area/working-area.component.ts            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index b8f9102..1a52a69 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -596,9 +596,8 @@ export class CollectionToolsComponent implements OnInit {
     data.forEach(element => {
       element.isTemplate = true //添加模板标识
       element.isLook = true //添加是否可见标识
-      // element.isLookPattern = false
+      element.name!='其他'? element.children = [] : element.children
 
-      element.children? element.children : element.children = []
       if(storeyData){
         for(let key in storeyData.data){
           if(element.id == storeyData.data[key].FireElementId){
@@ -681,7 +680,8 @@ export class CollectionToolsComponent implements OnInit {
     this.canvas.refresh()
     this.canvasData.isChange = false //服务中 数据是否改动 改为false
     this.isShowProperty = true
-    this.isShowAttribute = true //属性栏展示 默认数据
+    this.isShowAttribute = true
+    this.allFireElements[this.allFireElements.length-1].children = []
 
     let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 77adb12..ceaf3cd 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -262,7 +262,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   public versionChecking(): void {
     const floorData = this.canvasData.originaleveryStoreyData;
     const buildingData = this.canvasData.originalcompanyBuildingData;
-    if (floorData.version === '1.0') {
+    if (floorData.version && floorData.version === '1.0') {
       floorData.version = '2.0';
       Object.keys(floorData.data).forEach(item => {
         floorData.data[item].Point.y *= -1;
@@ -271,7 +271,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
         });
       });
     }
-    if (buildingData.version === '1.0') {
+    if (buildingData.version && buildingData.version === '1.0') {
       buildingData.version = '2.0';
       Object.keys(buildingData.data).forEach(item => {
         buildingData.data[item].Point.y *= -1;