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

src/app/key-unit/basicinfo-look/basicinfo.component.ts

@@ -31,7 +31,7 @@ export class BasicinfoLookComponent implements OnInit {
   //查看消防设施统计
   seeFirfightingDevice (e) {
     e.stopPropagation()
-    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities);
+    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities,{hasBackdrop: false,position: {right:'55px',top:'165px'}});
     dialogRef.afterClosed().subscribe();   
   }
 

src/app/key-unit/basicinfo/basicinfo.component.ts

@@ -32,7 +32,7 @@ export class BasicinfoComponent implements OnInit {
   //查看消防设施统计
   seeFirfightingDevice (e) {
     e.stopPropagation()
-    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities);
+    let dialogRef = this.dialog.open(StatisticsOfFireFightingFacilities,{hasBackdrop: false,position: {right:'55px',top:'165px'}});
     dialogRef.afterClosed().subscribe();   
   }
 

src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html

@@ -1,4 +1,4 @@
-<div mat-dialog-title>消防设施统计</div>
 <div>
-  <p style="margin: 5px 0; font-size: 14px;" *ngFor="let item of allFireList">{{item}}</p>
+  <div style="color: #2196f3; font-weight: 550;">消防设施统计<label style="float: right; cursor: pointer;" mat-dialog-close>×</label></div>
+  <p style="margin: 5px 0; font-size: 14px;" *ngFor="let item of allFireList;let key = index" [ngStyle]="{'background-color': key%2 != 0 ? '#F2F2F2' : 'none'}">{{item}}</p>
 </div>

src/app/key-unit/edit-plan-info/edit-plan-info.component.html

@@ -1,12 +1,12 @@
 <div class="fixedPrompt">
-  <label class="scorePrompt" *ngIf="selected.value == 0"><label style="color: red;">*</label>单位信息,建筑信息填写完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 1"><label style="color: red;">*</label>单位毗邻模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 2"><label style="color: red;">*</label>消防设施,重点部位模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 3"><label style="color: red;">*</label>总平面图模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5"><label style="color: red;">*</label>层平面图模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 6"><label style="color: red;">*</label>填写2条以上可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 9"><label style="color: red;">*</label>外观,室内,安全出口上传图片可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 10"><label style="color: red;">*</label>上传2张CAD图片可得满分</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="1.基本信息">

src/app/key-unit/edit-plan-info/edit-plan-info.component.scss

@@ -9,8 +9,9 @@
     width: 100%;
     text-align: center;
     position: absolute;
-    top: 35px;
+    top: 88px;
-    font-size: 16px;
+    font-size: 15px;
     z-index: 111;
+    color: red;
   }
 }

src/app/key-unit/view-unit-details/view-unit-details.component.html

@@ -1,12 +1,12 @@
 <div class="fixedPrompt">
-  <label class="scorePrompt" *ngIf="selected.value == 0"><label style="color: red;">*</label>单位信息,建筑信息填写完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 0">*单位信息,建筑信息填写完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 1"><label style="color: red;">*</label>单位毗邻模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 1">*单位毗邻模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 2"><label style="color: red;">*</label>消防设施,重点部位模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 2">*消防设施,重点部位模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 3"><label style="color: red;">*</label>总平面图模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5"><label style="color: red;">*</label>层平面图模块标注完整可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 6"><label style="color: red;">*</label>填写2条以上可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 9"><label style="color: red;">*</label>外观,室内,安全出口上传图片可得满分</label>
+  <label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
-  <label class="scorePrompt" *ngIf="selected.value == 10"><label style="color: red;">*</label>上传2张CAD图片可得满分</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="1.基本信息">

src/app/key-unit/view-unit-details/view-unit-details.component.scss

@@ -9,8 +9,9 @@
     width: 100%;
     text-align: center;
     position: absolute;
-    top: 35px;
+    top: 88px;
-    font-size: 16px;
+    font-size: 15px;
     z-index: 111;
+    color: red;
   }
 }

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

@@ -1725,8 +1725,10 @@ export class CollectionToolsPlanComponent implements OnInit {
     dialogRef.afterClosed().subscribe(data=>{
       if (data =='总平面图') {
         this.sitePlanData.length? this.renovateSitePlan() : this.getSitePlan()
+        this.maskLayerService.sendMessage(false)
       } else if (data =='建筑') {
         this.renovateBuilding()
+        this.maskLayerService.sendMessage(false)
       }
     })
   }

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

@@ -4,6 +4,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { CanvasShareDataService } from 'src/app/canvas-share-data.service';
 import { EventManager } from '@angular/platform-browser';
+import { MaskLayerService } from 'src/app/mask-layer.service';
 
 @Component({
   selector: 'app-leftFunctionalDomain-plan',
@@ -17,7 +18,7 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
     public dialog: MatDialog,
     public snackBar: MatSnackBar,
     public dialogRef: MatDialogRef<any>,
-    @Inject(MAT_DIALOG_DATA) public data,public canvasData: CanvasShareDataService,) { }
+    @Inject(MAT_DIALOG_DATA) public data,public canvasData: CanvasShareDataService,private maskLayerService:MaskLayerService,) { }
 
   ngOnInit(): void {
 
@@ -37,7 +38,7 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
         config.duration = 3000
-        this.snackBar.open('上传图片需小于5MB','确定',config);
+        this.snackBar.open('上传图片需小于10MB','确定',config);
       }
     }
   }
@@ -53,6 +54,7 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
   //提交表单创建平面图
   onSubmit (e) {
     if (this.file) {
+      this.maskLayerService.sendMessage(true)
       if (this.file.size<=5*1024*1024) { //小于5MB
         let formData = new FormData()
         formData.append("file",this.file)