From 31e3eb83b2bff355ed218039e285efcce8b34f06 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 2 Jun 2021 16:27:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=A5=BC=E5=B1=82=E5=90=8C=E6=AD=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=B1=E8=B4=A5BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.ts             | 119 ++++++++++++++++-
 .../collection-tools.component.ts             | 120 +++++++++++++++++-
 .../collection-tools.component.ts             | 119 ++++++++++++++++-
 3 files changed, 351 insertions(+), 7 deletions(-)

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 99717c6..1ce5d4a 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -1919,6 +1919,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
 
   //复制图层 平面图 楼层/区域
   duplicateLayer(item) {
+    this.maskLayerService.sendMessage(true)
     let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
     Object.keys(paramsData).forEach((key) => {
       if (key != '图例') {
@@ -1941,7 +1942,46 @@ export class CollectionToolsBuildingComponent implements OnInit {
           sitePlanId: data.id
         }
         this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
-          this.renovateSitePlan()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //保存建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位毗邻
+          let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
+          this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('单位毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存单位重点部位
+          let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
+          this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位消防设施素材
+          let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
+          this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
@@ -1958,13 +1998,88 @@ export class CollectionToolsBuildingComponent implements OnInit {
           buildingAreaId: data.id
         }
         this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
-          this.renovateBuilding()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑毗邻
+          let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
+          this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('建筑毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存建筑重点部位
+          let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
+          this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑消防设施素材
+          let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
+          this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
     }
   }
 
+  //复制完楼层后 刷新视图
+  updateCurrentFloor() {
+    if (this.checkedBuildingIndex == -1) { //总平面图
+      let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+      let planData = this.getSitePlanCompanyData() //获取 单位 数据
+      this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+  
+      }) //重新加载 新楼层
+    } else { //楼层/区域
+      let params = { buildingId: this.beforeOneCheckedBuilding.id }
+      let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
+      let planData = this.getBuildingData(params) //获取 建筑 数据
+      this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+
+      }) //重新加载 新楼层
+    }
+  }
+
   //平面图 楼层/区域  替换底图
   replaceBaseMap(e, item) {
     e.stopPropagation();
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 8431ded..7e0ec8b 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1844,7 +1844,6 @@ export class CollectionToolsPlanComponent implements OnInit {
 
   //复制图层 平面图 楼层/区域
   duplicateLayer(item) {
-
     if (item.isGis) {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
@@ -1852,6 +1851,7 @@ export class CollectionToolsPlanComponent implements OnInit {
       this.snackBar.open('gis底图不允许复制', '确定', config);
       return
     }
+    this.maskLayerService.sendMessage(true)
     let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
     Object.keys(paramsData).forEach((key) => {
       if (key != '图例') {
@@ -1874,7 +1874,46 @@ export class CollectionToolsPlanComponent implements OnInit {
           sitePlanId: data.id
         }
         this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
-          this.renovateSitePlan()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //保存建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位毗邻
+          let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
+          this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('单位毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存单位重点部位
+          let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
+          this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位消防设施素材
+          let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
+          this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
@@ -1891,13 +1930,88 @@ export class CollectionToolsPlanComponent implements OnInit {
           buildingAreaId: data.id
         }
         this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
-          this.renovateBuilding()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑毗邻
+          let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
+          this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('建筑毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存建筑重点部位
+          let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
+          this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑消防设施素材
+          let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
+          this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
     }
   }
 
+  //复制完楼层后 刷新视图
+  updateCurrentFloor() {
+    if (this.checkedBuildingIndex == -1) { //总平面图
+      let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+      let planData = this.getSitePlanCompanyData() //获取 单位 数据
+      this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+  
+      }) //重新加载 新楼层
+    } else { //楼层/区域
+      let params = { buildingId: this.beforeOneCheckedBuilding.id }
+      let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
+      let planData = this.getBuildingData(params) //获取 建筑 数据
+      this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+
+      }) //重新加载 新楼层
+    }
+  }
+
   //平面图 楼层/区域  替换底图
   replaceBaseMap(e, item) {
     e.stopPropagation();
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 1b665a4..c2d5bd2 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1988,6 +1988,7 @@ export class CollectionToolsComponent implements OnInit {
 
   //复制图层 平面图 楼层/区域
   duplicateLayer(item) {
+    this.maskLayerService.sendMessage(true)
     let paramsData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data || {}))
     Object.keys(paramsData).forEach((key) => {
       if (key != '图例') {
@@ -2010,7 +2011,46 @@ export class CollectionToolsComponent implements OnInit {
           sitePlanId: data.id
         }
         this.http.post('/api/SitePlanData', newData, { params: this.params }).subscribe(data => {
-          this.renovateSitePlan()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //保存建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/CompanyData", CompanyData, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位毗邻
+          let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
+          this.http.post("/api/CompanyAdjoins/Batch", CompanyAdjoins, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('单位毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('单位毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存单位重点部位
+          let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
+          this.http.post("/api/CompanyImportantLocations/Batch", CompanyImportantLocations, {params:{companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存单位消防设施素材
+          let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
+          this.http.post("/api/CompanyFacilityAssets/Batch", CompanyFacilityAssets, {params: {companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
@@ -2027,13 +2067,88 @@ export class CollectionToolsComponent implements OnInit {
           buildingAreaId: data.id
         }
         this.http.post('/api/BuildingAreaData', newData, { params: this.params }).subscribe(data => {
-          this.renovateBuilding()
+          this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+          this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+          Object.keys(this.canvasData.originaleveryStoreyData.data).forEach((key) => {
+            this.canvasData.originalcompanyBuildingData.data[key] = this.canvasData.originaleveryStoreyData.data[key];
+          });
+          let list = []
+          //建筑数据
+          let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+          CompanyData.data = JSON.stringify(CompanyData.data)
+          this.http.post("/api/BuildingData", CompanyData, {params: { companyId: this.params.companyId}}).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑毗邻
+          let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
+          this.http.post(`/api/BuildingAdjoins/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingAdjoins).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          }, err => {
+            let config = new MatSnackBarConfig();
+            config.verticalPosition = 'top';
+            config.duration = 3000
+            if (err == 'infos 有重复方向！') {
+              this.snackBar.open('建筑毗邻同步失败,存在相同方向', '确定', config);
+            } else {
+              this.snackBar.open('建筑毗邻同步失败', '确定', config);
+            }
+          })
+          //批量保存建筑重点部位
+          let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
+          this.http.post(`/api/BuildingImportantLocations/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingImportantLocations).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
+          //批量保存建筑消防设施素材
+          let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
+          this.http.post(`/api/BuildingFacilityAssets/Batch?companyId=${this.params.companyId}&buildingId=${this.canvasData.selectStorey.buildingId}`, buildingFacilityAssets).subscribe(data => {
+            list.push(1)
+            if (list.length === 4) { this.updateCurrentFloor() }
+          })
         })
 
       })
     }
   }
 
+  //复制完楼层后 刷新视图
+  updateCurrentFloor() {
+    if (this.checkedBuildingIndex == -1) { //总平面图
+      let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+      let planData = this.getSitePlanCompanyData() //获取 单位 数据
+      this.http.get('/api/SitePlans', { params: this.params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+  
+      }) //重新加载 新楼层
+    } else { //楼层/区域
+      let params = { buildingId: this.beforeOneCheckedBuilding.id }
+      let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
+      let planData = this.getBuildingData(params) //获取 建筑 数据
+      this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
+        this.sitePlanData = data
+        this.selectingSitePlan = this.sitePlanData[this.sitePlanData.length-1] || {}
+        this.canvasData.selectStorey = this.sitePlanData[this.sitePlanData.length-1] || {} //服务中 存一份数据
+        this.selectSitePlanIndex = this.sitePlanData.length-1
+  
+        Promise.all([fireData, planData]).then((res) => {
+          this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+          this.maskLayerService.sendMessage(false)
+        })
+
+      }) //重新加载 新楼层
+    }
+  }
+
   //平面图 楼层/区域  替换底图
   replaceBaseMap(e, item) {
     e.stopPropagation();

From 339ca619c2db4da632f2fc2ee1171d5e309d4e83 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 2 Jun 2021 16:40:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]gis=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=89=B9=E5=88=AB=E8=AD=A6=E7=A4=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinfo-look/basicinfo.component.html   |   4 +-
 .../basicinfo-look/basicinfo.component.ts     | 813 +++++++---------
 .../basicinfo/basicinfo.component.html        | 349 ++++---
 .../key-unit/basicinfo/basicinfo.component.ts | 916 +++++++++---------
 src/app/key-unit/key-unit.module.ts           |   5 +-
 .../special-warning.component.html            |  17 +
 .../special-warning.component.scss            |  64 ++
 .../special-warning.component.spec.ts         |  25 +
 .../special-warning.component.ts              |  64 ++
 .../view-unit-details.component.html          |  42 +-
 src/app/pages/login/login.component.ts        |   2 +
 src/app/tabbar/tabbar.component.html          |   4 +-
 src/styles.scss                               |  56 ++
 13 files changed, 1260 insertions(+), 1101 deletions(-)
 create mode 100644 src/app/key-unit/special-warning/special-warning.component.html
 create mode 100644 src/app/key-unit/special-warning/special-warning.component.scss
 create mode 100644 src/app/key-unit/special-warning/special-warning.component.spec.ts
 create mode 100644 src/app/key-unit/special-warning/special-warning.component.ts

diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.html b/src/app/key-unit/basicinfo-look/basicinfo.component.html
index a979dbd..4406039 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.html
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.html
@@ -112,7 +112,7 @@
                                 <mat-spinner *ngIf="isspinner"  diameter= 50></mat-spinner>
                             </div>           
                         </div>
-                        <div class="mainright" id="setPosition">
+                        <div class="mainright" id="setUnitPositionLook">
                             <div style="width: 100%;height: 100%;" id="container">
 
                             </div>
@@ -141,7 +141,7 @@
                             <div class="gistopbox hidden" [ngClass]="{'show': isGisTopBoxTwo}">
                                 <div class="inputBox">
                                     <span>位置: </span>
-                                    <input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput" type="text" autocomplete="off">
+                                   
                                 </div>
                                 <div class="setPosition">
                                    搜索
diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.ts b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
index 79875e2..0278bc0 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
@@ -1,10 +1,10 @@
-import { Component, OnInit, Inject ,ViewChild, Renderer2, ElementRef, Directive, forwardRef} from '@angular/core';
+import { Component, OnInit, Inject, ViewChild, Renderer2, ElementRef, Directive, forwardRef } from '@angular/core';
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { HttpClient,HttpHeaders, HttpEventType } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms';
-import { MatSnackBar ,MatSnackBarConfig} from '@angular/material/snack-bar';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import format from 'date-fns/format';
 import { TreeService } from '../../http-interceptors/tree.service'
 import { FileUploader, FileItem } from 'ng2-file-upload'
@@ -29,13 +29,13 @@ declare var AMap: any;
 export class BasicinfoLookComponent implements OnInit {
 
   //查看消防设施统计
-  seeFirfightingDevice (e) {
+  seeFirfightingDevice(e) {
     e.stopPropagation()
-    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities,{hasBackdrop: false,position: {right:'55px',top:'165px'}});
-    dialogRef.afterClosed().subscribe();   
+    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities, { hasBackdrop: false, position: { right: '55px', top: '165px' } });
+    dialogRef.afterClosed().subscribe();
   }
 
-  unitinfo:any={
+  unitinfo: any = {
     id: '',
     name: '', //单位信息名字
     usci: '', //单位信用代码
@@ -49,20 +49,20 @@ export class BasicinfoLookComponent implements OnInit {
     organizationName: '', //组织机构名称
     buildingTypes: [
       {
-        id:'',
-        name:''
+        id: '',
+        name: ''
       }
     ]
   }
-  
-  uploader:FileUploader = new FileUploader({    //初始化上传事件 ng2-upload
-    url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,   
-    method: "POST",    
+
+  uploader: FileUploader = new FileUploader({    //初始化上传事件 ng2-upload
+    url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,
+    method: "POST",
     itemAlias: "uploadedfile",
     autoUpload: false,
-    removeAfterUpload:true //上传之后是否在队列中移除，如果不移除就会出现无法上传第二次的情况
+    removeAfterUpload: true //上传之后是否在队列中移除，如果不移除就会出现无法上传第二次的情况
   });
-    
+
 
 
 
@@ -79,255 +79,94 @@ export class BasicinfoLookComponent implements OnInit {
   treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
   treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-  
+
   myControl = new FormControl();
 
   isorganizationbox = false//控制辖区中队框的显示隐藏
   selectedorganization: any//所选的辖区中队
-  selectedorganizationid:any //所选的辖区中队的id
+  selectedorganizationid: any //所选的辖区中队的id
   highhouse = false//控制高层表单的显示
-  
-  defaultbuildingTypes :any  //存储当前建筑的默认类型的id
-  buildingTypesname:any//存储当前建筑的默认类型name
-  buildingCustomData:any //存储当前建筑的自定义信息
+
+  defaultbuildingTypes: any  //存储当前建筑的默认类型的id
+  buildingTypesname: any//存储当前建筑的默认类型name
+  buildingCustomData: any //存储当前建筑的自定义信息
   allunittype: any //所有单位类型
-  allorganizing:any = [] //所有组织机构
-  constructor(private route:ActivatedRoute,private  elementRef: ElementRef,public renderer2: Renderer2,private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog,public snackBar: MatSnackBar) { }
+  allorganizing: any = [] //所有组织机构
+  constructor(private route: ActivatedRoute, private elementRef: ElementRef, public renderer2: Renderer2, private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog, public snackBar: MatSnackBar) { }
 
   houses: any = [] //存储当前单位的建筑信息
-  unitId : any //当前单位id
-  gallery : any //Viewer实例
+  unitId: any //当前单位id
+  gallery: any //Viewer实例
   ngOnInit(): void {
     this.getallunittype()
     this.getorganization()
     this.getUnitAllBuildings()//获得单位下所有建筑
     this.unitId = this.route.snapshot.queryParams.id
     setTimeout(() => {
-      this.gallery = new Viewer(document.getElementById('viewerjs'),{
+      this.gallery = new Viewer(document.getElementById('viewerjs'), {
         url: 'data-original'
       });
-    },0);
+    }, 0);
   }
   //获得单位下所有建筑
-  getUnitAllBuildings(){
+  getUnitAllBuildings() {
     this.unitId = this.route.snapshot.queryParams.id
-    this.http.get("/api/Buildings",{
-      params:{
-        companyId:this.unitId
+    this.http.get("/api/Buildings", {
+      params: {
+        companyId: this.unitId
       }
-    }).subscribe(async (data:any)=>{ // 获得当前单位所有的建筑
+    }).subscribe(async (data: any) => { // 获得当前单位所有的建筑
       data.forEach(element => {
         element.data = []
       });
       this.houses = data
-      if(this.houses.length != 0){
+      if (this.houses.length != 0) {
         this.getBuildingInfo()
-      } 
+      }
     })
   }
 
 
 
-  isMapLabel:boolean
+  isMapLabel: boolean
   //地图标注位置
-  markerPosition:any = {x: 0, y: 0}//单位坐标
-  map:any //地图实例
-  isGisTopBox:boolean = false//点击位置按钮
-  isGisTopBoxTwo:boolean = false//点击位置按钮
-  oldPositionMarker:any //旧位置marker实例
-  newPositionMarker:any //新位置marker实例
+  markerPosition: any = { x: 0, y: 0 }//单位坐标
+  map: any //地图实例
+  isGisTopBox: boolean = false//点击位置按钮
+  isGisTopBoxTwo: boolean = false//点击位置按钮
+  oldPositionMarker: any //旧位置marker实例
+  newPositionMarker: any //新位置marker实例
+
+  newPositionMarkerContent: any =
+    '<div class="custom-content-marker">' +
+    '   <img class="positionimg" src="/assets/images/newposition.png">' +
+    '   <div class="btnbox2"></div>' +
+    '</div>'
 
-  newPositionMarkerContent:any  = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
-  '</div>'
-  newPositionMarkerContentBtn:any = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
-  '   <div  class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
-  '</div>'
-  oldPositionMarkerContent:any = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/oldposition.png">' +
-  '</div>'
   //初始化地图
-  searchTitle:any//搜索内容
-  placeSearch:any//地址搜索类
-  search(){
-    this.placeSearch.search(this.searchTitle, (status, result) => {
-      // 搜索成功时，result即是对应的匹配数据
-      if(result.info == "OK"){
-        this.newPositionMarker.setPosition([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat])
-        this.markerPosition2 = {x: result.poiList.pois[0].location.lng, y: result.poiList.pois[0].location.lat}
-        this.map.setCenter([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat]); //设置地图中心点
-      }else{
-        alert('查询不到输入地址信息')
-      }
-      
-    })
-      
-  }
-  //初始化地图
-  labelGis(){
+  labelGis() {
     this.map = new AMap.Map('container', {
-      zoom:12
+      zoom: 12
     })
     this.map.on('complete', () => {
       this.isGisTopBox = true
     });
-  //输入提示
-  var autoOptions = {
-    input: "tipinput"
-  };
-  AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{
-    var auto = new AMap.AutoComplete(autoOptions);
-    this.placeSearch = new AMap.PlaceSearch();  //构造地点查询类
-    auto.on("select", (e)=>{
-          // console.log(e)
-          // console.log( this.newPositionMarker)
-          this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
-          this.markerPosition2 = {x: e.poi.location.lng, y: e.poi.location.lat}
-          this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
-    });//注册监听，当选中某条记录时会触发
 
-  });
 
-  if(this.isMapLabel){//如果已经标注单位坐标
-    // console.log('已标注单位位置')
-    this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
-    this.oldPositionMarker = new AMap.Marker({
-      position: [this.unitinfo.location.x,this.unitinfo.location.y],
-      content: this.newPositionMarkerContent,
-      offset: new AMap.Pixel(-15, -18)
-    })
-    // 将 markers 添加到地图
-    this.map.add(this.oldPositionMarker);
-  }else{
-    // console.log('未标注单位位置')
-    this.map.setCity('上海');
-  }
-  }
-  markerPosition2
-  //点击位置按钮
-  setPosition(){
-    this.isGisTopBox = false
-    this.isGisTopBoxTwo = true
-    if(this.isMapLabel){//如果已经标注单位坐标
+    if (this.isMapLabel) {//如果已经标注单位坐标
       // console.log('已标注单位位置')
-
-      if(this.oldPositionMarker){
-        this.oldPositionMarker.setContent(this.oldPositionMarkerContent)
-      }
-      if(this.newPositionMarker){
-        this.newPositionMarker.setContent(this.oldPositionMarkerContent)
-      }
-
-      this.newPositionMarker = new AMap.Marker({
-          draggable: true,
-          position: [this.markerPosition.x,this.markerPosition.y],
-          content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
-      });
-      this.map.add(this.newPositionMarker);
-
-
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
-      }else{
-        this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat}  //获取当前地图中心位置
-      }
-      this.newPositionMarker.on('dragend', (e)=>{
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
-      })
-      //点击确定
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ 
-        this.map.clearMap();
-        this.isGisTopBox = true
-        this.isGisTopBoxTwo = false
-        this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition2.x,this.markerPosition2.y],
-          content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
-        });
-        this.markerPosition = this.markerPosition2
-        this.map.add(this.newPositionMarker);
+      this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
+      this.oldPositionMarker = new AMap.Marker({
+        position: [this.unitinfo.location.x, this.unitinfo.location.y],
+        content: this.newPositionMarkerContent,
+        offset: new AMap.Pixel(-34, -36)
       })
-      //点击取消
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ 
-        this.isGisTopBox = true
-        this.isGisTopBoxTwo = false
-        this.map.clearMap();
-        this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
-          content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
-        });
-        this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
-        this.map.add(this.newPositionMarker);  
-      })
-
-    }else{
+      // 将 markers 添加到地图
+      this.map.add(this.oldPositionMarker);
+    } else {
       // console.log('未标注单位位置')
-      if(this.newPositionMarker){
-        this.newPositionMarker.setContent(this.oldPositionMarkerContent)
-      }
-      let center
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        center = [this.markerPosition.x,this.markerPosition.y]
-      }else{
-        center = this.map.getCenter(); //获取当前地图中心位置
-        this.map.setCenter(center);
-      }
-      
-      this.newPositionMarker = new AMap.Marker({
-          draggable: true,
-          position: center,
-          content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
-      });
-      this.map.add(this.newPositionMarker);
-
-      // let markerPosition 
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
-      }else{
-        this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat}  //获取当前地图中心位置
-      }
-      this.newPositionMarker.on('dragend', (e)=>{
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
-      })
-      //点击确定
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ 
-        this.isGisTopBox = true
-        this.isGisTopBoxTwo = false
-        this.markerPosition = this.markerPosition2
-        this.map.clearMap();
-        this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
-          content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
-        });
-        this.map.add(this.newPositionMarker);
-      })
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ 
-        this.map.clearMap();
-        this.isGisTopBox = true
-        this.isGisTopBoxTwo = false
-        if(this.markerPosition.x && this.markerPosition.x != 0){//说明之前标过点
-          this.newPositionMarker = new AMap.Marker({
-            position: [this.markerPosition.x,this.markerPosition.y],
-            content: this.newPositionMarkerContent,
-            offset: new AMap.Pixel(-15, -18)
-          });
-          this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
-          this.map.add(this.newPositionMarker);
-        }
-      })//取消
+      this.map.setCity('上海');
     }
-    
-
-
-    
   }
 
 
@@ -345,11 +184,11 @@ export class BasicinfoLookComponent implements OnInit {
         this.allorganizing = data
         this.dataSource.data = this.tree.toTree(data);
         let _this = this
-        this.getunitinfo().then((e)=>{
-          if(this.unitinfo.location && (this.unitinfo.location.x != 0 && this.unitinfo.location.y != 0) ){//已标注
+        this.getunitinfo().then((e) => {
+          if (this.unitinfo.location && (this.unitinfo.location.x != 0 && this.unitinfo.location.y != 0)) {//已标注
             _this.isMapLabel = true
             _this.markerPosition = _this.unitinfo.location
-          }else{//未标注
+          } else {//未标注
             _this.isMapLabel = false
           }
           this.labelGis()
@@ -358,37 +197,37 @@ export class BasicinfoLookComponent implements OnInit {
     )
   }
   //获得当前单位的基本信息
-  async getunitinfo(){
+  async getunitinfo() {
     let result = await new Promise((resolve, reject) => {
-      this.http.get(`/api/Companies/${this.unitId}`).subscribe((data:any)=>{
-        if(data.buildingTypes.length){
-          sessionStorage.setItem('buildingTypeId',data.buildingTypes[0].id)
-        }else{
-          sessionStorage.setItem('buildingTypeId',"")
+      this.http.get(`/api/Companies/${this.unitId}`).subscribe((data: any) => {
+        if (data.buildingTypes.length) {
+          sessionStorage.setItem('buildingTypeId', data.buildingTypes[0].id)
+        } else {
+          sessionStorage.setItem('buildingTypeId', "")
         }
         let node
         this.allorganizing.forEach(item => {
-          if(item.id == data.organizationId){
+          if (item.id == data.organizationId) {
             node = item
           }
         });
-        if(node){
-          if(!node.parentId){
+        if (node) {
+          if (!node.parentId) {
             this.selectedorganization = node.name
-          }else{
+          } else {
             let namearr = [node.name]
             let targetId = node.parentId; // 临时变量
-            for(let i = 0; i < node.level ; i++){
+            for (let i = 0; i < node.level; i++) {
               this.allorganizing.forEach(item => {
-                if(item.id == targetId ){
-                  namearr.push(item.name) 
+                if (item.id == targetId) {
+                  namearr.push(item.name)
                   targetId = item.parentId; // 临时变量更新没有副作用
                 }
               });
             }
             namearr.reverse()
             let str = ''
-            namearr.forEach(item=>{
+            namearr.forEach(item => {
               str += '/' + item
             })
             this.selectedorganization = str.substr(1)
@@ -397,42 +236,44 @@ export class BasicinfoLookComponent implements OnInit {
         this.unitinfo = data
         resolve(this.unitinfo)
         this.selectedorganizationid = data.organizationId
-        if(data.imageUrl){
+        if (data.imageUrl) {
           this.imgsrc = data.imageUrl
         }
-        if(data.buildingTypes[0]){
+        if (data.buildingTypes[0]) {
           this.defaultbuildingTypes = data.buildingTypes[0].id
           this.buildingTypesname = data.buildingTypes[0].name
         }
-      }) 
+      })
     })
-    
+
   }
   //获得建筑自定义信息
-  getbuildingCustomData(){
-    this.http.get("/api/BuildingCustomData",{params:{
-      buildingId:this.houses[this.selectedBuildingIndex].id
-    }}).subscribe(data=>{
+  getbuildingCustomData() {
+    this.http.get("/api/BuildingCustomData", {
+      params: {
+        buildingId: this.houses[this.selectedBuildingIndex].id
+      }
+    }).subscribe(data => {
       this.buildingCustomData = data
     })
   }
 
   //获得建筑的全部信息放到对应houses数组的建筑中
-  selectedBuildingIndex:number = 0
-  getBuildingInfo(){
+  selectedBuildingIndex: number = 0
+  getBuildingInfo() {
     this.unitId = this.route.snapshot.queryParams.id
-    this.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
-      params:{
-        companyId :this.unitId,
-        buildingId:this.houses[this.selectedBuildingIndex].id,
-        buildingType:this.houses[this.selectedBuildingIndex].buildingTypes[0].id
+    this.http.get("/api/BuildingBasicInfos", { // 循环请求当前单位建筑每一个建筑的信息保存到数组中
+      params: {
+        companyId: this.unitId,
+        buildingId: this.houses[this.selectedBuildingIndex].id,
+        buildingType: this.houses[this.selectedBuildingIndex].buildingTypes[0].id
       }
-    }).subscribe((data)=>{
+    }).subscribe((data) => {
       // console.log('当前选择建筑的基础信息',data)
       //需要处理一下表格信息
       data[0].buildingBasicGroups.forEach(element => {
-         //需要处理一下表格信息
-        if(element.type == 1){
+        //需要处理一下表格信息
+        if (element.type == 1) {
           let afterData = []
           let tempArr = [];
           for (let i = 0; i < element.propertyInfos.length; i++) {
@@ -452,61 +293,63 @@ export class BasicinfoLookComponent implements OnInit {
               }
             }
           }
-          function compare(property){
-            return function(a,b){
-                var value1 = a[property];
-                var value2 = b[property];
-                return value1 - value2;
+          function compare(property) {
+            return function (a, b) {
+              var value1 = a[property];
+              var value2 = b[property];
+              return value1 - value2;
             }
           }
-          afterData.forEach(item =>{
+          afterData.forEach(item => {
             item.origin = item.origin.sort(compare('order'))
           })
           element.propertyInfos = afterData.sort(compare('tag'))
           // console.log(afterData,888);
         }
       });
-      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
       function transferFn(arr) {
-        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
-        
+        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
+
         const guanquList = arr.slice(guanquIndex); // 灌区的列表
         const baseList = arr.slice(0, guanquIndex); // 前面的数据
         const len = guanquList.length;
-        const num = len/2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
+        const num = len / 2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
         // 灌区切割出来的数据，分别存放，最后做一下合并
         const array1 = [];
         const array2 = [];
-        for(let i = 0; i<num; i++) {
-            array1.push(guanquList[i]); // 灌区x
-            array2.push(guanquList[i + num]); // 灌区x/储罐信息
+        for (let i = 0; i < num; i++) {
+          array1.push(guanquList[i]); // 灌区x
+          array2.push(guanquList[i + num]); // 灌区x/储罐信息
         }
         // 拼接最后的数据
         const result = [...baseList];
-        for(let i = 0, ll = array1.length; i < ll; i++){
-            result.push(array1[i]);
-            if (array2[i]) {
-                result.push(array2[i]);
-            }
+        for (let i = 0, ll = array1.length; i < ll; i++) {
+          result.push(array1[i]);
+          if (array2[i]) {
+            result.push(array2[i]);
+          }
         }
         return result;
       }
-      if(guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1){
+      if (guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1) {
         data[0].buildingBasicGroups = transferFn(data[0].buildingBasicGroups)
       }
       this.houses[this.selectedBuildingIndex].data = data
       //获得自定义信息
-      this.http.get("/api/BuildingCustomData",{params:{ //-----处理建筑自定义属性部分
-        buildingId:this.houses[this.selectedBuildingIndex].id
-        }}).subscribe((data:any)=>{
-        if(data && data.customProperties.length != 0){
-          this.houses[this.selectedBuildingIndex].customData = data 
+      this.http.get("/api/BuildingCustomData", {
+        params: { //-----处理建筑自定义属性部分
+          buildingId: this.houses[this.selectedBuildingIndex].id
+        }
+      }).subscribe((data: any) => {
+        if (data && data.customProperties.length != 0) {
+          this.houses[this.selectedBuildingIndex].customData = data
           this.houses[this.selectedBuildingIndex].isCustomData = true
-        }else{
+        } else {
           this.houses[this.selectedBuildingIndex].isCustomData = false
           this.houses[this.selectedBuildingIndex].customData = {
             id: "",
-            customProperties: [{name:'',value:''}],
+            customProperties: [{ name: '', value: '' }],
             buildingId: this.houses[this.selectedBuildingIndex].id
           }
         }
@@ -514,15 +357,15 @@ export class BasicinfoLookComponent implements OnInit {
     })
   }
   //点击选项卡
-  selectedTabChange(e){
+  selectedTabChange(e) {
     // console.log(e)
     this.selectedBuildingIndex = e.index
-    if((this.houses[this.selectedBuildingIndex].data && !this.houses[this.selectedBuildingIndex].data.length) || !this.houses[this.selectedBuildingIndex].data){
+    if ((this.houses[this.selectedBuildingIndex].data && !this.houses[this.selectedBuildingIndex].data.length) || !this.houses[this.selectedBuildingIndex].data) {
       this.getBuildingInfo()
     }
   }
   //表格加一行
-  addline(ele){
+  addline(ele) {
     let newObj = JSON.parse(JSON.stringify(ele[0]))
     for (let index = 0; index < newObj.origin.length; index++) {
       const element = newObj.origin[index];
@@ -533,31 +376,31 @@ export class BasicinfoLookComponent implements OnInit {
     ele.push(newObj)
   }
   //表格减一行
-  removeline(ele){
-    if(ele.length>1){
+  removeline(ele) {
+    if (ele.length > 1) {
       ele.pop()
-    }else{
+    } else {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('只剩一行，无法删除','确定',config);
+      this.snackBar.open('只剩一行，无法删除', '确定', config);
     }
   }
   //建筑自定义信息加一行
-  addCustomData(item){
+  addCustomData(item) {
     item.customData.customProperties.push({
-      name:'',
-      value:''
+      name: '',
+      value: ''
     })
   }
   //建筑自定义信息减一行
-  popCustomData(item){
+  popCustomData(item) {
     item.customData.customProperties.pop()
   }
   //储罐加一组
-  addTankBox(item,groupsIndex){
+  addTankBox(item, groupsIndex) {
     //取出现在最后一个罐区的数字
-    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig,"")
+    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig, "")
     let obj1 = JSON.parse(JSON.stringify(item.data[0].buildingBasicGroups[groupsIndex]))
     let obj2 = JSON.parse(JSON.stringify(item.data[0].buildingBasicGroups[groupsIndex + 1]))
     obj1.name = '罐区' + (Number(num) + 1)
@@ -576,33 +419,33 @@ export class BasicinfoLookComponent implements OnInit {
     // console.log(item.data[0].buildingBasicGroups)
   }
   //储罐减一组
-  removeTankBox(item,groupsIndex){
-    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig,"")
-    if(num != 1){
+  removeTankBox(item, groupsIndex) {
+    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig, "")
+    if (num != 1) {
       var isdeleted = confirm("确定要删除末尾储罐分组吗？")
-      if(isdeleted){
+      if (isdeleted) {
         item.data[0].buildingBasicGroups.pop()
         item.data[0].buildingBasicGroups.pop()
-      } 
-    }else{
+      }
+    } else {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('只剩唯一储罐，无法删除','确定',config);
+      this.snackBar.open('只剩唯一储罐，无法删除', '确定', config);
     }
   }
-  FunData(e){//切割数组
+  FunData(e) {//切割数组
     let proportion = 2; //按照比例切割
     let num = 0;
-    let _data =[];
-    for(let i=0;i<e.length;i++){
-        if(i % proportion == 0 && i != 0){
-            _data.push(e.slice(num,i));
-            num = i;
-        }
-        if((i+1)==e.length){
-            _data.push(e.slice(num,(i+1)));
-        }
+    let _data = [];
+    for (let i = 0; i < e.length; i++) {
+      if (i % proportion == 0 && i != 0) {
+        _data.push(e.slice(num, i));
+        num = i;
+      }
+      if ((i + 1) == e.length) {
+        _data.push(e.slice(num, (i + 1)));
+      }
     }
     return _data;
   }
@@ -613,25 +456,25 @@ export class BasicinfoLookComponent implements OnInit {
     this.selectedorganizationid = node.id
     this.isorganizationbox = false
 
-    if(!node.parentId){
+    if (!node.parentId) {
       this.selectedorganization = node.name
-    }else{
+    } else {
       let namearr = [node.name]
       let targetId = node.parentId; // 临时变量
-      for(let i = 0; i < node.level ; i++){
+      for (let i = 0; i < node.level; i++) {
         this.allorganizing.forEach(item => {
-          if(item.id == targetId ){
-            namearr.push(item.name) 
+          if (item.id == targetId) {
+            namearr.push(item.name)
             targetId = item.parentId; // 临时变量更新没有副作用
           }
         });
       }
       namearr.reverse()
       let str = ''
-      namearr.forEach(item=>{
+      namearr.forEach(item => {
         str += '/' + item
       })
-      
+
       this.selectedorganization = str.substr(1)
     }
   }
@@ -645,38 +488,38 @@ export class BasicinfoLookComponent implements OnInit {
   }
 
   hasChild = (_: number, node: any) => node.expandable;
-  
+
   imgsrc = "" //没有上传图片时显示的图片，当上传后就会被替换，即保存时需要传的图片地址参数
   noImg = '../../../assets/images/upload.jpg'
   imgUrl = ""//返回来的图片地址后缀
   file: any; //上传的文件
   objectName: any; //上传对象名
   uploadId: any; //上传分块上传事件编号
-  isspinner:boolean=false //控制进度圈的显示隐藏
+  isspinner: boolean = false //控制进度圈的显示隐藏
   PartNumberETag: any = []; //分块上传每次返回需要保存的信息
   //change选择文件
   filechange(e) {
     this.file = e.target.files[0] || null //上传的文件
     var reader = new FileReader();
     reader.readAsDataURL(this.file);
-    var image:any = new Image();
-    reader.onload = function(){
+    var image: any = new Image();
+    reader.onload = function () {
       image.src = reader.result
     }
     setTimeout(() => {
-      if(image.width>=4096 || image.height>=5000 ){ 
+      if (image.width >= 4096 || image.height >= 5000) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('请选择分辨率小于4096*5000的图片','确定',config);
-      }else{
-        if(this.file){
+        this.snackBar.open('请选择分辨率小于4096*5000的图片', '确定', config);
+      } else {
+        if (this.file) {
           this.startUploading()
         }
       }
-    
+
     }, 500);
-  } 
+  }
 
   //上传文件
   startUploading() {
@@ -688,15 +531,15 @@ export class BasicinfoLookComponent implements OnInit {
     if (file && fileSize <= shardSize) { //上传文件<=5MB时
       // this.upload()
       let formData = new FormData()
-      formData.append("file",file)
-      this.http.post(`/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,formData).subscribe((data:any)=>{
+      formData.append("file", file)
+      this.http.post(`/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`, formData).subscribe((data: any) => {
         this.isspinner = false
         this.imgUrl = data.objectName
         this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传成功','确定',config);
+        this.snackBar.open('上传成功', '确定', config);
       })
     } else if (file && fileSize >= shardSize) { //上传文件>5MB时,分块上传
 
@@ -710,61 +553,61 @@ export class BasicinfoLookComponent implements OnInit {
   }
 
   //小于5MB不需要分块上传
-  upload(){
+  upload() {
     this.uploader.queue[0].upload();//开始上传
-    this.uploader.queue[0].onSuccess = (response, status, headers) => {    
+    this.uploader.queue[0].onSuccess = (response, status, headers) => {
       // 上传文件成功   
       if (status == 201) {
-          // 上传文件后获取服务器返回的数据
+        // 上传文件后获取服务器返回的数据
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传成功','确定',config);
+        this.snackBar.open('上传成功', '确定', config);
         this.isspinner = false
         let tempRes = JSON.parse(response);
-        this.imgUrl = tempRes.objectName  
+        this.imgUrl = tempRes.objectName
         this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
-      }else {            
-          // 上传文件后获取服务器返回的数据错误        
+      } else {
+        // 上传文件后获取服务器返回的数据错误        
       }
     };
-    this.uploader.queue[0].onError = (response, status, headers) => {    
+    this.uploader.queue[0].onError = (response, status, headers) => {
       if (status == 401) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传失败','确定',config);
+        this.snackBar.open('上传失败', '确定', config);
       }
     };
   }
 
   //开始分块上传
-  async subsectionUploading () {
+  async subsectionUploading() {
     let file = this.file || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
     let shardSize = 5 * 1024 * 1024 //5MB一个分片
     let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
 
-    for (let i = 0;i < allSlice;i++) { //循环分段上传
+    for (let i = 0; i < allSlice; i++) { //循环分段上传
       let start = i * shardSize //切割文件开始位置
       let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
       let formData = new FormData()
-      formData.append("file",file.slice(start, end))
+      formData.append("file", file.slice(start, end))
 
       // 同步写法实现异步调用
       let result = await new Promise((resolve, reject) => {
-          // await 需要后面返回一个 promise 对象
-          this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{
-              let msg = {
-                  "partNumber":data.partNumber || null,
-                  "eTag": data.eTag || null
-              }
-              resolve(msg) // 调用 promise 内置方法处理成功
-          })
+        // await 需要后面返回一个 promise 对象
+        this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
+          let msg = {
+            "partNumber": data.partNumber || null,
+            "eTag": data.eTag || null
+          }
+          resolve(msg) // 调用 promise 内置方法处理成功
+        })
       });
       this.PartNumberETag.push(result)
       if (this.PartNumberETag.length === allSlice) {
-          this.endUploading()
+        this.endUploading()
       }
     }
   }
@@ -781,35 +624,35 @@ export class BasicinfoLookComponent implements OnInit {
   }
   //删除具体建筑
   selectedIndex
-  deletedbuilding(item,key){
+  deletedbuilding(item, key) {
     // console.log(item)
     var isdeleted = confirm("确定要删除此建筑吗？")
-    if(isdeleted){
+    if (isdeleted) {
       // console.log(key)
       // 请求删除接口
-      this.http.delete(`/api/Buildings/${item.id}`).subscribe(data=>{
+      this.http.delete(`/api/Buildings/${item.id}`).subscribe(data => {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('删除成功','确定',config);
-        this.houses.splice(this.houses.findIndex(items=>items==item),1) 
+        this.snackBar.open('删除成功', '确定', config);
+        this.houses.splice(this.houses.findIndex(items => items == item), 1)
 
-        let obj ={index:key}
+        let obj = { index: key }
         this.selectedTabChange(obj)
       })
     }
   }
 
   //提交单位基本信息
-  onSubmit(value,invalid,form) {
-    if(invalid){
+  onSubmit(value, invalid, form) {
+    if (invalid) {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('请填写必填项','确定',config);
-    }else{
-      sessionStorage.setItem('buildingTypeId',value.unittype)
-      let time =new Date()
+      this.snackBar.open('请填写必填项', '确定', config);
+    } else {
+      sessionStorage.setItem('buildingTypeId', value.unittype)
+      let time = new Date()
       let body = {
         id: this.unitinfo.id,
         name: this.unitinfo.name,
@@ -829,13 +672,13 @@ export class BasicinfoLookComponent implements OnInit {
           }
         ]
       }
-      this.http.put(`/api/Companies/${this.unitId}`,body).subscribe((data:any)=>{ //修改单位基本信息
+      this.http.put(`/api/Companies/${this.unitId}`, body).subscribe((data: any) => { //修改单位基本信息
         // this.getunitinfo()
-        if(!this.houses.length){
+        if (!this.houses.length) {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('单位基本信息保存成功，请填写单位建筑模板信息','确定',config);
+          this.snackBar.open('单位基本信息保存成功，请填写单位建筑模板信息', '确定', config);
           // alert("单位基本信息保存成功，请填写单位建筑模板信息")
           let addbody = {             //请求创建单位基本信息成功后  直接创建出一个主体建筑模板
             id: "",//即将要生成具体建筑的id
@@ -850,67 +693,67 @@ export class BasicinfoLookComponent implements OnInit {
               }
             ]
           }
-          this.http.post("/api/Buildings",addbody).subscribe(data=>{//首先创建建筑成功了，需要刷出当前建筑类型的模板
+          this.http.post("/api/Buildings", addbody).subscribe(data => {//首先创建建筑成功了，需要刷出当前建筑类型的模板
             // alert('创建主体建筑成功')
             this.getUnitAllBuildings()
           })
-        }else{
+        } else {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('保存成功','确定',config);
+          this.snackBar.open('保存成功', '确定', config);
         }
       }),
-        err=>{
+        err => {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('请填写正确信息','确定',config);
+          this.snackBar.open('请填写正确信息', '确定', config);
         }
-      }
+    }
+
 
-    
   }
-  selected:any
+  selected: any
 
-  isshowrule:boolean = false
-  rulevalue:any
-  inputchange(e,name,value,item){
-    if(name == "≥"){
-      if(Number(e.target.value)< Number(value)){
+  isshowrule: boolean = false
+  rulevalue: any
+  inputchange(e, name, value, item) {
+    if (name == "≥") {
+      if (Number(e.target.value) < Number(value)) {
         item.isshowrule = true
         item.rulevalue = `请输入≥${value}的值`
-      }else{
+      } else {
         item.isshowrule = false
       }
     }
-    if(name == "≤"){
-      if(Number(e.target.value) > Number(value)){
+    if (name == "≤") {
+      if (Number(e.target.value) > Number(value)) {
         item.isshowrule = true
         item.rulevalue = `请输入≤${value}的值`
-      }else{
+      } else {
         item.isshowrule = false
       }
     }
-    if(name == "Range"){
+    if (name == "Range") {
       let rangenum = value.split(",")
       // console.log(rangenum)
-      if(Number(e.target.value) < Number(rangenum[0]) ||  Number(e.target.value) >= Number(rangenum[1])){
+      if (Number(e.target.value) < Number(rangenum[0]) || Number(e.target.value) >= Number(rangenum[1])) {
         item.isshowrule = true
-        item.rulevalue = `请输入位于${Number(rangenum[0])}和${Number(rangenum[1])-1}之间的值`
-      }else{
+        item.rulevalue = `请输入位于${Number(rangenum[0])}和${Number(rangenum[1]) - 1}之间的值`
+      } else {
         item.isshowrule = false
       }
     }
   }
 
   //可选按钮
-  checkboxChange(item,$event,buildingData){
+  checkboxChange(item, $event, buildingData) {
     // console.log(item)
-    if(item.name == '罐区1'){
+    if (item.name == '罐区1') {
       // console.log(buildingData)
       buildingData.data[0].buildingBasicGroups.forEach(element => {
-        if(element.name.indexOf('罐区') != -1){
+        if (element.name.indexOf('罐区') != -1) {
           element.submitted = item.submitted
         }
       });
@@ -918,29 +761,29 @@ export class BasicinfoLookComponent implements OnInit {
   }
 
   //建筑自定义信息按钮
-  checkCustomData($event){
+  checkCustomData($event) {
 
   }
 
-  
+
   //提交建筑信息
-  onSubmitBuildingInfo(value,item,key,invalid){
+  onSubmitBuildingInfo(value, item, key, invalid) {
     // console.log(1,item)
     // console.log(2,invalid)
     // console.log(3,value)
     // console.log(4,this.allunittype)
-    if(invalid){
+    if (invalid) {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('请填写必填项','确定',config);
-    }else {
+      this.snackBar.open('请填写必填项', '确定', config);
+    } else {
       //先把名称和建筑类型单独修改
       let buildingTypeId
       this.allunittype.forEach(element => {
         element.name == item.buildingTypes[0].name ? buildingTypeId = element.id : null
       });
-      this.http.put(`/api/Buildings/${item.id}`,{         //(通用)只修改建筑名称和建筑类型
+      this.http.put(`/api/Buildings/${item.id}`, {         //(通用)只修改建筑名称和建筑类型
         id: item.id,
         name: value.buildingName,
         order: this.houses[key].order,
@@ -952,42 +795,42 @@ export class BasicinfoLookComponent implements OnInit {
             name: item.buildingTypes[0].name
           }
         ]
-      },{
-        params:{
-          companyId : this.unitId
+      }, {
+        params: {
+          companyId: this.unitId
         }
-      }).subscribe((data:any)=>{    
+      }).subscribe((data: any) => {
         // alert("名称和类型保存成功")
       },
-      err=>{
-        alert("名称和类型保存失败")
-      })
+        err => {
+          alert("名称和类型保存失败")
+        })
 
       let newbody = JSON.parse(JSON.stringify(item.data))  //把数据深拷贝取出来进行操作
       for (let index = 0; index < newbody[0].buildingBasicGroups.length; index++) {
         let element = newbody[0].buildingBasicGroups[index];
         element.propertyInfos.forEach(item => {
-          if(!element.isOptional){
+          if (!element.isOptional) {
             item.propertyValue ? element.submitted = true : null
           }
           //删除规则验证标识
           item.isshowrule ? delete item.isshowrule : null
           item.rulevalue ? delete item.rulevalue : null
-          if(item.propertyValue || item.propertyValue == 0){
-            item.propertyValue = String(item.propertyValue) 
+          if (item.propertyValue || item.propertyValue == 0) {
+            item.propertyValue = String(item.propertyValue)
           }
         });
         //如果是表格需要转换为一维数组
-        if(element.type == 1){
+        if (element.type == 1) {
           let arr = []
           for (let index = 0; index < element.propertyInfos.length; index++) {
             const ele = element.propertyInfos[index];
-            
+
             for (let index = 0; index < ele.origin.length; index++) {
               const i = ele.origin[index];
-              i.tag = String(i.tag) 
-              
-              if(!element.isOptional){
+              i.tag = String(i.tag)
+
+              if (!element.isOptional) {
                 i.propertyValue ? element.submitted = true : null
               }
               arr.push(i)
@@ -1000,7 +843,7 @@ export class BasicinfoLookComponent implements OnInit {
           element.propertyInfos = arr
         }
         //如果当前分组没勾选 则需先去重然后重置每一个value为空
-        if(!element.submitted){
+        if (!element.submitted) {
           const res = new Map();
           element.propertyInfos = element.propertyInfos.filter((a) => !res.has(a.propertyName) && res.set(a.propertyName, 1))
           element.propertyInfos.forEach(ele => {
@@ -1008,109 +851,113 @@ export class BasicinfoLookComponent implements OnInit {
           })
         }
         //如果灌区没勾选  并且包含罐区且不包含罐区1的清除  需要把多余罐区2 3 4清除掉再提交
-        if(!element.submitted && element.name.indexOf('罐区1') == -1 && element.name.indexOf('罐区') != -1){
-          newbody[0].buildingBasicGroups.splice(index--, 1); 
+        if (!element.submitted && element.name.indexOf('罐区1') == -1 && element.name.indexOf('罐区') != -1) {
+          newbody[0].buildingBasicGroups.splice(index--, 1);
         }
       }
       // console.log('newbody',newbody)
-      this.http.post("/api/BuildingBasicInfos",newbody,{
-        params:{
-          companyId : this.unitId,
-          buildingId :newbody[0].buildingId
+      this.http.post("/api/BuildingBasicInfos", newbody, {
+        params: {
+          companyId: this.unitId,
+          buildingId: newbody[0].buildingId
         }
-      }).subscribe((data:any)=>{
+      }).subscribe((data: any) => {
         // this.houses[key].id = data[0].id
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('建筑信息保存成功','确定',config);
+        this.snackBar.open('建筑信息保存成功', '确定', config);
       },
-      err=>{
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('请检查输入数据是否有误','确定',config);
-      })
-      
+        err => {
+          const config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('请检查输入数据是否有误', '确定', config);
+        })
+
       //保存建筑自定义信息
-      if(item.isCustomData){
-        this.http.post("/api/BuildingCustomData",item.customData,{params:{
-          companyId :this.unitId,
-          buildingId:item.id
-        }}).subscribe(data=>{
-          
+      if (item.isCustomData) {
+        this.http.post("/api/BuildingCustomData", item.customData, {
+          params: {
+            companyId: this.unitId,
+            buildingId: item.id
+          }
+        }).subscribe(data => {
+
         })
-      }else{
+      } else {
         item.customData.customProperties = []
-        this.http.post("/api/BuildingCustomData",item.customData,{params:{
-          companyId :this.unitId,
-          buildingId:item.id
-        }}).subscribe(data=>{
-          
+        this.http.post("/api/BuildingCustomData", item.customData, {
+          params: {
+            companyId: this.unitId,
+            buildingId: item.id
+          }
+        }).subscribe(data => {
+
         })
       }
-      
+
     }
   }
   //更改模板类型
-  templateBuildtype(n,item,key){
-    this.http.get("/api/BuildingBasicInfos",{//请求当前建筑类型的模板信息保存到数组中
-      params:{
-        companyId :this.unitId,
-        buildingId:item.id,
-        buildingType:n.id
+  templateBuildtype(n, item, key) {
+    this.http.get("/api/BuildingBasicInfos", {//请求当前建筑类型的模板信息保存到数组中
+      params: {
+        companyId: this.unitId,
+        buildingId: item.id,
+        buildingType: n.id
       }
-    }).subscribe(data=>{
+    }).subscribe(data => {
       data[0].buildingBasicGroups.forEach(element => {
         //需要处理一下表格信息
-       if(element.type == 1){
-         let afterData = []
-         let tempArr = [];
-         for (let i = 0; i < element.propertyInfos.length; i++) {
-           element.propertyInfos[i].tag == '' ? element.propertyInfos[i].tag = 1 : null
-           if (tempArr.indexOf(element.propertyInfos[i].tag) === -1) {
-             afterData.push({
-               tag: element.propertyInfos[i].tag,
-               origin: [element.propertyInfos[i]]
-             });
-             tempArr.push(element.propertyInfos[i].tag);
-           } else {
-             for (let j = 0; j < afterData.length; j++) {
-               if (afterData[j].tag == element.propertyInfos[i].tag) {
-                 afterData[j].origin.push(element.propertyInfos[i]);
-                 break;
-               }
-             }
-           }
-         }
-         element.propertyInfos = afterData
-       }
+        if (element.type == 1) {
+          let afterData = []
+          let tempArr = [];
+          for (let i = 0; i < element.propertyInfos.length; i++) {
+            element.propertyInfos[i].tag == '' ? element.propertyInfos[i].tag = 1 : null
+            if (tempArr.indexOf(element.propertyInfos[i].tag) === -1) {
+              afterData.push({
+                tag: element.propertyInfos[i].tag,
+                origin: [element.propertyInfos[i]]
+              });
+              tempArr.push(element.propertyInfos[i].tag);
+            } else {
+              for (let j = 0; j < afterData.length; j++) {
+                if (afterData[j].tag == element.propertyInfos[i].tag) {
+                  afterData[j].origin.push(element.propertyInfos[i]);
+                  break;
+                }
+              }
+            }
+          }
+          element.propertyInfos = afterData
+        }
       });
-      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
       function transferFn(arr) {
-        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
         const guanquList = arr.slice(guanquIndex); // 灌区的列表
         const baseList = arr.slice(0, guanquIndex); // 前面的数据
         const len = guanquList.length;
-        const num = len/2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
+        const num = len / 2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
         // 灌区切割出来的数据，分别存放，最后做一下合并
         const array1 = [];
         const array2 = [];
-        for(let i = 0; i<num; i++) {
-            array1.push(guanquList[i]); // 灌区x
-            array2.push(guanquList[i + num]); // 灌区x/储罐信息
+        for (let i = 0; i < num; i++) {
+          array1.push(guanquList[i]); // 灌区x
+          array2.push(guanquList[i + num]); // 灌区x/储罐信息
         }
         // 拼接最后的数据
         const result = [...baseList];
-        for(let i = 0, ll = array1.length; i < ll; i++){
-            result.push(array1[i]);
-            if (array2[i]) {
-                result.push(array2[i]);
-            }
+        for (let i = 0, ll = array1.length; i < ll; i++) {
+          result.push(array1[i]);
+          if (array2[i]) {
+            result.push(array2[i]);
+          }
         }
         return result;
       }
-      if(guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1){
+      if (guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1) {
         data[0].buildingBasicGroups = transferFn(data[0].buildingBasicGroups)
       }
       this.houses[key].data = data
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html
index 5efb467..da45f5b 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.html
+++ b/src/app/key-unit/basicinfo/basicinfo.component.html
@@ -6,24 +6,24 @@
                 <mat-panel-title>
                     单位信息
                 </mat-panel-title>
-                <button type="button" color="primary" mat-button mat-raised-button style="height: 35px; margin-right: 25px;" (click)="seeFirfightingDevice($event)">查看消防设施统计</button>
+                <button type="button" color="primary" mat-button mat-raised-button
+                    style="height: 35px; margin-right: 25px;" (click)="seeFirfightingDevice($event)">查看消防设施统计</button>
             </mat-expansion-panel-header>
             <div class="topbox">
                 <form (ngSubmit)="onSubmit(form.value,form.invalid,form)" #form="ngForm" class="example-container">
-                    <div class="mainbox" >
+                    <div class="mainbox">
                         <div class="mainleft">
-                            <div class="inputbox" >
+                            <div class="inputbox">
                                 <span style="color: red;">*</span>
                                 <span>统一社会信用代码：</span>
                                 <mat-form-field>
                                     <input matInput id="creditcode" name="creditcode" type='text' #usci="ngModel"
-                                    required minlength="1" maxlength="18"
-                                    [(ngModel)]="unitinfo.usci"
-                                    (focus)="closeorganizationbox()"
-                                    pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$">
+                                        required minlength="1" maxlength="18" [(ngModel)]="unitinfo.usci"
+                                        (focus)="closeorganizationbox()"
+                                        pattern="^[0-9A-HJ-NP-RTUW-Y]{2}\d{6}[0-9A-HJ-NP-RTUW-Y]{10}$">
                                 </mat-form-field>
                                 <div *ngIf="usci.invalid && (usci.dirty || usci.touched)" class="alert-danger">
-                                    <div *ngIf="usci.errors.pattern"  class="alert-danger">
+                                    <div *ngIf="usci.errors.pattern" class="alert-danger">
                                         统一社会信用代码格式不正确
                                     </div>
                                 </div>
@@ -33,7 +33,8 @@
                                 <span>单位类型：</span>
                                 <mat-form-field (click)="closeorganizationbox()">
                                     <mat-select required name="unittype" [(ngModel)]="defaultbuildingTypes">
-                                        <mat-option  [value]="item.id" *ngFor="let item of allunittype">{{item.name}}</mat-option>
+                                        <mat-option [value]="item.id" *ngFor="let item of allunittype">{{item.name}}
+                                        </mat-option>
                                     </mat-select>
                                 </mat-form-field>
                             </div>
@@ -41,11 +42,8 @@
                                 <span style="color: red;">*</span>
                                 <span>联系人：</span>
                                 <mat-form-field>
-                                    <input matInput id="linkman" name="linkman" type='text'
-                                    required minlength="1"
-                                    [(ngModel)]="unitinfo.contacts"
-                                    (focus)="closeorganizationbox()"
-                                    >
+                                    <input matInput id="linkman" name="linkman" type='text' required minlength="1"
+                                        [(ngModel)]="unitinfo.contacts" (focus)="closeorganizationbox()">
                                 </mat-form-field>
                             </div>
                             <div class="inputbox">
@@ -53,14 +51,14 @@
                                 <span>联系电话：</span>
                                 <mat-form-field>
                                     <input matInput id="linkphone" name="linkphone" type='text' #linkphone="ngModel"
-                                    required pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
-                                    [(ngModel)]="unitinfo.phone"
-                                    (focus)="closeorganizationbox()"
-                                >
+                                        required
+                                        pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[35-8]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0135-9]\d{2}|66\d{2})\d{6}$"
+                                        [(ngModel)]="unitinfo.phone" (focus)="closeorganizationbox()">
                                 </mat-form-field>
-                                <div *ngIf="linkphone.invalid && (linkphone.dirty || linkphone.touched)" class="alert-danger">
-                                    <div *ngIf="linkphone.errors.pattern"  class="alert-danger">
-                                    电话号码格式不正确
+                                <div *ngIf="linkphone.invalid && (linkphone.dirty || linkphone.touched)"
+                                    class="alert-danger">
+                                    <div *ngIf="linkphone.errors.pattern" class="alert-danger">
+                                        电话号码格式不正确
                                     </div>
                                 </div>
                             </div>
@@ -68,59 +66,58 @@
                                 <span style="color: red;">*</span>
                                 <span>辖区中队：</span>
                                 <mat-form-field class="longInput">
-                                    <input matInput id="organization" name="organization" type='text'
-                                    required minlength="1"
-                                    [(ngModel)]="selectedorganization"
-                                    (focus)="openorganizationbox()"
-                                    readonly="value" >
+                                    <input matInput id="organization" name="organization" type='text' required
+                                        minlength="1" [(ngModel)]="selectedorganization" (focus)="openorganizationbox()"
+                                        readonly="value">
                                 </mat-form-field>
                             </div>
                             <div id="organizationbox" class="organizationbox" *ngIf="isorganizationbox">
                                 <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
-                                    <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding  (click)='add(node)' class="organizationlist">
-                                        <button type="button" mat-icon-button disabled ></button>
+                                    <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)'
+                                        class="organizationlist">
+                                        <button type="button" mat-icon-button disabled></button>
                                         <li>{{node.name}}</li>
                                     </mat-tree-node>
-                                    <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                                        <button 
-                                        type="button" 
-                                                mat-icon-button 
-                                                matTreeNodeToggle
-                                                [attr.aria-label]="'toggle ' + node.name">
-                                        <mat-icon class="mat-icon-rtl-mirror">
-                                            {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
-                                        </mat-icon>
+                                    <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding
+                                        (click)='add(node)' class="organizationlist">
+                                        <button type="button" mat-icon-button matTreeNodeToggle
+                                            [attr.aria-label]="'toggle ' + node.name">
+                                            <mat-icon class="mat-icon-rtl-mirror">
+                                                {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
+                                            </mat-icon>
                                         </button>
                                         <li>{{node.name}}</li>
                                     </mat-tree-node>
-                                </mat-tree>  
+                                </mat-tree>
                             </div>
                             <div class="inputbox longinputbox">
                                 <span style="color: red;">*</span>
                                 <span>单位地址：</span>
                                 <mat-form-field class="longInput">
-                                    <input matInput id="unitaddress" name="unitaddress" type='text'
-                                    required minlength="1"
-                                    [(ngModel)]="unitinfo.address"
-                                    (focus)="closeorganizationbox()">
+                                    <input matInput id="unitaddress" name="unitaddress" type='text' required
+                                        minlength="1" [(ngModel)]="unitinfo.address" (focus)="closeorganizationbox()">
                                 </mat-form-field>
-                            </div>     
+                            </div>
                             <div class="uploadimg">
                                 <span>单位照片：</span>
                                 <div class="uploadingimg" id="viewerjs">
-                                    <img [src]="imgsrc ? imgsrc : noImg" [attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
+                                    <img [src]="imgsrc ? imgsrc : noImg"
+                                        [attr.data-original]="imgsrc ? imgsrc.split('?')[0] : noImg">
                                 </div>
-                                <mat-spinner *ngIf="isspinner"  diameter= 50></mat-spinner>
-                            </div>           
+                                <mat-spinner *ngIf="isspinner" diameter=50></mat-spinner>
+                            </div>
                             <div class="image">
-                                <input id="selectedfile" type="file" ng2FileSelect [uploader]="uploader"  (change)="filechange($event)" name="imgFile" accept=".jpg,.png,.jpeg">
-                                <button type="submit" color="primary"  class="submit1 sub1" mat-button mat-raised-button>保存</button>
-                            </div>                       
+                                <input id="selectedfile" type="file" ng2FileSelect [uploader]="uploader"
+                                    (change)="filechange($event)" name="imgFile" accept=".jpg,.png,.jpeg">
+                                <button type="submit" color="primary" class="submit1 sub1" mat-button
+                                    mat-raised-button>保存</button>
+                            </div>
                             <div class="addbtn" class="sub2">
-                                <button  type="submit" color="primary"  class="submit1" mat-button mat-raised-button>保存</button>
+                                <button type="submit" color="primary" class="submit1" mat-button
+                                    mat-raised-button>保存</button>
                             </div>
                         </div>
-                        <div class="mainright" id="setPosition">
+                        <div class="mainright" id="setUnitPosition">
                             <div style="width: 100%;height: 100%;" id="container">
 
                             </div>
@@ -128,15 +125,15 @@
                             <div class="gistopbox" *ngIf="isGisTopBox">
                                 <div class="positionItem">
                                     <span>
-                                        经度 : 
+                                        经度 :
                                     </span>
                                     <div class="itemNum">
-                                       {{markerPosition.x || '暂未标注'}}
+                                        {{markerPosition.x || '暂未标注'}}
                                     </div>
                                 </div>
                                 <div class="positionItem">
                                     <span>
-                                        纬度 : 
+                                        纬度 :
                                     </span>
                                     <div class="itemNum">
                                         {{markerPosition.y || '暂未标注'}}
@@ -149,10 +146,11 @@
                             <div class="gistopbox hidden" [ngClass]="{'show': isGisTopBoxTwo}">
                                 <div class="inputBox">
                                     <span>位置: </span>
-                                    <input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput" type="text" autocomplete="off">
+                                    <input name="position" [(ngModel)]="searchTitle" id="tipinput" class="positionInput"
+                                        type="text" autocomplete="off">
                                 </div>
                                 <div class="setPosition" (click)="search()">
-                                   搜索
+                                    搜索
                                 </div>
                             </div>
                         </div>
@@ -164,53 +162,66 @@
     <!-- body -->
     <div class="bodyBox" id="basicInfoBody">
         <div>
-            <button type="button" mat-icon-button (click)="addhouseinfo()" class="addBuilding"><mat-icon>add_circle_outline</mat-icon></button>
+            <button type="button" mat-icon-button (click)="addhouseinfo()" class="addBuilding">
+                <mat-icon>add_circle_outline</mat-icon>
+            </button>
         </div>
         <div style="height: 100%; box-sizing:border-box;overflow-y: auto;padding-left: 26px;">
-            <mat-tab-group style="height: 100%;" [selectedIndex]="selectedIndex" (selectedTabChange)="selectedTabChange($event)">
-                <mat-tab *ngFor="let item of houses;let key = index" label="{{item.name}}"> 
+            <mat-tab-group style="height: 100%;" [selectedIndex]="selectedIndex"
+                (selectedTabChange)="selectedTabChange($event)">
+                <mat-tab *ngFor="let item of houses;let key = index" label="{{item.name}}">
                     <ng-template matTabContent>
-                        <form *ngIf="item.data && item.data.length!=0" style="height: 100%; overflow-y:auto; display: block;" (ngSubmit)="onSubmitBuildingInfo(form.value,item,key,form.invalid)" #form="ngForm" class="example-container">
-                            <div class="buildInfoInput marginLeft" >
+                        <form *ngIf="item.data && item.data.length!=0"
+                            style="height: 100%; overflow-y:auto; display: block;"
+                            (ngSubmit)="onSubmitBuildingInfo(form.value,item,key,form.invalid)" #form="ngForm"
+                            class="example-container">
+                            <div class="buildInfoInput marginLeft">
                                 <span>建筑名称：</span>
                                 <mat-form-field>
-                                    <input required matInput name="buildingName" type='text' minlength="1" [(ngModel)]="item.name">
+                                    <input required matInput name="buildingName" type='text' minlength="1"
+                                        [(ngModel)]="item.name">
                                 </mat-form-field>
                                 <span style="color: red;">*</span>
                             </div>
                             <div class="buildInfoInput marginLeft">
                                 <span>建筑类型：</span>
                                 <mat-form-field>
-                                    <mat-select  name="buildingTypeName" [(ngModel)]="item.buildingTypes[0].name">
-                                        <mat-option  [value]="n.name" *ngFor="let n of allunittype" (click)="templateBuildtype(n,item,key)">{{n.name}}</mat-option>
+                                    <mat-select name="buildingTypeName" [(ngModel)]="item.buildingTypes[0].name">
+                                        <mat-option [value]="n.name" *ngFor="let n of allunittype"
+                                            (click)="templateBuildtype(n,item,key)">{{n.name}}</mat-option>
                                     </mat-select>
                                 </mat-form-field>
                                 <span style="color: red;">*</span>
                             </div>
-                            <div *ngFor="let element of item.data[0].buildingBasicGroups;let groupsIndex = index "style="float: left;width:100%">
+                            <div *ngFor="let element of item.data[0].buildingBasicGroups;let groupsIndex = index "
+                                style="float: left;width:100%">
                                 <!-- 类型为表单并且不是 罐区 -->
                                 <div *ngIf="element.type == 0 && element.name.indexOf('罐区') == -1">
                                     <p style="font-size: 22px;">{{element.name}}</p>
-                                    <div class="buildInfoInput marginLeft" *ngFor="let i of element.propertyInfos;let inputIndex = index"  style="float: left;position: relative;">
-                                        <span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
-                                        <!-- 如果类型是文本 --> 
-                                        <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
+                                    <div class="buildInfoInput marginLeft"
+                                        *ngFor="let i of element.propertyInfos;let inputIndex = index"
+                                        style="float: left;position: relative;">
+                                        <span>{{i.propertyName}}<span
+                                                *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
+                                        <!-- 如果类型是文本 -->
+                                        <mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                             <input matInput name="{{groupsIndex}}{{inputIndex}}" type='text'
-                                            required="{{ i.required==true ? 'true' : 'false' }}"
-                                            [(ngModel)]="i.propertyValue">
+                                                required="{{ i.required==true ? 'true' : 'false' }}"
+                                                [(ngModel)]="i.propertyValue">
                                         </mat-form-field>
-    
+
                                         <!-- 如果类型是数字 -->
                                         <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
                                             <input matInput name="{{groupsIndex}}{{inputIndex}}" type='number'
-                                            required="{{ i.required==true ? 'true' : 'false' }}"
-                                            [(ngModel)]="i.propertyValue"
-                                            (change)="inputchange($event,i.ruleName,i.ruleValue,i)" 
-                                            >
+                                                required="{{ i.required==true ? 'true' : 'false' }}"
+                                                [(ngModel)]="i.propertyValue"
+                                                (change)="inputchange($event,i.ruleName,i.ruleValue,i)">
                                         </mat-form-field>
                                         <!-- 如果类型是耐火等级 -->
                                         <mat-form-field *ngIf="i.propertyName == '耐火等级'">
-                                            <mat-select  name="{{groupsIndex}}{{inputIndex}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
+                                            <mat-select name="{{groupsIndex}}{{inputIndex}}"
+                                                required="{{ i.required==true ? 'true' : 'false' }}"
+                                                placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
                                                 <mat-option value="0">1级</mat-option>
                                                 <mat-option value="1">2级</mat-option>
                                                 <mat-option value="2">3级</mat-option>
@@ -218,10 +229,15 @@
                                             </mat-select>
                                         </mat-form-field>
                                         <!-- 如果类型是多行文本 -->
-                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{groupsIndex}}{{inputIndex}}"></textarea>
-    
-                                        <span style="color: red;"  *ngIf="i.required">*</span>
-                                        <div *ngIf="i.isshowrule" style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
+                                        <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'"
+                                            style="width: 180px;height: 60px;"
+                                            required="{{ i.required==true ? 'true' : 'false' }}"
+                                            [(ngModel)]="i.propertyValue"
+                                            name="{{groupsIndex}}{{inputIndex}}"></textarea>
+
+                                        <span style="color: red;" *ngIf="i.required">*</span>
+                                        <div *ngIf="i.isshowrule"
+                                            style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
                                             <span>{{i.rulevalue}}</span>
                                         </div>
                                     </div>
@@ -229,63 +245,91 @@
                                 <!-- 类型为表格 并且不是 罐区 -->
                                 <div *ngIf="element.type == 1 && element.name.indexOf('罐区') == -1">
                                     <p style="font-size: 22px;">
-                                        <mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)" *ngIf="element.isOptional" [name]="element.name" [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;"></mat-checkbox>
+                                        <mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)"
+                                            *ngIf="element.isOptional" [name]="element.name"
+                                            [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;">
+                                        </mat-checkbox>
                                         {{element.name}}
                                     </p>
                                     <table *ngIf="element.submitted">
                                         <tr>
                                             <th *ngFor="let item of element.propertyInfos[0].origin;let index = index">
-                                                <button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="addline" (click)="addline(element.propertyInfos)"><mat-icon>add_circle_outline</mat-icon></button>
-                                                <button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="removeline" (click)="removeline(element.propertyInfos)"><mat-icon>remove_circle_outline</mat-icon></button>    
+                                                <button *ngIf="index == 0" style="width: 24px;" type="button"
+                                                    mat-icon-button class="addline"
+                                                    (click)="addline(element.propertyInfos)">
+                                                    <mat-icon>add_circle_outline</mat-icon>
+                                                </button>
+                                                <button *ngIf="index == 0" style="width: 24px;" type="button"
+                                                    mat-icon-button class="removeline"
+                                                    (click)="removeline(element.propertyInfos)">
+                                                    <mat-icon>remove_circle_outline</mat-icon>
+                                                </button>
                                                 {{item.propertyName}}
-                                                <span style="color: red;"  *ngIf="item.required">*</span>
+                                                <span style="color: red;" *ngIf="item.required">*</span>
                                             </th>
                                         </tr>
                                         <tr *ngFor="let item of element.propertyInfos;let line = index">
                                             <td *ngFor="let i of item.origin;let list = index">
-                                                <input  *ngIf="i.propertyType != 1" style="height:45px" class="tankinfo"  name="{{element.name}}{{line + 1}}-{{list + 1}}" type="{{i.propertyType == 0 ? 'text' : 'number'}}"
-                                                required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue">
-                                                <textarea class="tankinfo" *ngIf="i.propertyType == 1" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue" name="{{element.name}}{{line + 1}}{{list + 1}}">
-    
+                                                <input *ngIf="i.propertyType != 1" style="height:45px" class="tankinfo"
+                                                    name="{{element.name}}{{line + 1}}-{{list + 1}}"
+                                                    type="{{i.propertyType == 0 ? 'text' : 'number'}}"
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    [(ngModel)]="i.propertyValue">
+                                                <textarea class="tankinfo" *ngIf="i.propertyType == 1"
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    [(ngModel)]="i.propertyValue"
+                                                    name="{{element.name}}{{line + 1}}{{list + 1}}">
+
                                                 </textarea>
                                             </td>
                                         </tr>
                                     </table>
                                 </div>
                                 <!-- 类型为表单 是罐区-->
-                                <div *ngIf="element.type == 0 && element.name.indexOf('罐区') != -1">         
-                                        <p style="font-size: 22px;">
-                                            <mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)" *ngIf="element.isOptional && element.name == '罐区1'" [name]="element.name" [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;"></mat-checkbox>
-                                            
-                                            <span *ngIf="element.name == '罐区1'">罐区信息</span> 
-                                        </p>
-                                    <div *ngIf="element.submitted" >
+                                <div *ngIf="element.type == 0 && element.name.indexOf('罐区') != -1">
+                                    <p style="font-size: 22px;">
+                                        <mat-checkbox color="primary" (change)="checkboxChange(element,$event,item)"
+                                            *ngIf="element.isOptional && element.name == '罐区1'" [name]="element.name"
+                                            [(ngModel)]="element.submitted" style="float: left;margin-right: 10px;">
+                                        </mat-checkbox>
+
+                                        <span *ngIf="element.name == '罐区1'">罐区信息</span>
+                                    </p>
+                                    <div *ngIf="element.submitted">
                                         <p *ngIf="element.name == '罐区1'" style="margin: 5px 0;">
-                                            <button type="button" mat-raised-button color="primary" (click)="addTankBox(item,groupsIndex)" style="margin-right: 5px;">添加罐区</button>
-                                            <button type="button" mat-raised-button color="warn" (click)="removeTankBox(item,groupsIndex)" matTooltip="会将此建筑处于末尾的罐区移除">移除末尾罐区</button>
+                                            <button type="button" mat-raised-button color="primary"
+                                                (click)="addTankBox(item,groupsIndex)"
+                                                style="margin-right: 5px;">添加罐区</button>
+                                            <button type="button" mat-raised-button color="warn"
+                                                (click)="removeTankBox(item,groupsIndex)"
+                                                matTooltip="会将此建筑处于末尾的罐区移除">移除末尾罐区</button>
                                         </p>
                                         <p style="font-size: 22px;">{{element.name}}</p>
-                                        
-                                        <div class="buildInfoInput marginLeft" *ngFor="let i of element.propertyInfos;let inputIndex = index"  style="float: left;position: relative;">
-                                            <span>{{i.propertyName}}<span *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
-                                            <!-- 如果类型是文本 --> 
-                                            <mat-form-field  *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
+
+                                        <div class="buildInfoInput marginLeft"
+                                            *ngFor="let i of element.propertyInfos;let inputIndex = index"
+                                            style="float: left;position: relative;">
+                                            <span>{{i.propertyName}}<span
+                                                    *ngIf="i.physicalUnit">({{i.physicalUnit}})</span>：</span>
+                                            <!-- 如果类型是文本 -->
+                                            <mat-form-field *ngIf="i.propertyType == 0 && i.propertyName != '耐火等级'">
                                                 <input matInput name="{{groupsIndex}}{{inputIndex}}" type='text'
-                                                required="{{ i.required==true ? 'true' : 'false' }}"
-                                                [(ngModel)]="i.propertyValue">
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    [(ngModel)]="i.propertyValue">
                                             </mat-form-field>
-        
+
                                             <!-- 如果类型是数字 -->
                                             <mat-form-field *ngIf="i.propertyType == 2 && i.propertyName != '耐火等级'">
                                                 <input matInput name="{{groupsIndex}}{{inputIndex}}" type='number'
-                                                required="{{ i.required==true ? 'true' : 'false' }}"
-                                                [(ngModel)]="i.propertyValue"
-                                                (change)="inputchange($event,i.ruleName,i.ruleValue,i)" 
-                                                >
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    [(ngModel)]="i.propertyValue"
+                                                    (change)="inputchange($event,i.ruleName,i.ruleValue,i)">
                                             </mat-form-field>
                                             <!-- 如果类型是耐火等级 -->
                                             <mat-form-field *ngIf="i.propertyName == '耐火等级'">
-                                                <mat-select  name="{{groupsIndex}}{{inputIndex}}" required="{{ i.required==true ? 'true' : 'false' }}" placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
+                                                <mat-select name="{{groupsIndex}}{{inputIndex}}"
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    placeholder="请选择耐火等级" [(ngModel)]="i.propertyValue">
                                                     <mat-option value="0">1级</mat-option>
                                                     <mat-option value="1">2级</mat-option>
                                                     <mat-option value="2">3级</mat-option>
@@ -293,17 +337,22 @@
                                                 </mat-select>
                                             </mat-form-field>
                                             <!-- 如果类型是多行文本 -->
-                                            <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'" style="width: 180px;height: 60px;" required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue"  name="{{groupsIndex}}{{inputIndex}}"></textarea>
-        
-                                            <span style="color: red;"  *ngIf="i.required">*</span>
-                                            <div *ngIf="i.isshowrule" style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
+                                            <textarea *ngIf="i.propertyType == 1 && i.propertyName != '耐火等级'"
+                                                style="width: 180px;height: 60px;"
+                                                required="{{ i.required==true ? 'true' : 'false' }}"
+                                                [(ngModel)]="i.propertyValue"
+                                                name="{{groupsIndex}}{{inputIndex}}"></textarea>
+
+                                            <span style="color: red;" *ngIf="i.required">*</span>
+                                            <div *ngIf="i.isshowrule"
+                                                style="position: absolute;left: 205px;top: 45px;font-size: 11px;color: red;">
                                                 <span>{{i.rulevalue}}</span>
                                             </div>
                                         </div>
                                     </div>
-                                   
+
                                 </div>
-                                 <!-- 类型为表格 是罐区 -->
+                                <!-- 类型为表格 是罐区 -->
                                 <div *ngIf="element.type == 1 && element.name.indexOf('罐区') != -1">
                                     <p style="font-size: 22px;" *ngIf="element.submitted">
                                         {{element.name}}
@@ -311,67 +360,73 @@
                                     <table *ngIf="element.submitted">
                                         <tr>
                                             <th *ngFor="let item of element.propertyInfos[0].origin;let index = index">
-                                                <button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="addline" (click)="addline(element.propertyInfos)"><mat-icon>add_circle_outline</mat-icon></button>
-                                                <button *ngIf="index == 0" style="width: 24px;" type="button" mat-icon-button class="removeline" (click)="removeline(element.propertyInfos)"><mat-icon>remove_circle_outline</mat-icon></button>    
+                                                <button *ngIf="index == 0" style="width: 24px;" type="button"
+                                                    mat-icon-button class="addline"
+                                                    (click)="addline(element.propertyInfos)">
+                                                    <mat-icon>add_circle_outline</mat-icon>
+                                                </button>
+                                                <button *ngIf="index == 0" style="width: 24px;" type="button"
+                                                    mat-icon-button class="removeline"
+                                                    (click)="removeline(element.propertyInfos)">
+                                                    <mat-icon>remove_circle_outline</mat-icon>
+                                                </button>
                                                 {{item.propertyName}}
-                                                <span style="color: red;"  *ngIf="item.required">*</span>
+                                                <span style="color: red;" *ngIf="item.required">*</span>
                                             </th>
                                         </tr>
                                         <tr *ngFor="let item of element.propertyInfos;let line = index">
                                             <td *ngFor="let i of item.origin;let list = index">
-                                                <input type="{{i.propertyType == 0 ? 'text' : 'number'}}" style="height:45px" class="tankinfo"  name="{{element.name}}{{line + 1}}-{{list + 1}}" 
-                                                required="{{ i.required==true ? 'true' : 'false' }}" [(ngModel)]="i.propertyValue">
+                                                <input type="{{i.propertyType == 0 ? 'text' : 'number'}}"
+                                                    style="height:45px" class="tankinfo"
+                                                    name="{{element.name}}{{line + 1}}-{{list + 1}}"
+                                                    required="{{ i.required==true ? 'true' : 'false' }}"
+                                                    [(ngModel)]="i.propertyValue">
                                             </td>
                                         </tr>
                                     </table>
                                 </div>
                             </div>
-    
+
                             <div class="CustomData" style="width: 200px;margin-top: 60px;">
-                                <mat-checkbox color="primary" (change)="checkCustomData($event)" name="checkbuilding"  [(ngModel)]="item.isCustomData" style="float: left;margin-right: 10px;"></mat-checkbox>
+                                <mat-checkbox color="primary" (change)="checkCustomData($event)" name="checkbuilding"
+                                    [(ngModel)]="item.isCustomData" style="float: left;margin-right: 10px;">
+                                </mat-checkbox>
                                 <h1 style="font-size: 22px;width: 200px;">自定义信息</h1>
                             </div>
                             <div style="position: relative;" *ngIf="item.isCustomData">
-                                <button  style="position: absolute;left: 80px;top: 8px;" type="button" mat-icon-button (click)="addCustomData(item)" class="addCustomData">
+                                <button style="position: absolute;left: 80px;top: 8px;" type="button" mat-icon-button
+                                    (click)="addCustomData(item)" class="addCustomData">
                                     <mat-icon>add_circle_outline</mat-icon>
                                 </button>
-                                <button style="position: absolute;left:120px;top: 8px;" type="button" mat-icon-button (click)="popCustomData(item)" class="deleteCustomData">
+                                <button style="position: absolute;left:120px;top: 8px;" type="button" mat-icon-button
+                                    (click)="popCustomData(item)" class="deleteCustomData">
                                     <mat-icon>remove_circle_outline</mat-icon>
                                 </button>
-                                <div class="houseinfoinput marginLeft" style="float: left;" *ngFor="let i of item.customData.customProperties;let key = index">
+                                <div class="houseinfoinput marginLeft" style="float: left;"
+                                    *ngFor="let i of item.customData.customProperties;let key = index">
                                     <mat-form-field>
-                                        <input matInput type='text' name="customData{{key}}Name"
-                                        required
-                                        [(ngModel)]="i.name">
+                                        <input matInput type='text' name="customData{{key}}Name" required
+                                            [(ngModel)]="i.name">
                                     </mat-form-field>
                                     <span>:</span>
                                     <mat-form-field>
-                                        <input matInput type='text' name="customData{{key}}Value"
-                                        required
-                                        [(ngModel)]="i.value">
+                                        <input matInput type='text' name="customData{{key}}Value" required
+                                            [(ngModel)]="i.value">
                                     </mat-form-field>
-                                    <span style="color: red;"  *ngIf="i.required">*</span>
+                                    <span style="color: red;" *ngIf="i.required">*</span>
                                 </div>
                             </div>
                             <div class="infobtnbox">
                                 <button type="submit" mat-button mat-raised-button color="primary">保存</button>
-                                <button type="button" mat-raised-button (click)="deletedbuilding(item,key)" color="warn">删除</button>
+                                <button type="button" mat-raised-button (click)="deletedbuilding(item,key)"
+                                    color="warn">删除</button>
                             </div>
                         </form>
                     </ng-template>
-                    
-                    
+
+
                 </mat-tab>
             </mat-tab-group>
         </div>
     </div>
-</div>
-
-
-
-
-
-
-
-
-
+</div>
\ No newline at end of file
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index a93c1b0..97b224e 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -1,10 +1,10 @@
-import { Component, OnInit, Inject ,ViewChild, Renderer2, ElementRef, Directive, forwardRef} from '@angular/core';
+import { Component, OnInit, Inject, ViewChild, Renderer2, ElementRef, Directive, forwardRef } from '@angular/core';
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { HttpClient,HttpHeaders, HttpEventType } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms';
-import { MatSnackBar ,MatSnackBarConfig} from '@angular/material/snack-bar';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import format from 'date-fns/format';
 import { TreeService } from '../../http-interceptors/tree.service'
 import { FileUploader, FileItem } from 'ng2-file-upload'
@@ -30,13 +30,13 @@ import Viewer from 'viewerjs';
 export class BasicinfoComponent implements OnInit {
 
   //查看消防设施统计
-  seeFirfightingDevice (e) {
+  seeFirfightingDevice(e) {
     e.stopPropagation()
-    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities,{hasBackdrop: false,position: {right:'55px',top:'165px'}});
-    dialogRef.afterClosed().subscribe();   
+    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities, { hasBackdrop: false, position: { right: '55px', top: '165px' } });
+    dialogRef.afterClosed().subscribe();
   }
 
-  unitinfo:any={
+  unitinfo: any = {
     id: '',
     name: '', //单位信息名字
     usci: '', //单位信用代码
@@ -50,20 +50,20 @@ export class BasicinfoComponent implements OnInit {
     organizationName: '', //组织机构名称
     buildingTypes: [
       {
-        id:'',
-        name:''
+        id: '',
+        name: ''
       }
     ]
   }
-  
-  uploader:FileUploader = new FileUploader({    //初始化上传事件 ng2-upload
-    url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,   
-    method: "POST",    
+
+  uploader: FileUploader = new FileUploader({    //初始化上传事件 ng2-upload
+    url: `/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,
+    method: "POST",
     itemAlias: "uploadedfile",
     autoUpload: false,
-    removeAfterUpload:true //上传之后是否在队列中移除，如果不移除就会出现无法上传第二次的情况
+    removeAfterUpload: true //上传之后是否在队列中移除，如果不移除就会出现无法上传第二次的情况
   });
-    
+
   private _transformer = (node, level: number) => {   //初始化tree
     return {
       expandable: !!node.children && node.children.length > 0,
@@ -77,308 +77,322 @@ export class BasicinfoComponent implements OnInit {
   treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
   treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
-  
+
   myControl = new FormControl();
 
   isorganizationbox = false//控制辖区中队框的显示隐藏
   selectedorganization: any//所选的辖区中队
-  selectedorganizationid:any //所选的辖区中队的id
+  selectedorganizationid: any //所选的辖区中队的id
   highhouse = false//控制高层表单的显示
-  
-  defaultbuildingTypes :any  //存储当前建筑的默认类型的id
-  buildingTypesname:any//存储当前建筑的默认类型name
-  buildingCustomData:any //存储当前建筑的自定义信息
+
+  defaultbuildingTypes: any  //存储当前建筑的默认类型的id
+  buildingTypesname: any//存储当前建筑的默认类型name
+  buildingCustomData: any //存储当前建筑的自定义信息
   allunittype: any //所有单位类型
-  allorganizing:any = [] //所有组织机构
-  constructor(private tabbarService: TabbarAndScoreService,private route:ActivatedRoute,private  elementRef: ElementRef,public renderer2: Renderer2,private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog,public snackBar: MatSnackBar) { }
+  allorganizing: any = [] //所有组织机构
+  constructor(private tabbarService: TabbarAndScoreService, private route: ActivatedRoute, private elementRef: ElementRef, public renderer2: Renderer2, private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog, public snackBar: MatSnackBar) { }
 
   houses: any = [] //存储当前单位的建筑信息
-  unitId : any //当前单位id
-  gallery : any //Viewer实例
+  unitId: any //当前单位id
+  gallery: any //Viewer实例
   ngOnInit(): void {
     this.getallunittype()
     this.getorganization()
     this.getUnitAllBuildings()//获得单位下所有建筑
     this.unitId = this.route.snapshot.queryParams.id
     setTimeout(() => {
-      this.gallery = new Viewer(document.getElementById('viewerjs'),{
+      this.gallery = new Viewer(document.getElementById('viewerjs'), {
         url: 'data-original'
       });
-    },0);
+    }, 0);
   }
   //获得单位下所有建筑
-  getUnitAllBuildings(){
+  getUnitAllBuildings() {
     this.unitId = this.route.snapshot.queryParams.id
-    this.http.get("/api/Buildings",{
-      params:{
-        companyId:this.unitId
+    this.http.get("/api/Buildings", {
+      params: {
+        companyId: this.unitId
       }
-    }).subscribe(async (data:any)=>{ // 获得当前单位所有的建筑
+    }).subscribe(async (data: any) => { // 获得当前单位所有的建筑
       data.forEach(element => {
         element.data = []
       });
       this.houses = data
-      if(this.houses.length != 0){
+      if (this.houses.length != 0) {
         this.getBuildingInfo()
-      } 
+      }
     })
   }
 
 
 
-  isMapLabel:boolean
+  isMapLabel: boolean
   //地图标注位置
-  markerPosition:any = {x: 0, y: 0}//单位坐标
-  map:any //地图实例
-  isGisTopBox:boolean = false//点击位置按钮
-  isGisTopBoxTwo:boolean = false//点击位置按钮
-  oldPositionMarker:any //旧位置marker实例
-  newPositionMarker:any //新位置marker实例
-
-  newPositionMarkerContent:any  = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
-  '</div>'
-  newPositionMarkerContentBtn:any = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/newposition.png">' +
-  '   <div  class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
-  '</div>'
-  oldPositionMarkerContent:any = 
-  '<div class="custom-content-marker">' +
-  '   <img src="/assets/images/oldposition.png">' +
-  '</div>'
+  markerPosition: any = { x: 0, y: 0 }//单位坐标
+  map: any //地图实例
+  isGisTopBox: boolean = false//点击位置按钮
+  isGisTopBoxTwo: boolean = false//点击位置按钮
+  oldPositionMarker: any //旧位置marker实例
+  newPositionMarker: any //新位置marker实例
+
+  newPositionMarkerContent: any =
+    '<div class="custom-content-marker">' +
+    '   <img class="positionimg" src="/assets/images/newposition.png">' +
+    '   <div class="btnbox2"></div>' +
+    '</div>'
+  newPositionMarkerContentBtn: any =
+    '<div class="custom-content-marker">' +
+    '   <img class="positionimg" src="/assets/images/newposition.png">' +
+    '   <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
+    '</div>'
+  oldPositionMarkerContent: any =
+    '<div class="custom-content-marker">' +
+    '   <img class="positionimg" src="/assets/images/oldposition.png">' +
+    '   <div class="btnbox2"></div>' +
+    '</div>'
   //初始化地图
-  searchTitle:any//搜索内容
-  placeSearch:any//地址搜索类
-  search(){
+  searchTitle: any//搜索内容
+  placeSearch: any//地址搜索类
+  search() {
     this.placeSearch.search(this.searchTitle, (status, result) => {
       // 搜索成功时，result即是对应的匹配数据
-      if(result.info == "OK"){
-        this.newPositionMarker.setPosition([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat])
-        this.markerPosition2 = {x: result.poiList.pois[0].location.lng, y: result.poiList.pois[0].location.lat}
-        this.map.setCenter([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat]); //设置地图中心点
-      }else{
+      if (result.info == "OK") {
+        this.newPositionMarker.setPosition([result.poiList.pois[0].location.lng, result.poiList.pois[0].location.lat])
+        this.markerPosition2 = { x: result.poiList.pois[0].location.lng, y: result.poiList.pois[0].location.lat }
+        this.map.setCenter([result.poiList.pois[0].location.lng, result.poiList.pois[0].location.lat]); //设置地图中心点
+      } else {
         alert('查询不到输入地址信息')
       }
-      
+
     })
-      
+
   }
   //初始化地图
-  labelGis(){
+  labelGis() {
     this.map = new AMap.Map('container', {
-      zoom:12
+      zoom: 12
     })
     this.map.on('complete', () => {
       this.isGisTopBox = true
     });
-  //输入提示
-  var autoOptions = {
-    input: "tipinput"
-  };
-  AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{
-    var auto = new AMap.AutoComplete(autoOptions);
-    this.placeSearch = new AMap.PlaceSearch();  //构造地点查询类
-    auto.on("select", (e)=>{
-          // console.log(e)
-          // console.log( this.newPositionMarker)
-          this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
-          this.markerPosition2 = {x: e.poi.location.lng, y: e.poi.location.lat}
-          this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
-    });//注册监听，当选中某条记录时会触发
+    //输入提示
+    var autoOptions = {
+      input: "tipinput"
+    };
+    AMap.plugin(['AMap.PlaceSearch', 'AMap.AutoComplete'], () => {
+      var auto = new AMap.AutoComplete(autoOptions);
+      this.placeSearch = new AMap.PlaceSearch();  //构造地点查询类
+      auto.on("select", (e) => {
+        // console.log(e)
+        // console.log( this.newPositionMarker)
+        this.newPositionMarker.setPosition([e.poi.location.lng, e.poi.location.lat])
+        this.markerPosition2 = { x: e.poi.location.lng, y: e.poi.location.lat }
+        this.map.setCenter([e.poi.location.lng, e.poi.location.lat]); //设置地图中心点
+      });//注册监听，当选中某条记录时会触发
 
-  });
+    });
 
-  if(this.isMapLabel){//如果已经标注单位坐标
-    // console.log('已标注单位位置')
-    this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
-    this.oldPositionMarker = new AMap.Marker({
-      position: [this.unitinfo.location.x,this.unitinfo.location.y],
-      content: this.newPositionMarkerContent,
-      offset: new AMap.Pixel(-15, -18)
-    })
-    // 将 markers 添加到地图
-    this.map.add(this.oldPositionMarker);
-  }else{
-    // console.log('未标注单位位置')
-    this.map.setCity('上海');
-  }
+    if (this.isMapLabel) {//如果已经标注单位坐标
+      // console.log('已标注单位位置')
+      this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
+      this.oldPositionMarker = new AMap.Marker({
+        position: [this.unitinfo.location.x, this.unitinfo.location.y],
+        content: this.newPositionMarkerContent,
+        offset: new AMap.Pixel(-34, -36)
+      })
+      // 将 markers 添加到地图
+      this.map.add(this.oldPositionMarker);
+    } else {
+      // console.log('未标注单位位置')
+      this.map.setCity('上海');
+    }
   }
   markerPosition2
   //点击位置按钮
-  setPosition(){
+  setPosition() {
     this.isGisTopBox = false
     this.isGisTopBoxTwo = true
-    if(this.isMapLabel){//如果已经标注单位坐标
+    if (this.isMapLabel) {//如果已经标注单位坐标
       // console.log('已标注单位位置')
 
-      if(this.oldPositionMarker){
+      if (this.oldPositionMarker) {
         this.oldPositionMarker.setContent(this.oldPositionMarkerContent)
       }
-      if(this.newPositionMarker){
+      if (this.newPositionMarker) {
         this.newPositionMarker.setContent(this.oldPositionMarkerContent)
       }
 
       this.newPositionMarker = new AMap.Marker({
-          draggable: true,
-          position: [this.markerPosition.x,this.markerPosition.y],
-          content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
+        draggable: true,
+        position: [this.markerPosition.x, this.markerPosition.y],
+        content: this.newPositionMarkerContentBtn,
+        offset: new AMap.Pixel(-34, -36)
       });
       this.map.add(this.newPositionMarker);
 
 
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
-      }else{
-        this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat}  //获取当前地图中心位置
+      if (this.markerPosition.x && this.markerPosition.x != 0) {
+        this.markerPosition2 = { x: this.markerPosition.x, y: this.markerPosition.y }
+      } else {
+        this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat }  //获取当前地图中心位置
       }
-      this.newPositionMarker.on('dragend', (e)=>{
-        // console.log(1111)
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
+      this.newPositionMarker.on('dragend', (e) => {
+        let lnglat = this.map.containerToLngLat(e.pixel)
+        this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
+        // console.log(`${lnglat.KL},${lnglat.kT}`);
+      })
+      this.newPositionMarker.on('dragging', (e) => {
+        //console.log('dragging',e)
+        let lnglat = this.map.containerToLngLat(e.pixel)
+        this.newPositionMarker.setPosition(lnglat);
       })
       //点击确定
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
         this.map.clearMap();
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition2.x,this.markerPosition2.y],
+          position: [this.markerPosition2.x, this.markerPosition2.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
         this.markerPosition = this.markerPosition2
         this.map.add(this.newPositionMarker);
       })
       //点击取消
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'), 'click', (event) => {
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.map.clearMap();
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
+          position: [this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
-        this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
-        this.map.add(this.newPositionMarker);  
+        this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
+        this.map.add(this.newPositionMarker);
       })
       //点击确定
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'touchstart', (event) => {
         this.map.clearMap();
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition2.x,this.markerPosition2.y],
+          position: [this.markerPosition2.x, this.markerPosition2.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
         this.markerPosition = this.markerPosition2
         this.map.add(this.newPositionMarker);
       })
       //点击取消
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'touchstart',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'), 'touchstart', (event) => {
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.map.clearMap();
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
+          position: [this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
-        this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
-        this.map.add(this.newPositionMarker);  
+        this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
+        this.map.add(this.newPositionMarker);
       })
-    }else{
+    } else {
       // console.log('未标注单位位置')
-      if(this.newPositionMarker){
+      if (this.newPositionMarker) {
         this.newPositionMarker.setContent(this.oldPositionMarkerContent)
       }
       let center
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        center = [this.markerPosition.x,this.markerPosition.y]
-      }else{
+      if (this.markerPosition.x && this.markerPosition.x != 0) {
+        center = [this.markerPosition.x, this.markerPosition.y]
+      } else {
         center = this.map.getCenter(); //获取当前地图中心位置
         this.map.setCenter(center);
       }
-      
+
       this.newPositionMarker = new AMap.Marker({
-          draggable: true,
-          position: center,
-          content: this.newPositionMarkerContentBtn,
-          offset: new AMap.Pixel(-15, -18)
+        draggable: true,
+        position: center,
+        content: this.newPositionMarkerContentBtn,
+        offset: new AMap.Pixel(-34, -36)
       });
       this.map.add(this.newPositionMarker);
 
       // let markerPosition 
-      if(this.markerPosition.x && this.markerPosition.x != 0){
-        this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
-      }else{
-        this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat}  //获取当前地图中心位置
+      if (this.markerPosition.x && this.markerPosition.x != 0) {
+        this.markerPosition2 = { x: this.markerPosition.x, y: this.markerPosition.y }
+      } else {
+        this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat }  //获取当前地图中心位置
       }
-      this.newPositionMarker.on('dragend', (e)=>{
-        this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
-       
+      this.newPositionMarker.on('dragend', (e) => {
+        let lnglat = this.map.containerToLngLat(e.pixel)
+        this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
+        // console.log(`${lnglat.KL},${lnglat.kT}`);
+      })
+      this.newPositionMarker.on('dragging', (e) => {
+        //console.log('dragging',e)
+        let lnglat = this.map.containerToLngLat(e.pixel)
+        this.newPositionMarker.setPosition(lnglat);
       })
       //点击确定
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.markerPosition = this.markerPosition2
         this.map.clearMap();
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
+          position: [this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
         this.map.add(this.newPositionMarker);
       })
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'touchstart', (event) => {
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
         this.markerPosition = this.markerPosition2
         this.map.clearMap();
         this.newPositionMarker = new AMap.Marker({
-          position: [this.markerPosition.x,this.markerPosition.y],
+          position: [this.markerPosition.x, this.markerPosition.y],
           content: this.newPositionMarkerContent,
-          offset: new AMap.Pixel(-15, -18)
+          offset: new AMap.Pixel(-34, -36)
         });
         this.map.add(this.newPositionMarker);
       })
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'), 'click', (event) => {
         this.map.clearMap();
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
-        if(this.markerPosition.x && this.markerPosition.x != 0){//说明之前标过点
+        if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点
           this.newPositionMarker = new AMap.Marker({
-            position: [this.markerPosition.x,this.markerPosition.y],
+            position: [this.markerPosition.x, this.markerPosition.y],
             content: this.newPositionMarkerContent,
-            offset: new AMap.Pixel(-15, -18)
+            offset: new AMap.Pixel(-34, -36)
           });
-          this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
+          this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
           this.map.add(this.newPositionMarker);
         }
       })//取消
-      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'touchstart',(event)=>{ 
+      this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'), 'touchstart', (event) => {
         this.map.clearMap();
         this.isGisTopBox = true
         this.isGisTopBoxTwo = false
-        if(this.markerPosition.x && this.markerPosition.x != 0){//说明之前标过点
+        if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点
           this.newPositionMarker = new AMap.Marker({
-            position: [this.markerPosition.x,this.markerPosition.y],
+            position: [this.markerPosition.x, this.markerPosition.y],
             content: this.newPositionMarkerContent,
-            offset: new AMap.Pixel(-15, -18)
+            offset: new AMap.Pixel(-34, -36)
           });
-          this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
+          this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
           this.map.add(this.newPositionMarker);
         }
       })//取消
     }
-    
 
 
-    
+
+
   }
 
 
@@ -396,11 +410,11 @@ export class BasicinfoComponent implements OnInit {
         this.allorganizing = data
         this.dataSource.data = this.tree.toTree(data);
         let _this = this
-        this.getunitinfo().then((e)=>{
-          if(this.unitinfo.location && (this.unitinfo.location.x != 0 && this.unitinfo.location.y != 0) ){//已标注
+        this.getunitinfo().then((e) => {
+          if (this.unitinfo.location && (this.unitinfo.location.x != 0 && this.unitinfo.location.y != 0)) {//已标注
             _this.isMapLabel = true
             _this.markerPosition = _this.unitinfo.location
-          }else{//未标注
+          } else {//未标注
             _this.isMapLabel = false
           }
           this.labelGis()
@@ -409,37 +423,37 @@ export class BasicinfoComponent implements OnInit {
     )
   }
   //获得当前单位的基本信息
-  async getunitinfo(){
+  async getunitinfo() {
     let result = await new Promise((resolve, reject) => {
-      this.http.get(`/api/Companies/${this.unitId}`).subscribe((data:any)=>{
-        if(data.buildingTypes.length){
-          sessionStorage.setItem('buildingTypeId',data.buildingTypes[0].id)
-        }else{
-          sessionStorage.setItem('buildingTypeId',"")
+      this.http.get(`/api/Companies/${this.unitId}`).subscribe((data: any) => {
+        if (data.buildingTypes.length) {
+          sessionStorage.setItem('buildingTypeId', data.buildingTypes[0].id)
+        } else {
+          sessionStorage.setItem('buildingTypeId', "")
         }
         let node
         this.allorganizing.forEach(item => {
-          if(item.id == data.organizationId){
+          if (item.id == data.organizationId) {
             node = item
           }
         });
-        if(node){
-          if(!node.parentId){
+        if (node) {
+          if (!node.parentId) {
             this.selectedorganization = node.name
-          }else{
+          } else {
             let namearr = [node.name]
             let targetId = node.parentId; // 临时变量
-            for(let i = 0; i < node.level ; i++){
+            for (let i = 0; i < node.level; i++) {
               this.allorganizing.forEach(item => {
-                if(item.id == targetId ){
-                  namearr.push(item.name) 
+                if (item.id == targetId) {
+                  namearr.push(item.name)
                   targetId = item.parentId; // 临时变量更新没有副作用
                 }
               });
             }
             namearr.reverse()
             let str = ''
-            namearr.forEach(item=>{
+            namearr.forEach(item => {
               str += '/' + item
             })
             this.selectedorganization = str.substr(1)
@@ -448,22 +462,24 @@ export class BasicinfoComponent implements OnInit {
         this.unitinfo = data
         resolve(this.unitinfo)
         this.selectedorganizationid = data.organizationId
-        if(data.imageUrl){
+        if (data.imageUrl) {
           this.imgsrc = data.imageUrl
         }
-        if(data.buildingTypes[0]){
+        if (data.buildingTypes[0]) {
           this.defaultbuildingTypes = data.buildingTypes[0].id
           this.buildingTypesname = data.buildingTypes[0].name
         }
-      }) 
+      })
     })
-    
+
   }
   //获得建筑自定义信息
-  getbuildingCustomData(){
-    this.http.get("/api/BuildingCustomData",{params:{
-      buildingId:this.houses[this.selectedBuildingIndex].id
-    }}).subscribe(data=>{
+  getbuildingCustomData() {
+    this.http.get("/api/BuildingCustomData", {
+      params: {
+        buildingId: this.houses[this.selectedBuildingIndex].id
+      }
+    }).subscribe(data => {
       this.buildingCustomData = data
     })
   }
@@ -472,11 +488,11 @@ export class BasicinfoComponent implements OnInit {
   addhouseinfo() {
     const dialogRef = this.dialog.open(AddHouseInfo, {//调用open方法打开对话框并且携带参数过去
       width: '260px',
-      data: {unitinfo:this.unitinfo,unitId:this.unitId}
+      data: { unitinfo: this.unitinfo, unitId: this.unitId }
     });
     dialogRef.afterClosed().subscribe(
-    async data => {
-        if(data){
+      async data => {
+        if (data) {
           this.houses.push(data)
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
         }
@@ -484,21 +500,21 @@ export class BasicinfoComponent implements OnInit {
     );
   }
   //获得建筑的全部信息放到对应houses数组的建筑中
-  selectedBuildingIndex:number = 0
-  getBuildingInfo(){
+  selectedBuildingIndex: number = 0
+  getBuildingInfo() {
     this.unitId = this.route.snapshot.queryParams.id
-    this.http.get("/api/BuildingBasicInfos",{ // 循环请求当前单位建筑每一个建筑的信息保存到数组中
-      params:{
-        companyId :this.unitId,
-        buildingId:this.houses[this.selectedBuildingIndex].id,
-        buildingType:this.houses[this.selectedBuildingIndex].buildingTypes[0].id
+    this.http.get("/api/BuildingBasicInfos", { // 循环请求当前单位建筑每一个建筑的信息保存到数组中
+      params: {
+        companyId: this.unitId,
+        buildingId: this.houses[this.selectedBuildingIndex].id,
+        buildingType: this.houses[this.selectedBuildingIndex].buildingTypes[0].id
       }
-    }).subscribe((data)=>{
+    }).subscribe((data) => {
       // console.log('当前选择建筑的基础信息',data)
       //需要处理一下表格信息
       data[0].buildingBasicGroups.forEach(element => {
-         //需要处理一下表格信息
-        if(element.type == 1){
+        //需要处理一下表格信息
+        if (element.type == 1) {
           let afterData = []
           let tempArr = [];
           for (let i = 0; i < element.propertyInfos.length; i++) {
@@ -518,61 +534,63 @@ export class BasicinfoComponent implements OnInit {
               }
             }
           }
-          function compare(property){
-            return function(a,b){
-                var value1 = a[property];
-                var value2 = b[property];
-                return value1 - value2;
+          function compare(property) {
+            return function (a, b) {
+              var value1 = a[property];
+              var value2 = b[property];
+              return value1 - value2;
             }
           }
-          afterData.forEach(item =>{
+          afterData.forEach(item => {
             item.origin = item.origin.sort(compare('order'))
           })
           element.propertyInfos = afterData.sort(compare('tag'))
           // console.log(afterData,888);
         }
       });
-      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
       function transferFn(arr) {
-        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
-        
+        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
+
         const guanquList = arr.slice(guanquIndex); // 灌区的列表
         const baseList = arr.slice(0, guanquIndex); // 前面的数据
         const len = guanquList.length;
-        const num = len/2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
+        const num = len / 2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
         // 灌区切割出来的数据，分别存放，最后做一下合并
         const array1 = [];
         const array2 = [];
-        for(let i = 0; i<num; i++) {
-            array1.push(guanquList[i]); // 灌区x
-            array2.push(guanquList[i + num]); // 灌区x/储罐信息
+        for (let i = 0; i < num; i++) {
+          array1.push(guanquList[i]); // 灌区x
+          array2.push(guanquList[i + num]); // 灌区x/储罐信息
         }
         // 拼接最后的数据
         const result = [...baseList];
-        for(let i = 0, ll = array1.length; i < ll; i++){
-            result.push(array1[i]);
-            if (array2[i]) {
-                result.push(array2[i]);
-            }
+        for (let i = 0, ll = array1.length; i < ll; i++) {
+          result.push(array1[i]);
+          if (array2[i]) {
+            result.push(array2[i]);
+          }
         }
         return result;
       }
-      if(guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1){
+      if (guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1) {
         data[0].buildingBasicGroups = transferFn(data[0].buildingBasicGroups)
       }
       this.houses[this.selectedBuildingIndex].data = data
       //获得自定义信息
-      this.http.get("/api/BuildingCustomData",{params:{ //-----处理建筑自定义属性部分
-        buildingId:this.houses[this.selectedBuildingIndex].id
-        }}).subscribe((data:any)=>{
-        if(data && data.customProperties.length != 0){
-          this.houses[this.selectedBuildingIndex].customData = data 
+      this.http.get("/api/BuildingCustomData", {
+        params: { //-----处理建筑自定义属性部分
+          buildingId: this.houses[this.selectedBuildingIndex].id
+        }
+      }).subscribe((data: any) => {
+        if (data && data.customProperties.length != 0) {
+          this.houses[this.selectedBuildingIndex].customData = data
           this.houses[this.selectedBuildingIndex].isCustomData = true
-        }else{
+        } else {
           this.houses[this.selectedBuildingIndex].isCustomData = false
           this.houses[this.selectedBuildingIndex].customData = {
             id: "",
-            customProperties: [{name:'',value:''}],
+            customProperties: [{ name: '', value: '' }],
             buildingId: this.houses[this.selectedBuildingIndex].id
           }
         }
@@ -580,18 +598,18 @@ export class BasicinfoComponent implements OnInit {
     })
   }
   //点击选项卡
-  selectedTabChange(e){
+  selectedTabChange(e) {
     // console.log(e)
     this.selectedBuildingIndex = e.index
-    if(this.houses.length != 0){
-      if((this.houses[this.selectedBuildingIndex].data && !this.houses[this.selectedBuildingIndex].data.length) || !this.houses[this.selectedBuildingIndex].data){
+    if (this.houses.length != 0) {
+      if ((this.houses[this.selectedBuildingIndex].data && !this.houses[this.selectedBuildingIndex].data.length) || !this.houses[this.selectedBuildingIndex].data) {
         this.getBuildingInfo()
       }
     }
-    
+
   }
   //表格加一行
-  addline(ele){
+  addline(ele) {
     let newObj = JSON.parse(JSON.stringify(ele[0]))
     for (let index = 0; index < newObj.origin.length; index++) {
       const element = newObj.origin[index];
@@ -602,31 +620,31 @@ export class BasicinfoComponent implements OnInit {
     ele.push(newObj)
   }
   //表格减一行
-  removeline(ele){
-    if(ele.length>1){
+  removeline(ele) {
+    if (ele.length > 1) {
       ele.pop()
-    }else{
+    } else {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('只剩一行，无法删除','确定',config);
+      this.snackBar.open('只剩一行，无法删除', '确定', config);
     }
   }
   //建筑自定义信息加一行
-  addCustomData(item){
+  addCustomData(item) {
     item.customData.customProperties.push({
-      name:'',
-      value:''
+      name: '',
+      value: ''
     })
   }
   //建筑自定义信息减一行
-  popCustomData(item){
+  popCustomData(item) {
     item.customData.customProperties.pop()
   }
   //储罐加一组
-  addTankBox(item,groupsIndex){
+  addTankBox(item, groupsIndex) {
     //取出现在最后一个罐区的数字
-    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig,"")
+    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig, "")
     let obj1 = JSON.parse(JSON.stringify(item.data[0].buildingBasicGroups[groupsIndex]))
     let obj2 = JSON.parse(JSON.stringify(item.data[0].buildingBasicGroups[groupsIndex + 1]))
     obj1.name = '罐区' + (Number(num) + 1)
@@ -645,33 +663,33 @@ export class BasicinfoComponent implements OnInit {
     // console.log(item.data[0].buildingBasicGroups)
   }
   //储罐减一组
-  removeTankBox(item,groupsIndex){
-    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig,"")
-    if(num != 1){
+  removeTankBox(item, groupsIndex) {
+    let num = (item.data[0].buildingBasicGroups[item.data[0].buildingBasicGroups.length - 1].name).replace(/[^0-9]/ig, "")
+    if (num != 1) {
       var isdeleted = confirm("确定要删除末尾储罐分组吗？")
-      if(isdeleted){
+      if (isdeleted) {
         item.data[0].buildingBasicGroups.pop()
         item.data[0].buildingBasicGroups.pop()
-      } 
-    }else{
+      }
+    } else {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('只剩唯一储罐，无法删除','确定',config);
+      this.snackBar.open('只剩唯一储罐，无法删除', '确定', config);
     }
   }
-  FunData(e){//切割数组
+  FunData(e) {//切割数组
     let proportion = 2; //按照比例切割
     let num = 0;
-    let _data =[];
-    for(let i=0;i<e.length;i++){
-        if(i % proportion == 0 && i != 0){
-            _data.push(e.slice(num,i));
-            num = i;
-        }
-        if((i+1)==e.length){
-            _data.push(e.slice(num,(i+1)));
-        }
+    let _data = [];
+    for (let i = 0; i < e.length; i++) {
+      if (i % proportion == 0 && i != 0) {
+        _data.push(e.slice(num, i));
+        num = i;
+      }
+      if ((i + 1) == e.length) {
+        _data.push(e.slice(num, (i + 1)));
+      }
     }
     return _data;
   }
@@ -682,25 +700,25 @@ export class BasicinfoComponent implements OnInit {
     this.selectedorganizationid = node.id
     this.isorganizationbox = false
 
-    if(!node.parentId){
+    if (!node.parentId) {
       this.selectedorganization = node.name
-    }else{
+    } else {
       let namearr = [node.name]
       let targetId = node.parentId; // 临时变量
-      for(let i = 0; i < node.level ; i++){
+      for (let i = 0; i < node.level; i++) {
         this.allorganizing.forEach(item => {
-          if(item.id == targetId ){
-            namearr.push(item.name) 
+          if (item.id == targetId) {
+            namearr.push(item.name)
             targetId = item.parentId; // 临时变量更新没有副作用
           }
         });
       }
       namearr.reverse()
       let str = ''
-      namearr.forEach(item=>{
+      namearr.forEach(item => {
         str += '/' + item
       })
-      
+
       this.selectedorganization = str.substr(1)
     }
   }
@@ -714,66 +732,66 @@ export class BasicinfoComponent implements OnInit {
   }
 
   hasChild = (_: number, node: any) => node.expandable;
-  
+
   imgsrc = "" //没有上传图片时显示的图片，当上传后就会被替换，即保存时需要传的图片地址参数
   noImg = '../../../assets/images/upload.jpg'
   imgUrl = ""//返回来的图片地址后缀
   file: any; //上传的文件
   objectName: any; //上传对象名
   uploadId: any; //上传分块上传事件编号
-  isspinner:boolean=false //控制进度圈的显示隐藏
+  isspinner: boolean = false //控制进度圈的显示隐藏
   PartNumberETag: any = []; //分块上传每次返回需要保存的信息
   //change选择文件
   filechange(e) {
     this.file = e.target.files[0] || null //上传的文件
     var reader = new FileReader();
     reader.readAsDataURL(this.file);
-    var image:any = new Image();
-    reader.onload = function(){
+    var image: any = new Image();
+    reader.onload = function () {
       image.src = reader.result
     }
     setTimeout(() => {
-      if(this.file.type.indexOf('image') == -1){
+      if (this.file.type.indexOf('image') == -1) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('请上传图片','确定',config);
-        if((<HTMLInputElement>document.getElementById('selectedfile'))){
+        this.snackBar.open('请上传图片', '确定', config);
+        if ((<HTMLInputElement>document.getElementById('selectedfile'))) {
           (<HTMLInputElement>document.getElementById('selectedfile')).value = null //清空input框缓存
         }
-      }else if(this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1){
+      } else if (this.file.name.toLowerCase().indexOf('png') == -1 && this.file.name.toLowerCase().indexOf('jpg') == -1 && this.file.name.toLowerCase().indexOf('jpeg') == -1) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件','确定',config);
-        if((<HTMLInputElement>document.getElementById('selectedfile'))){
+        this.snackBar.open('请上传图片后缀为png,jpg,jpeg的文件', '确定', config);
+        if ((<HTMLInputElement>document.getElementById('selectedfile'))) {
           (<HTMLInputElement>document.getElementById('selectedfile')).value = null //清空input框缓存
-        } 
-      }else if(image.width>=4096 || image.height>=5000 ){ 
+        }
+      } else if (image.width >= 4096 || image.height >= 5000) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('请选择分辨率小于4096*5000的图片','确定',config);
-        if((<HTMLInputElement>document.getElementById('selectedfile'))){
+        this.snackBar.open('请选择分辨率小于4096*5000的图片', '确定', config);
+        if ((<HTMLInputElement>document.getElementById('selectedfile'))) {
           (<HTMLInputElement>document.getElementById('selectedfile')).value = null //清空input框缓存
         }
-      }else{
-        if(this.file){
+      } else {
+        if (this.file) {
           this.startUploading()
         }
       }
-    
+
     }, 500);
-  } 
+  }
   //查看单位大图
-  lookmaster(){
+  lookmaster() {
     const dialogRef = this.dialog.open(LookMaster, {//调用open方法打开对话框并且携带参数过去
       width: '1600px',
-      height:'900px',
-      data: {img:this.imgsrc}
+      height: '900px',
+      data: { img: this.imgsrc }
     });
     dialogRef.afterClosed().subscribe(
-    
+
     );
   }
   //上传文件
@@ -786,15 +804,15 @@ export class BasicinfoComponent implements OnInit {
     if (file && fileSize <= shardSize) { //上传文件<=5MB时
       // this.upload()
       let formData = new FormData()
-      formData.append("file",file)
-      this.http.post(`/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`,formData).subscribe((data:any)=>{
+      formData.append("file", file)
+      this.http.post(`/api/Objects/PlanPlatform/${sessionStorage.getItem('companyId')}`, formData).subscribe((data: any) => {
         this.isspinner = false
         this.imgUrl = data.objectName
         this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传成功','确定',config);
+        this.snackBar.open('上传成功', '确定', config);
       })
     } else if (file && fileSize >= shardSize) { //上传文件>5MB时,分块上传
 
@@ -808,61 +826,61 @@ export class BasicinfoComponent implements OnInit {
   }
 
   //小于5MB不需要分块上传
-  upload(){
+  upload() {
     this.uploader.queue[0].upload();//开始上传
-    this.uploader.queue[0].onSuccess = (response, status, headers) => {    
+    this.uploader.queue[0].onSuccess = (response, status, headers) => {
       // 上传文件成功   
       if (status == 201) {
-          // 上传文件后获取服务器返回的数据
+        // 上传文件后获取服务器返回的数据
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传成功','确定',config);
+        this.snackBar.open('上传成功', '确定', config);
         this.isspinner = false
         let tempRes = JSON.parse(response);
-        this.imgUrl = tempRes.objectName  
+        this.imgUrl = tempRes.objectName
         this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
-      }else {            
-          // 上传文件后获取服务器返回的数据错误        
+      } else {
+        // 上传文件后获取服务器返回的数据错误        
       }
     };
-    this.uploader.queue[0].onError = (response, status, headers) => {    
+    this.uploader.queue[0].onError = (response, status, headers) => {
       if (status == 401) {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传失败','确定',config);
+        this.snackBar.open('上传失败', '确定', config);
       }
     };
   }
 
   //开始分块上传
-  async subsectionUploading () {
+  async subsectionUploading() {
     let file = this.file || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
     let shardSize = 5 * 1024 * 1024 //5MB一个分片
     let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
 
-    for (let i = 0;i < allSlice;i++) { //循环分段上传
+    for (let i = 0; i < allSlice; i++) { //循环分段上传
       let start = i * shardSize //切割文件开始位置
       let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
       let formData = new FormData()
-      formData.append("file",file.slice(start, end))
+      formData.append("file", file.slice(start, end))
 
       // 同步写法实现异步调用
       let result = await new Promise((resolve, reject) => {
-          // await 需要后面返回一个 promise 对象
-          this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{
-              let msg = {
-                  "partNumber":data.partNumber || null,
-                  "eTag": data.eTag || null
-              }
-              resolve(msg) // 调用 promise 内置方法处理成功
-          })
+        // await 需要后面返回一个 promise 对象
+        this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
+          let msg = {
+            "partNumber": data.partNumber || null,
+            "eTag": data.eTag || null
+          }
+          resolve(msg) // 调用 promise 内置方法处理成功
+        })
       });
       this.PartNumberETag.push(result)
       if (this.PartNumberETag.length === allSlice) {
-          this.endUploading()
+        this.endUploading()
       }
     }
   }
@@ -879,19 +897,19 @@ export class BasicinfoComponent implements OnInit {
   }
   //删除具体建筑
   selectedIndex
-  deletedbuilding(item,key){
+  deletedbuilding(item, key) {
     // console.log(item)
     var isdeleted = confirm("确定要删除此建筑吗？")
-    if(isdeleted){
+    if (isdeleted) {
       // console.log(key)
       // 请求删除接口
-      this.http.delete(`/api/Buildings/${item.id}`).subscribe(data=>{
+      this.http.delete(`/api/Buildings/${item.id}`).subscribe(data => {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('删除成功','确定',config);
-        this.houses.splice(this.houses.findIndex(items=>items==item),1) 
-        let obj ={index:key}
+        this.snackBar.open('删除成功', '确定', config);
+        this.houses.splice(this.houses.findIndex(items => items == item), 1)
+        let obj = { index: key }
         this.selectedTabChange(obj)
         this.tabbarService.sendMessage('changeScore');//通知服务改变分数
       })
@@ -899,15 +917,15 @@ export class BasicinfoComponent implements OnInit {
   }
 
   //提交单位基本信息
-  onSubmit(value,invalid,form) {
-    if(invalid){
+  onSubmit(value, invalid, form) {
+    if (invalid) {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('请填写必填项','确定',config);
-    }else{
-      sessionStorage.setItem('buildingTypeId',value.unittype)
-      let time =new Date()
+      this.snackBar.open('请填写必填项', '确定', config);
+    } else {
+      sessionStorage.setItem('buildingTypeId', value.unittype)
+      let time = new Date()
       let body = {
         id: this.unitinfo.id,
         name: this.unitinfo.name,
@@ -927,13 +945,13 @@ export class BasicinfoComponent implements OnInit {
           }
         ]
       }
-      this.http.put(`/api/Companies/${this.unitId}`,body).subscribe((data:any)=>{ //修改单位基本信息
+      this.http.put(`/api/Companies/${this.unitId}`, body).subscribe((data: any) => { //修改单位基本信息
         // this.getunitinfo()
-        if(!this.houses.length){
+        if (!this.houses.length) {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('单位基本信息保存成功，请填写单位建筑模板信息','确定',config);
+          this.snackBar.open('单位基本信息保存成功，请填写单位建筑模板信息', '确定', config);
           // alert("单位基本信息保存成功，请填写单位建筑模板信息")
           let addbody = {             //请求创建单位基本信息成功后  直接创建出一个主体建筑模板
             id: "",//即将要生成具体建筑的id
@@ -948,72 +966,74 @@ export class BasicinfoComponent implements OnInit {
               }
             ]
           }
-          this.http.post("/api/Buildings",addbody,{params:{
-            companyId : this.unitId
-          }}).subscribe(data=>{//首先创建建筑成功了，需要刷出当前建筑类型的模板
+          this.http.post("/api/Buildings", addbody, {
+            params: {
+              companyId: this.unitId
+            }
+          }).subscribe(data => {//首先创建建筑成功了，需要刷出当前建筑类型的模板
             // alert('创建主体建筑成功')
             this.tabbarService.sendMessage('changeScore');//通知服务改变分数
             this.getUnitAllBuildings()
           })
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
-        }else{
+        } else {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('保存成功','确定',config);
+          this.snackBar.open('保存成功', '确定', config);
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
         }
       }),
-        err=>{
+        err => {
           const config = new MatSnackBarConfig();
           config.verticalPosition = 'top';
           config.duration = 3000
-          this.snackBar.open('请填写正确信息','确定',config);
+          this.snackBar.open('请填写正确信息', '确定', config);
         }
-      }
+    }
+
 
-    
   }
-  selected:any
+  selected: any
 
-  isshowrule:boolean = false
-  rulevalue:any
-  inputchange(e,name,value,item){
-    if(name == "≥"){
-      if(Number(e.target.value)< Number(value)){
+  isshowrule: boolean = false
+  rulevalue: any
+  inputchange(e, name, value, item) {
+    if (name == "≥") {
+      if (Number(e.target.value) < Number(value)) {
         item.isshowrule = true
         item.rulevalue = `请输入≥${value}的值`
-      }else{
+      } else {
         item.isshowrule = false
       }
     }
-    if(name == "≤"){
-      if(Number(e.target.value) > Number(value)){
+    if (name == "≤") {
+      if (Number(e.target.value) > Number(value)) {
         item.isshowrule = true
         item.rulevalue = `请输入≤${value}的值`
-      }else{
+      } else {
         item.isshowrule = false
       }
     }
-    if(name == "Range"){
+    if (name == "Range") {
       let rangenum = value.split(",")
       // console.log(rangenum)
-      if(Number(e.target.value) < Number(rangenum[0]) ||  Number(e.target.value) >= Number(rangenum[1])){
+      if (Number(e.target.value) < Number(rangenum[0]) || Number(e.target.value) >= Number(rangenum[1])) {
         item.isshowrule = true
-        item.rulevalue = `请输入位于${Number(rangenum[0])}和${Number(rangenum[1])-1}之间的值`
-      }else{
+        item.rulevalue = `请输入位于${Number(rangenum[0])}和${Number(rangenum[1]) - 1}之间的值`
+      } else {
         item.isshowrule = false
       }
     }
   }
 
   //可选按钮
-  checkboxChange(item,$event,buildingData){
+  checkboxChange(item, $event, buildingData) {
     // console.log(item)
-    if(item.name == '罐区1'){
+    if (item.name == '罐区1') {
       // console.log(buildingData)
       buildingData.data[0].buildingBasicGroups.forEach(element => {
-        if(element.name.indexOf('罐区') != -1){
+        if (element.name.indexOf('罐区') != -1) {
           element.submitted = item.submitted
         }
       });
@@ -1021,29 +1041,29 @@ export class BasicinfoComponent implements OnInit {
   }
 
   //建筑自定义信息按钮
-  checkCustomData($event){
+  checkCustomData($event) {
 
   }
 
-  
+
   //提交建筑信息
-  onSubmitBuildingInfo(value,item,key,invalid){
+  onSubmitBuildingInfo(value, item, key, invalid) {
     // console.log(1,item)
     // console.log(2,invalid)
     // console.log(3,value)
     // console.log(4,this.allunittype)
-    if(invalid){
+    if (invalid) {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('请填写必填项','确定',config);
-    }else {
+      this.snackBar.open('请填写必填项', '确定', config);
+    } else {
       //先把名称和建筑类型单独修改
       let buildingTypeId
       this.allunittype.forEach(element => {
         element.name == item.buildingTypes[0].name ? buildingTypeId = element.id : null
       });
-      this.http.put(`/api/Buildings/${item.id}`,{         //(通用)只修改建筑名称和建筑类型
+      this.http.put(`/api/Buildings/${item.id}`, {         //(通用)只修改建筑名称和建筑类型
         id: item.id,
         name: value.buildingName,
         order: this.houses[key].order,
@@ -1055,42 +1075,42 @@ export class BasicinfoComponent implements OnInit {
             name: item.buildingTypes[0].name
           }
         ]
-      },{
-        params:{
-          companyId : this.unitId
+      }, {
+        params: {
+          companyId: this.unitId
         }
-      }).subscribe((data:any)=>{    
+      }).subscribe((data: any) => {
         // alert("名称和类型保存成功")
       },
-      err=>{
-        alert("名称和类型保存失败")
-      })
+        err => {
+          alert("名称和类型保存失败")
+        })
 
       let newbody = JSON.parse(JSON.stringify(item.data))  //把数据深拷贝取出来进行操作
       for (let index = 0; index < newbody[0].buildingBasicGroups.length; index++) {
         let element = newbody[0].buildingBasicGroups[index];
         element.propertyInfos.forEach(item => {
-          if(!element.isOptional){
+          if (!element.isOptional) {
             item.propertyValue ? element.submitted = true : null
           }
           //删除规则验证标识
           item.isshowrule ? delete item.isshowrule : null
           item.rulevalue ? delete item.rulevalue : null
-          if(item.propertyValue || item.propertyValue == 0){
-            item.propertyValue = String(item.propertyValue) 
+          if (item.propertyValue || item.propertyValue == 0) {
+            item.propertyValue = String(item.propertyValue)
           }
         });
         //如果是表格需要转换为一维数组
-        if(element.type == 1){
+        if (element.type == 1) {
           let arr = []
           for (let index = 0; index < element.propertyInfos.length; index++) {
             const ele = element.propertyInfos[index];
-            
+
             for (let index = 0; index < ele.origin.length; index++) {
               const i = ele.origin[index];
-              i.tag = String(i.tag) 
-              
-              if(!element.isOptional){
+              i.tag = String(i.tag)
+
+              if (!element.isOptional) {
                 i.propertyValue ? element.submitted = true : null
               }
               arr.push(i)
@@ -1103,7 +1123,7 @@ export class BasicinfoComponent implements OnInit {
           element.propertyInfos = arr
         }
         //如果当前分组没勾选 则需先去重然后重置每一个value为空  （基本信息默认都是不可选的 所以不需要清空值）
-        if(!element.submitted && element.name != '基本信息'){
+        if (!element.submitted && element.name != '基本信息') {
           const res = new Map();
           element.propertyInfos = element.propertyInfos.filter((a) => !res.has(a.propertyName) && res.set(a.propertyName, 1))
           element.propertyInfos.forEach(ele => {
@@ -1111,111 +1131,115 @@ export class BasicinfoComponent implements OnInit {
           })
         }
         //如果灌区没勾选  并且包含罐区且不包含罐区1的清除  需要把多余罐区2 3 4清除掉再提交
-        if(!element.submitted && element.name.indexOf('罐区1') == -1 && element.name.indexOf('罐区') != -1){
-          newbody[0].buildingBasicGroups.splice(index--, 1); 
+        if (!element.submitted && element.name.indexOf('罐区1') == -1 && element.name.indexOf('罐区') != -1) {
+          newbody[0].buildingBasicGroups.splice(index--, 1);
         }
       }
       // console.log('newbody',newbody)
-      this.http.post("/api/BuildingBasicInfos",newbody,{
-        params:{
-          companyId : this.unitId,
-          buildingId :newbody[0].buildingId
+      this.http.post("/api/BuildingBasicInfos", newbody, {
+        params: {
+          companyId: this.unitId,
+          buildingId: newbody[0].buildingId
         }
-      }).subscribe((data:any)=>{
+      }).subscribe((data: any) => {
         // this.houses[key].id = data[0].id
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('建筑信息保存成功','确定',config);
+        this.snackBar.open('建筑信息保存成功', '确定', config);
         this.tabbarService.sendMessage('changeScore');//通知服务改变分数
       },
-      err=>{
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open('建筑信息保存失败','确定',config);
-        this.tabbarService.sendMessage('changeScore');//通知服务改变分数
-      })
-      
+        err => {
+          const config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('建筑信息保存失败', '确定', config);
+          this.tabbarService.sendMessage('changeScore');//通知服务改变分数
+        })
+
       //保存建筑自定义信息
-      if(item.isCustomData){
-        this.http.post("/api/BuildingCustomData",item.customData,{params:{
-          companyId :this.unitId,
-          buildingId:item.id
-        }}).subscribe(data=>{
+      if (item.isCustomData) {
+        this.http.post("/api/BuildingCustomData", item.customData, {
+          params: {
+            companyId: this.unitId,
+            buildingId: item.id
+          }
+        }).subscribe(data => {
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
         })
-      }else{
+      } else {
         item.customData.customProperties = []
-        this.http.post("/api/BuildingCustomData",item.customData,{params:{
-          companyId :this.unitId,
-          buildingId:item.id
-        }}).subscribe(data=>{
+        this.http.post("/api/BuildingCustomData", item.customData, {
+          params: {
+            companyId: this.unitId,
+            buildingId: item.id
+          }
+        }).subscribe(data => {
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
         })
       }
-      
+
     }
   }
   //更改模板类型
-  templateBuildtype(n,item,key){
-    this.http.get("/api/BuildingBasicInfos",{//请求当前建筑类型的模板信息保存到数组中
-      params:{
-        companyId :this.unitId,
-        buildingId:item.id,
-        buildingType:n.id
+  templateBuildtype(n, item, key) {
+    this.http.get("/api/BuildingBasicInfos", {//请求当前建筑类型的模板信息保存到数组中
+      params: {
+        companyId: this.unitId,
+        buildingId: item.id,
+        buildingType: n.id
       }
-    }).subscribe(data=>{
+    }).subscribe(data => {
       data[0].buildingBasicGroups.forEach(element => {
         //需要处理一下表格信息
-       if(element.type == 1){
-         let afterData = []
-         let tempArr = [];
-         for (let i = 0; i < element.propertyInfos.length; i++) {
-           element.propertyInfos[i].tag == '' ? element.propertyInfos[i].tag = 1 : null
-           if (tempArr.indexOf(element.propertyInfos[i].tag) === -1) {
-             afterData.push({
-               tag: element.propertyInfos[i].tag,
-               origin: [element.propertyInfos[i]]
-             });
-             tempArr.push(element.propertyInfos[i].tag);
-           } else {
-             for (let j = 0; j < afterData.length; j++) {
-               if (afterData[j].tag == element.propertyInfos[i].tag) {
-                 afterData[j].origin.push(element.propertyInfos[i]);
-                 break;
-               }
-             }
-           }
-         }
-         element.propertyInfos = afterData
-       }
+        if (element.type == 1) {
+          let afterData = []
+          let tempArr = [];
+          for (let i = 0; i < element.propertyInfos.length; i++) {
+            element.propertyInfos[i].tag == '' ? element.propertyInfos[i].tag = 1 : null
+            if (tempArr.indexOf(element.propertyInfos[i].tag) === -1) {
+              afterData.push({
+                tag: element.propertyInfos[i].tag,
+                origin: [element.propertyInfos[i]]
+              });
+              tempArr.push(element.propertyInfos[i].tag);
+            } else {
+              for (let j = 0; j < afterData.length; j++) {
+                if (afterData[j].tag == element.propertyInfos[i].tag) {
+                  afterData[j].origin.push(element.propertyInfos[i]);
+                  break;
+                }
+              }
+            }
+          }
+          element.propertyInfos = afterData
+        }
       });
-      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+      let guanquIndex = data[0].buildingBasicGroups.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
       function transferFn(arr) {
-        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区')>=0); // 找到第一个灌区的索引
+        const guanquIndex = arr.findIndex(item => item.name.indexOf('罐区') >= 0); // 找到第一个灌区的索引
         const guanquList = arr.slice(guanquIndex); // 灌区的列表
         const baseList = arr.slice(0, guanquIndex); // 前面的数据
         const len = guanquList.length;
-        const num = len/2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
+        const num = len / 2; // 计算一共有多少对，这里的前提是数据本身必须成对出现
         // 灌区切割出来的数据，分别存放，最后做一下合并
         const array1 = [];
         const array2 = [];
-        for(let i = 0; i<num; i++) {
-            array1.push(guanquList[i]); // 灌区x
-            array2.push(guanquList[i + num]); // 灌区x/储罐信息
+        for (let i = 0; i < num; i++) {
+          array1.push(guanquList[i]); // 灌区x
+          array2.push(guanquList[i + num]); // 灌区x/储罐信息
         }
         // 拼接最后的数据
         const result = [...baseList];
-        for(let i = 0, ll = array1.length; i < ll; i++){
-            result.push(array1[i]);
-            if (array2[i]) {
-                result.push(array2[i]);
-            }
+        for (let i = 0, ll = array1.length; i < ll; i++) {
+          result.push(array1[i]);
+          if (array2[i]) {
+            result.push(array2[i]);
+          }
         }
         return result;
       }
-      if(guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1){
+      if (guanquIndex != -1 && data[0].buildingBasicGroups[guanquIndex + 1].name.indexOf(data[0].buildingBasicGroups[guanquIndex].name) == -1) {
         data[0].buildingBasicGroups = transferFn(data[0].buildingBasicGroups)
       }
       this.houses[key].data = data
@@ -1233,11 +1257,11 @@ export class BasicinfoComponent implements OnInit {
 })
 export class StatisticsOfFireFightingFacilities implements OnInit {
 
-  constructor(private http: HttpClient, public dialog: MatDialog,public snackBar: MatSnackBar) { }
+  constructor(private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    let params = { companyId: sessionStorage.getItem('companyId'),buildingType: sessionStorage.getItem('buildingTypeId') }
-    this.http.get(`/api/CompanyFacilities/GetAllFacilities`,{params}).subscribe(data=>{
+    let params = { companyId: sessionStorage.getItem('companyId'), buildingType: sessionStorage.getItem('buildingTypeId') }
+    this.http.get(`/api/CompanyFacilities/GetAllFacilities`, { params }).subscribe(data => {
       Object.keys(data).forEach(key => { this.allFireList.push(`${key}   ${data[key]}`) })
     })
   }
diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts
index db6b376..500edd3 100644
--- a/src/app/key-unit/key-unit.module.ts
+++ b/src/app/key-unit/key-unit.module.ts
@@ -83,10 +83,11 @@ import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.comp
 import { KnowRouteComponent } from './know-route/know-route.component';
 import { FindProblemComponent } from './find-problem/find-problem.component';
 import { upname } from './key-unit-management/key-unit-management.component';
-import { companyAuditResult } from './key-unit-management/key-unit-management.component'
+import { companyAuditResult } from './key-unit-management/key-unit-management.component';
+import { SpecialWarningComponent } from './special-warning/special-warning.component'
 
 @NgModule({
-  declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult,StatisticsOfFireFightingFacilities],
+  declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult,StatisticsOfFireFightingFacilities, SpecialWarningComponent],
   exports:[ViewUnitDetailsPlanComponent],
   imports: [
     CommonModule,
diff --git a/src/app/key-unit/special-warning/special-warning.component.html b/src/app/key-unit/special-warning/special-warning.component.html
new file mode 100644
index 0000000..29135d1
--- /dev/null
+++ b/src/app/key-unit/special-warning/special-warning.component.html
@@ -0,0 +1,17 @@
+<div class="bigbox">
+    <div class="itembox" *ngFor="let item of specialWarningData;let key = index">
+        <div class="title">
+            <input [(ngModel)]="item.name" type="text" name="" id="" placeholder="请输入名称(可编辑)">
+            <div class="deletebtn" *ngIf="key == specialWarningData.length - 1">
+                <mat-icon (click)="deleteItem()">delete</mat-icon>
+            </div>
+        </div>
+        <div class="contant">
+            <textarea [(ngModel)]="item.content" name="" id="" cols="30" rows="10"></textarea>
+        </div>
+    </div>
+    <div class="bottombox" >
+        <button mat-flat-button color="primary" (click)="addItem()">新增</button>
+    </div>
+    <button class="savebtn" (click)="save()" mat-stroked-button color="primary">保存</button>
+</div>
\ No newline at end of file
diff --git a/src/app/key-unit/special-warning/special-warning.component.scss b/src/app/key-unit/special-warning/special-warning.component.scss
new file mode 100644
index 0000000..b9bd037
--- /dev/null
+++ b/src/app/key-unit/special-warning/special-warning.component.scss
@@ -0,0 +1,64 @@
+.bigbox {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    padding-top: 72px;
+    overflow-y: auto;
+    position: relative;
+    input,
+    textarea {
+        border: 0px;
+    }
+    .itembox {
+        margin: 0 auto;
+        width: 70%;
+        height: 330px;
+        border: 1px solid rgba(0, 0, 0, 0.122);
+        display: flex;
+        flex-direction: column;
+        margin-bottom: 12px;
+        .title {
+            width: 100%;
+            height: 36px;
+            border-bottom: 1px solid rgba(0, 0, 0, 0.122);
+            display: flex;
+            input {
+                flex: 1;
+                height: 100%;
+                box-sizing: border-box; //其他浏览器
+                -webkit-box-sizing: border-box; //谷歌
+                -moz-box-sizing: border-box; //火狐
+                padding-left: 6px;
+            }
+            .deletebtn {
+                line-height: 50px;
+                cursor: pointer;
+                background: #fff;
+            }
+        }
+        .contant {
+            display: flex;
+            width: 100%;
+            flex: 1;
+            textarea {
+                flex: 1;
+                overflow-y: auto;
+                resize: none;
+                background: #fafafa;
+                -webkit-box-sizing: border-box; //谷歌
+                -moz-box-sizing: border-box; //火狐
+                padding: 6px;
+            }
+        }
+    }
+    .bottombox {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+    }
+    .savebtn{
+        position: fixed;
+        right: 5%;
+        top: 125px;
+    }
+}
diff --git a/src/app/key-unit/special-warning/special-warning.component.spec.ts b/src/app/key-unit/special-warning/special-warning.component.spec.ts
new file mode 100644
index 0000000..5eb2264
--- /dev/null
+++ b/src/app/key-unit/special-warning/special-warning.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SpecialWarningComponent } from './special-warning.component';
+
+describe('SpecialWarningComponent', () => {
+  let component: SpecialWarningComponent;
+  let fixture: ComponentFixture<SpecialWarningComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SpecialWarningComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SpecialWarningComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/key-unit/special-warning/special-warning.component.ts b/src/app/key-unit/special-warning/special-warning.component.ts
new file mode 100644
index 0000000..4d18740
--- /dev/null
+++ b/src/app/key-unit/special-warning/special-warning.component.ts
@@ -0,0 +1,64 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-special-warning',
+  templateUrl: './special-warning.component.html',
+  styleUrls: ['./special-warning.component.scss']
+})
+export class SpecialWarningComponent implements OnInit {
+
+  constructor(public http:HttpClient) { }
+  
+
+  specialWarningData:Data[]//特别警示数据
+  ngOnInit(): void {
+    this.getSpecialWarning()
+  }
+
+  //获得单位特别警示
+  getSpecialWarning(){
+    this.http.get('/api/CompanySpecialWarnings',{params:{
+      companyId : sessionStorage.getItem('companyId')
+    }}).subscribe((data:Data[]) => {
+      if(data.length != 0){
+        this.specialWarningData = data
+      }else{
+        this.specialWarningData = [{name:'',content:''}]
+      }
+      console.log('特别警示数据',this.specialWarningData)
+    })
+  }
+
+  //新增item
+  addItem(){
+    this.specialWarningData.push({name:'',content:''})
+  }
+  //删除末尾item
+  deleteItem(){
+    let isTrue = window.confirm('确定要删除该分组吗？')
+    if(isTrue){
+      this.specialWarningData.pop()
+    }
+  }
+
+  save(){
+    console.log('保存',this.specialWarningData)
+    this.http.get('/api/CompanySpecialWarnings',{params:{
+      companyId : sessionStorage.getItem('companyId')
+    }}).subscribe((data:Data[]) => {
+      if(data.length != 0){
+        this.specialWarningData = data
+      }else{
+        this.specialWarningData = [{name:'',content:''}]
+      }
+      console.log('特别警示数据',this.specialWarningData)
+    })
+  }
+}
+
+//特别警示数据
+export interface Data {
+  name:string,
+  content:string
+}
\ No newline at end of file
diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.html b/src/app/key-unit/view-unit-details/view-unit-details.component.html
index b8a75a1..0a22559 100644
--- a/src/app/key-unit/view-unit-details/view-unit-details.component.html
+++ b/src/app/key-unit/view-unit-details/view-unit-details.component.html
@@ -1,14 +1,19 @@
 <div class="fixedPrompt">
-  <label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
+    <label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
 </div>
 <mat-tab-group style="height:100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+    <!-- <mat-tab label="12.特别警示">
+        <ng-template matTabContent>
+            <app-special-warning></app-special-warning>
+        </ng-template>
+    </mat-tab> -->
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo-look></app-basicinfo-look>
@@ -20,13 +25,13 @@
         </ng-template>
     </mat-tab>
     <mat-tab label="3.层平面图">
-      <ng-template matTabContent>
-        <app-collection-tools-building></app-collection-tools-building>
-      </ng-template>
+        <ng-template matTabContent>
+            <app-collection-tools-building></app-collection-tools-building>
+        </ng-template>
     </mat-tab>
     <mat-tab label="4.四周毗邻">
         <ng-template matTabContent>
-            <app-allaround></app-allaround>  
+            <app-allaround></app-allaround>
         </ng-template>
     </mat-tab>
     <mat-tab label="5.消防设施">
@@ -45,18 +50,18 @@
         </ng-template>
     </mat-tab>
     <mat-tab label="8.行车路线">
-      <ng-template matTabContent>
-         <app-router-gis></app-router-gis>
-      </ng-template>
+        <ng-template matTabContent>
+            <app-router-gis></app-router-gis>
+        </ng-template>
     </mat-tab>
     <mat-tab label="9.周边水源及力量">
         <ng-template matTabContent>
-          <app-water-road></app-water-road>
+            <app-water-road></app-water-road>
         </ng-template>
     </mat-tab>
     <mat-tab label="10.实景图">
         <ng-template matTabContent>
-           <app-realistic-picture-look></app-realistic-picture-look>
+            <app-realistic-picture-look></app-realistic-picture-look>
         </ng-template>
     </mat-tab>
     <mat-tab label="11.上传CAD">
@@ -69,5 +74,4 @@
         <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe>
       </ng-template>
     </mat-tab>  -->
-</mat-tab-group>
-
+</mat-tab-group>
\ No newline at end of file
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 160b076..c138d87 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -6,6 +6,8 @@ import {CacheTokenService} from '../../http-interceptors/cache-token.service'//
 import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar';
 import { MatDialog,MatDialogRef } from '@angular/material/dialog';
 
+
+
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html',
diff --git a/src/app/tabbar/tabbar.component.html b/src/app/tabbar/tabbar.component.html
index 0632811..52f8b93 100644
--- a/src/app/tabbar/tabbar.component.html
+++ b/src/app/tabbar/tabbar.component.html
@@ -3,14 +3,14 @@
     <h1 style="max-width: 240px;display: block;overflow: hidden;text-overflow: ellipsis;">{{title}} <span *ngIf="planName != null">: {{planName}}</span> </h1>
     <!--分数框-->
     <div class="grade" *ngIf="companyIntegrityScore" onmouseover="xiangqing.style.display='block';" onmouseout="xiangqing.style.display='none';">
-        <a class="active"><span ><a></a>{{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} 分</span></a>
+        <a class="active"><span ><a></a>{{(companyIntegrityScore.totalScore.toFixed(2) * 100).toFixed()}} %</span></a>
     </div>
 
     <div class="integrityDetails"  id="xiangqing" *ngIf="companyIntegrityScore">
       <div class="integrityDetailsTop">
           <span class="span1">分类名称</span>
           <span class="span2">已得分</span>
-          <span class="span3">总分</span>
+          <span class="span3">百分比</span>
       </div>
       <div class="integrityDetailsBody">
           <ul> 
diff --git a/src/styles.scss b/src/styles.scss
index 70aaa0a..c7e8d36 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -266,4 +266,60 @@ td{
 	  .custom-content-marker .close-btn:hover{
 		background: #666;
 	  }
+}
+
+#setUnitPosition,#setUnitPositionLook{
+	.custom-content-marker {
+		position: relative;
+		// border: 1px solid red;
+		width: 68px;
+		height: 68px;
+		overflow: hidden;
+		display: flex;
+		justify-content: center;
+		.positionimg {
+			width: 30px;
+			height: 36px;
+		}
+	}
+
+	.custom-content-marker .btnbox {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 68px;
+		height: 30px;
+		background: #ffffff;
+		border-radius: 60px;
+		color: #ebebeb;
+		display: flex;
+		justify-content: space-around;
+		box-sizing: border-box;
+		padding: 0 5px;
+		align-items: center;
+		img {
+			width: 20px;
+			height: 20px;
+			cursor: pointer;
+		}
+	}
+	.custom-content-marker .btnbox2 {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 68px;
+		height: 30px;
+		opacity: 0;
+		border-radius: 60px;
+		color: #ebebeb;
+		display: flex;
+		justify-content: space-around;
+		box-sizing: border-box;
+		padding: 0 5px;
+		align-items: center;
+	}
+
+	.custom-content-marker .close-btn:hover {
+		background: #666;
+	}
 }
\ No newline at end of file

From a311345b8551dbfb135e77461c49f08e095657f4 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 3 Jun 2021 11:35:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=89=B9=E5=88=AB?=
 =?UTF-8?q?=E8=AD=A6=E7=A4=BA=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit-plan-info.component.html             | 120 +++++++++---------
 .../special-warning.component.html            |   6 +-
 .../special-warning.component.ts              |  66 ++++++----
 .../view-unit-details.component.html          |  10 +-
 4 files changed, 108 insertions(+), 94 deletions(-)

diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
index 5443aac..1c41e4c 100644
--- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
+++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html
@@ -10,65 +10,69 @@
 </div>
 
 <mat-tab-group style="height: 100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
-    <mat-tab label="1.基本信息">
-        <ng-template matTabContent>
-            <app-basicinfo></app-basicinfo>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="2.总平面图">
-        <ng-template matTabContent>
-          <app-collection-tools-plan></app-collection-tools-plan>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="3.层平面图">
-      <ng-template matTabContent>
-        <app-collection-tools-building></app-collection-tools-building>
-      </ng-template>
-    </mat-tab>
-    <mat-tab label="4.四周毗邻">
-      <ng-template matTabContent>
-        <app-allaround></app-allaround>
-      </ng-template>
-    </mat-tab>
-    <mat-tab label="5.消防设施">
-      <ng-template matTabContent>
-        <app-fire-fighting-device></app-fire-fighting-device>
-      </ng-template>
-    </mat-tab>
-    <mat-tab label="6.重点部位">
-        <ng-template matTabContent>
-            <app-key-site></app-key-site>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="7.功能分区">
-        <ng-template matTabContent>
-           <app-function-division></app-function-division>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="8.行车路线">
-      <ng-template matTabContent>
-         <app-router-gis></app-router-gis>
-      </ng-template>
-    </mat-tab>
-    <mat-tab label="9.周边水源及力量">
-        <ng-template matTabContent>
-          <app-water-road></app-water-road>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="10.实景图">
-        <ng-template matTabContent>
-           <app-realistic-picture></app-realistic-picture>
-        </ng-template>
-    </mat-tab>
-    <mat-tab label="11.上传CAD">
-        <ng-template matTabContent>
-            <app-uploading-cad></app-uploading-cad>
-        </ng-template>
-    </mat-tab>
-    <!-- <mat-tab label="12.unity平面图">
+  <mat-tab label="1.基本信息">
+    <ng-template matTabContent>
+      <app-basicinfo></app-basicinfo>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="2.总平面图">
+    <ng-template matTabContent>
+      <app-collection-tools-plan></app-collection-tools-plan>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="3.层平面图">
+    <ng-template matTabContent>
+      <app-collection-tools-building></app-collection-tools-building>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="4.四周毗邻">
+    <ng-template matTabContent>
+      <app-allaround></app-allaround>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="5.消防设施">
+    <ng-template matTabContent>
+      <app-fire-fighting-device></app-fire-fighting-device>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="6.重点部位">
+    <ng-template matTabContent>
+      <app-key-site></app-key-site>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="7.功能分区">
+    <ng-template matTabContent>
+      <app-function-division></app-function-division>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="8.行车路线">
+    <ng-template matTabContent>
+      <app-router-gis></app-router-gis>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="9.周边水源及力量">
+    <ng-template matTabContent>
+      <app-water-road></app-water-road>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="10.实景图">
+    <ng-template matTabContent>
+      <app-realistic-picture></app-realistic-picture>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="11.上传CAD">
+    <ng-template matTabContent>
+      <app-uploading-cad></app-uploading-cad>
+    </ng-template>
+  </mat-tab>
+  <mat-tab label="12.特别警示">
+    <ng-template matTabContent>
+      <app-special-warning></app-special-warning>
+    </ng-template>
+  </mat-tab>
+  <!-- <mat-tab label="12.unity平面图">
       <ng-template matTabContent>
         <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left: 2%;"></iframe>
       </ng-template>
     </mat-tab> -->
-</mat-tab-group>
-
+</mat-tab-group>
\ No newline at end of file
diff --git a/src/app/key-unit/special-warning/special-warning.component.html b/src/app/key-unit/special-warning/special-warning.component.html
index 29135d1..fba6576 100644
--- a/src/app/key-unit/special-warning/special-warning.component.html
+++ b/src/app/key-unit/special-warning/special-warning.component.html
@@ -2,7 +2,7 @@
     <div class="itembox" *ngFor="let item of specialWarningData;let key = index">
         <div class="title">
             <input [(ngModel)]="item.name" type="text" name="" id="" placeholder="请输入名称(可编辑)">
-            <div class="deletebtn" *ngIf="key == specialWarningData.length - 1">
+            <div class="deletebtn" *ngIf="key == specialWarningData.length - 1 && specialWarningData.length != 1 && pattern == 'edit'">
                 <mat-icon (click)="deleteItem()">delete</mat-icon>
             </div>
         </div>
@@ -10,8 +10,8 @@
             <textarea [(ngModel)]="item.content" name="" id="" cols="30" rows="10"></textarea>
         </div>
     </div>
-    <div class="bottombox" >
+    <div class="bottombox" *ngIf="pattern == 'edit'">
         <button mat-flat-button color="primary" (click)="addItem()">新增</button>
     </div>
-    <button class="savebtn" (click)="save()" mat-stroked-button color="primary">保存</button>
+    <button *ngIf="pattern == 'edit'" class="savebtn" (click)="save()" mat-stroked-button color="primary">保存</button>
 </div>
\ No newline at end of file
diff --git a/src/app/key-unit/special-warning/special-warning.component.ts b/src/app/key-unit/special-warning/special-warning.component.ts
index 4d18740..0150e44 100644
--- a/src/app/key-unit/special-warning/special-warning.component.ts
+++ b/src/app/key-unit/special-warning/special-warning.component.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 
 @Component({
   selector: 'app-special-warning',
@@ -8,57 +9,66 @@ import { Component, OnInit } from '@angular/core';
 })
 export class SpecialWarningComponent implements OnInit {
 
-  constructor(public http:HttpClient) { }
-  
+  constructor(public http: HttpClient, public snackBar: MatSnackBar) { }
 
-  specialWarningData:Data[]//特别警示数据
+
+  specialWarningData: Data[]//特别警示数据
+  pattern: string//查看还是编辑
   ngOnInit(): void {
+    sessionStorage.getItem('editable') == '0' ? this.pattern = 'look' : this.pattern = 'edit'
     this.getSpecialWarning()
   }
 
   //获得单位特别警示
-  getSpecialWarning(){
-    this.http.get('/api/CompanySpecialWarnings',{params:{
-      companyId : sessionStorage.getItem('companyId')
-    }}).subscribe((data:Data[]) => {
-      if(data.length != 0){
+  getSpecialWarning() {
+    this.http.get('/api/CompanySpecialWarnings', {
+      params: {
+        companyId: sessionStorage.getItem('companyId')
+      }
+    }).subscribe((data: Data[]) => {
+      if (data.length != 0) {
         this.specialWarningData = data
-      }else{
-        this.specialWarningData = [{name:'',content:''}]
+      } else {
+        this.specialWarningData = [{ name: '', content: '' }]
       }
-      console.log('特别警示数据',this.specialWarningData)
+      console.log('特别警示数据', this.specialWarningData)
     })
   }
 
   //新增item
-  addItem(){
-    this.specialWarningData.push({name:'',content:''})
+  addItem() {
+    this.specialWarningData.push({ name: '', content: '' })
   }
   //删除末尾item
-  deleteItem(){
+  deleteItem() {
     let isTrue = window.confirm('确定要删除该分组吗？')
-    if(isTrue){
+    if (isTrue) {
       this.specialWarningData.pop()
     }
   }
-
-  save(){
-    console.log('保存',this.specialWarningData)
-    this.http.get('/api/CompanySpecialWarnings',{params:{
-      companyId : sessionStorage.getItem('companyId')
-    }}).subscribe((data:Data[]) => {
-      if(data.length != 0){
-        this.specialWarningData = data
-      }else{
-        this.specialWarningData = [{name:'',content:''}]
+  //保存
+  save() {
+    console.log('保存', this.specialWarningData)
+    this.http.put('/api/CompanySpecialWarnings', this.specialWarningData, {
+      params: {
+        companyId: sessionStorage.getItem('companyId')
       }
-      console.log('特别警示数据',this.specialWarningData)
+    }).subscribe((data) => {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('保存成功', '确定', config);
+    }, err => {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('保存失败', '确定', config);
     })
   }
 }
 
 //特别警示数据
 export interface Data {
-  name:string,
-  content:string
+  name: string,
+  content: string
 }
\ No newline at end of file
diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.html b/src/app/key-unit/view-unit-details/view-unit-details.component.html
index 0a22559..bb14cf9 100644
--- a/src/app/key-unit/view-unit-details/view-unit-details.component.html
+++ b/src/app/key-unit/view-unit-details/view-unit-details.component.html
@@ -9,11 +9,6 @@
     <label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
 </div>
 <mat-tab-group style="height:100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
-    <!-- <mat-tab label="12.特别警示">
-        <ng-template matTabContent>
-            <app-special-warning></app-special-warning>
-        </ng-template>
-    </mat-tab> -->
     <mat-tab label="1.基本信息">
         <ng-template matTabContent>
             <app-basicinfo-look></app-basicinfo-look>
@@ -69,6 +64,11 @@
             <app-uploading-cad-look></app-uploading-cad-look>
         </ng-template>
     </mat-tab>
+    <mat-tab label="12.特别警示">
+        <ng-template matTabContent>
+            <app-special-warning></app-special-warning>
+        </ng-template>
+    </mat-tab>
     <!-- <mat-tab label="12.unity平面图">
       <ng-template matTabContent>
         <iframe id="main" src="/unityApp2Basic/index.html" name="unityApp" frameborder="0" width="96%" height="100%" style="margin-left:2%;"></iframe>

From 0d7c476036c5259163870ebc322fa94dd554c09d Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 3 Jun 2021 16:20:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=E5=8D=95=E4=BD=8D=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAdifferentContent=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wait-examineer/wait-examineer.component.html           | 4 ++--
 .../plan-audit/wait-examineer/wait-examineer.component.ts  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index a3f48d7..c0127ca 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -97,7 +97,7 @@
         <button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;"
           (click)='agree()'>同意</button>
       </div>
-      <div class="rightheadone" style="display: block;">
+      <div class="rightheadone" style="display: block;" *ngIf="showtype == 3">
         <button mat-raised-button color="primary" (click)="buttonChange()">{{isallDate?'显示变更数据':'显示完整数据'}} </button>
         <!-- <button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;"
           (click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;"> 预览得分</button> -->
@@ -107,7 +107,7 @@
     <!-- 数据变更div -->
     <div *ngIf="!isallDate" style="flex: 1;overflow-y: auto;">
       <div *ngIf="showtype == 3" id="firefacilities" style="margin: 10px;">
-        <mat-accordion class="tableContent" multi>
+        <mat-accordion *ngIf="selectedItem.differentContent" class="tableContent" multi>
           <!-- 基本信息 -->
           <mat-expansion-panel  *ngIf="this.differentContentOfUnitInfo[0].childrens.length != 0" expanded>
             <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index 909571e..6efa397 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -167,10 +167,12 @@ export class WaitExamineerComponent implements OnInit {
   differentContentOfPicture: any//当前单位变更数据 之 实景图
   radioClick(e, item) {
     this.selectedItem = item
-   
+    console.log(item)
     // console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) )
-    if(item.contentType == 11){
+    if(item.contentType == 11 && this.selectedItem.differentContent){
+      
       let differentContent = JSON.parse(this.selectedItem.differentContent)
+      
       // 单位信息
       this.differentContentOfUnitInfo = differentContent.filter(item => item.propertyName == 'basicInfo')
       // 实景图
@@ -181,7 +183,6 @@ export class WaitExamineerComponent implements OnInit {
       this.differentContentOfBuildingsInfo.childrens.forEach(element => {
         element.childrens = element.childrens.filter(item => item.isObj == false)
       });
-      console.log('当前选择的单位的实景图',this.differentContentOfBuildingsInfo)
       //功能分区
       let differentContentOfFunction = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0]))
       this.differentContentOfFunction = []