Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/key-unit/realistic-picture/realistic-picture.component.html

@@ -23,7 +23,7 @@
       <div class="topBox">
         <div>
           <span class="title" *ngIf="selectReal">{{selectReal.name}}</span>
-          <button mat-raised-button color="primary" class="uploadFileFixed" *ngIf="!isLoading && selectReal && selectReal.id != '重点部位'">
+          <button mat-raised-button color="primary" class="uploadFileFixed" *ngIf="!isLoading && selectReal && selectReal.id != '重点部位'&& selectReal.id != '安全出口'">
             上传图片
             <input type="file" id="uploadFile" class="uploadFile" (change)='uploadFile($event)' ng2FileSelect [uploader]="uploader" accept="image/*">
           </button>
@@ -42,8 +42,8 @@
             <div class="fixedImg"><img [src]="item.newImageUrl" (click)='operation(item,key)' [ngClass]="{'selectImg': item.checked}"></div>
             <label style="margin-left: 5px;">图片名称:</label>
             <input type="text" style="margin-left: 10px;" [(ngModel)]="item.nameStart" maxlength="20">
-            <a *ngIf="selectReal.id != '重点部位'" href="javascript:" style="margin-left: 5px;" (click)='preservationImg(item)'>保存</a>
-            <a *ngIf="selectReal.id != '重点部位'" href="javascript:" style="margin-left: 5px;" (click)="deleteImg(item)">删除</a>
+            <a *ngIf="selectReal.id != '重点部位'&& selectReal.id != '安全出口'" href="javascript:" style="margin-left: 5px;" (click)='preservationImg(item)'>保存</a>
+            <a *ngIf="selectReal.id != '重点部位'&& selectReal.id != '安全出口'" href="javascript:" style="margin-left: 5px;" (click)="deleteImg(item)">删除</a>
           </div>
 
           <p style="width: 100px;margin: 30px auto;" *ngIf="!allImages.length">暂无数据</p>

src/app/key-unit/realistic-picture/realistic-picture.component.ts

@@ -26,15 +26,22 @@ export class RealisticPictureComponent implements OnInit {
 
   ngOnInit(): void {
     let companyId = this.route.snapshot.queryParams.id
-    this.http.get('/api/RealityImageGroups',{params:{
+    this.http.get('/api/RealityImageGroups', {
+      params: {
         companyId: companyId
-    }}).subscribe((data:any)=>{
+      }
+    }).subscribe((data: any) => {
       this.allRealPicture = data
       this.allRealPicture.unshift({
         companyId: sessionStorage.getItem('companyId'),
         id: '重点部位',
         name: "重点部位",
         realityImages: null
+      }, {
+        companyId: sessionStorage.getItem('companyId'),
+        id: '安全出口',
+        name: "安全出口",
+        realityImages: null
       })
       this.selectReal = data[0]
       this.getAllRealPicture()
@@ -66,9 +73,11 @@ export class RealisticPictureComponent implements OnInit {
   //获取所有实景图分组
   getAllGrouping() {
     let companyId = this.route.snapshot.queryParams.id
-    this.http.get('/api/RealityImageGroups',{params:{
+    this.http.get('/api/RealityImageGroups', {
+      params: {
         companyId: companyId
-    }}).subscribe((data:any)=>{
+      }
+    }).subscribe((data: any) => {
       this.allRealPicture = data
       this.selectReal = data[this.selectRealIndex]
     })
@@ -77,6 +86,25 @@ export class RealisticPictureComponent implements OnInit {
   //获取实景图分组对应实景图
   getAllRealPicture() {
     if (this.selectReal) {
+      if (this.selectReal.id == '安全出口') {
+        let params = {
+          companyId: this.selectReal.companyId,
+          PageNumber: this.PageNumber || 1,
+          pageSize: this.pageSize,
+        }
+        this.http.get('/api/CompanySafetyExits/GetCompanySafetyExitImages', { params: params }).subscribe((data: any) => {
+          console.log('当前单位安全出口', data)
+          this.allImages = data.items
+          this.length = data.totalCount
+          this.pageSize = this.pageSize
+          this.downloadList = []
+          this.allImages.forEach(element => { //每张图片设置选中状态为false
+            element.newImageUrl = `${element.imageUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` //处理图片URL地址
+            element.nameStart = element.name
+            element.checked = false //图片是否选中布尔值
+          });
+        })
+      } else {
         let data
         if (this.selectReal.id == '重点部位') {
           data = {
@@ -111,6 +139,8 @@ export class RealisticPictureComponent implements OnInit {
 
         })
       }
+
+    }
   }
 
   //切换左侧实景图文件
@@ -143,7 +173,8 @@ export class RealisticPictureComponent implements OnInit {
       let data = {
         selectReal: this.selectReal,
         allImages: this.allImages,
-        imgIndex: index}
+        imgIndex: index
+      }
       let dialogRef = this.dialog.open(previewImg,
         { data });
       dialogRef.afterClosed().subscribe();
@@ -157,7 +188,8 @@ export class RealisticPictureComponent implements OnInit {
     dialogRef.afterClosed().subscribe(data => {
       if (data) {
         this.tabbarService.sendMessage('changeScore');//通知服务改变分数
-        this.getAllGrouping()}
+        this.getAllGrouping()
+      }
     });
   }
 
@@ -169,7 +201,8 @@ export class RealisticPictureComponent implements OnInit {
       dialogRef.afterClosed().subscribe(data => {
         if (data) {
           this.tabbarService.sendMessage('changeScore');//通知服务改变分数
-          this.getAllGrouping()}
+          this.getAllGrouping()
+        }
       });
     }
   }
@@ -181,9 +214,11 @@ export class RealisticPictureComponent implements OnInit {
       let isDelete = confirm('您确定要删除吗')
       if (isDelete) {
         this.http.delete(`/api/RealityImageGroups/${this.selectReal.id}`).subscribe(data => {
-          this.http.get('/api/RealityImageGroups',{params:{
+          this.http.get('/api/RealityImageGroups', {
+            params: {
               companyId: companyId
-          }}).subscribe((data:any)=>{
+            }
+          }).subscribe((data: any) => {
             this.allRealPicture = data
             this.selectReal = data[this.selectRealIndex]
             this.allImages = []
@@ -206,9 +241,11 @@ export class RealisticPictureComponent implements OnInit {
       imageUrl: e.imageUrl,
       realityImageGroupId: e.realityImageGroupId
     }
-    this.http.put(`/api/RealityImages/${e.id}`,data,{params:{
+    this.http.put(`/api/RealityImages/${e.id}`, data, {
+      params: {
         companyId: companyId
-    }}).subscribe(data=>{
+      }
+    }).subscribe(data => {
       this.getAllRealPicture()
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
@@ -288,7 +325,8 @@ export class RealisticPictureComponent implements OnInit {
           this.addRealImg()
         } else { // 上传文件后获取服务器返回的数据错误
           let tempRes = JSON.parse(response);
-        }};
+        }
+      };
     } else if (file && fileSize > shardSize && fileSize < maxdSize) { //上传文件>5MB时,分块上传
       let data = { filename: file.name }
       this.isLoading = true
@@ -321,7 +359,8 @@ export class RealisticPictureComponent implements OnInit {
         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}
+            "eTag": data.eTag || null
+          }
           resolve(msg) // 调用 promise 内置方法处理成功
         })
       });
@@ -351,9 +390,11 @@ export class RealisticPictureComponent implements OnInit {
       imageUrl: this.objectName,
       realityImageGroupId: this.selectReal.id,
     }
-    this.http.post('/api/RealityImages',data,{params:{
+    this.http.post('/api/RealityImages', data, {
+      params: {
         companyId: companyId
-    }}).subscribe(data=>{
+      }
+    }).subscribe(data => {
       (<HTMLInputElement>document.getElementById('uploadFile')).value = null //清空input框缓存
       this.getAllRealPicture()
       const config = new MatSnackBarConfig();
@@ -374,7 +415,7 @@ export class RealisticPictureComponent implements OnInit {
       for (let i = 0; i < this.downloadList.length; i++) {
         let result = await new Promise((result, reject) => {
           let url
-          if(this.selectReal.id == '重点部位'){
+          if (this.selectReal.id == '重点部位' || this.selectReal.id == '安全出口') {
             url = this.downloadList[i].imageUrl
           } else {
             url = `/api/Objects/PlanPlatform/${this.downloadList[i].imageUrl}`
@@ -387,6 +428,8 @@ export class RealisticPictureComponent implements OnInit {
             let imgName
             if (this.selectReal.id == '重点部位') {
               imgName = this.downloadList[i].name + '.' + data.type.split('/')[data.type.split('/').length - 1]
+            } else if (this.selectReal.id == '安全出口') {
+              imgName = '安全出口' + this.downloadList[i].name
             } else {
               imgName = this.downloadList[i].name
             }
@@ -400,14 +443,16 @@ export class RealisticPictureComponent implements OnInit {
           this.isLoading = false
           this.isDownload = false
           this.allImages.forEach(element => { element.checked = false });
-          this.downloadList = []}
+          this.downloadList = []
+        }
 
       } //for循环
     } else {
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
-      this.snackBar.open('请选择图片','确定',config);}
+      this.snackBar.open('请选择图片', '确定', config);
+    }
   }
 
 
@@ -433,7 +478,7 @@ export class previewImg {
   ngOnInit(): void {
     this.allImages = this.data.allImages
     this.allImages.forEach(element => {
-      if( this.data.selectReal.id == '重点部位'){
+      if (this.data.selectReal.id == '重点部位' || this.data.selectReal.id == '安全出口') {
         element.previewImageUrl = `${element.imageUrl}` //处理图片URL地址
       } else {
         element.previewImageUrl = `/api/Objects/PlanPlatform/${element.imageUrl}?x-oss-process=image/auto-orient,1` //处理图片URL地址

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -291,7 +291,7 @@ export class WaitExamineerComponent implements OnInit {
       })
     } else {
       this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data: any) => {
-        //console.log(data)
+        console.log('预案信息',data)
         this.companyId = data.companyId
         this.companyName = data.companyName
         if (data.planType != 2 && data.planType != 1) {
@@ -330,10 +330,6 @@ export class WaitExamineerComponent implements OnInit {
           this.planData = data
           this.handleData()
           return
-
-          //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
-          //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
-          //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
         }
 
 
@@ -354,6 +350,7 @@ export class WaitExamineerComponent implements OnInit {
 
   //毕升
   lookWord() {
+    console.log('lookWord')
     this.showtype = 0
     let src
     let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase()

src/app/ui/collection-tools-building/collection-tools.component.ts

@@ -907,14 +907,26 @@ export class CollectionToolsBuildingComponent implements OnInit {
       //遍历 建筑数据 删除多余数据
       this.saveNum = []
       let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
+      console.log(SitePlanData.data)
+      for (const key in SitePlanData.data) {
+        if (Object.prototype.hasOwnProperty.call(SitePlanData.data, key)) {
+          const element = SitePlanData.data[key];
+          element.Width = Number(element.Width)
+          element.Height = Number(element.Height)
+          element.PropertyInfos.forEach(item => {
+            item.PropertyType = Number(item.PropertyType)
+          });
+        }
+      }
       SitePlanData.data = JSON.stringify(SitePlanData.data)
+
+
       let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
       CompanyData.data = JSON.stringify(CompanyData.data)
 
       if (this.pattern) {//如果是基本信息编辑模式
         for (const key in object) {
           if (object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
-
             object[key].PropertyInfos.forEach(element => {
               if (element.PropertyName == "方向") {
                 adjoinArr.push(element.PropertyValue)
@@ -1068,7 +1080,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
             })
 
           } else { //如果是建筑
-
             //建筑平面图数据
             this.http.post("/api/BuildingAreaData", SitePlanData, {
               params: {
@@ -1659,6 +1670,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
   getSitePlanStorey(e) {
     let params = { sitePlanId: e.id }
     this.http.get(`/api/SitePlanData`, { params }).subscribe((data: any) => {
+
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
       this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
       this.canvasData.originaleveryStoreyData.version = "2.0"
@@ -1684,6 +1696,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
   getBuildingStorey(e) {
     let params = { buildingAreaId: e.id }
     this.http.get(`/api/BuildingAreaData`, { params }).subscribe((data: any) => {
+      console.log('建筑楼层数据', data)
       this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
       this.canvasData.originaleveryStoreyData.data ? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
       this.canvasData.originaleveryStoreyData.version = "2.0"

src/app/ui/collection-tools-plan/collection-tools.component.ts

@@ -817,7 +817,18 @@ export class CollectionToolsPlanComponent implements OnInit {
             //遍历 建筑数据 删除多余数据
             this.saveNum = []
             let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
+            for (const key in SitePlanData.data) {
+                if (Object.prototype.hasOwnProperty.call(SitePlanData.data, key)) {
+                    const element = SitePlanData.data[key];
+                    element.Width = Number(element.Width)
+                    element.Height = Number(element.Height)
+                    element.PropertyInfos.forEach(item => {
+                        item.PropertyType = Number(item.PropertyType)
+                    });
+                }
+            }
             SitePlanData.data = JSON.stringify(SitePlanData.data)
+           
             let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
             CompanyData.data = JSON.stringify(CompanyData.data)