From 7e5c9c75a86ca4e3b554dc2a2031c149bba27ec0 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 16 Mar 2021 11:35:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=BA=95=E5=9B=BE=E5=A2=9E=E5=8A=A0=E9=81=AE=E7=BD=A9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/collection-tools-plan/collection-tools.component.ts | 2 ++ src/app/ui/collection-tools-plan/leftFunctionalDomain.ts | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 c75df3a..27792a0 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/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) } }) } diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts index cc1bd01..5457d7b 100644 --- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts +++ b/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, - @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) From 8d7b7d46fce6fcd4e8a36201833a2e58cf2ae8d0 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 16 Mar 2021 15:12:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=B6=88=E9=98=B2=E8=AE=BE=E6=96=BD=E7=BB=9F=E8=AE=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F,=20=E5=BE=97=E5=88=86=E6=8F=90=E7=A4=BA=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicinfo-look/basicinfo.component.ts | 2 +- .../key-unit/basicinfo/basicinfo.component.ts | 2 +- .../statisticsOfFireFightingFacilities.html | 4 ++-- .../edit-plan-info/edit-plan-info.component.html | 16 ++++++++-------- .../edit-plan-info/edit-plan-info.component.scss | 5 +++-- .../view-unit-details.component.html | 16 ++++++++-------- .../view-unit-details.component.scss | 5 +++-- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.ts b/src/app/key-unit/basicinfo-look/basicinfo.component.ts index 80e56d5..c6ab33e 100644 --- a/src/app/key-unit/basicinfo-look/basicinfo.component.ts +++ b/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(); } diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts index c446ffc..a07f1a3 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.ts +++ b/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(); } diff --git a/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html b/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html index e24e0ab..804ac91 100644 --- a/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html +++ b/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html @@ -1,4 +1,4 @@ -
消防设施统计
-

{{item}}

+
消防设施统计
+

{{item}}

\ No newline at end of file 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 060d83c..2db1b5a 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 @@ -1,12 +1,12 @@
- - - - - - - - + + + + + + + +
diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss b/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss index ac24283..01a9116 100644 --- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.scss +++ b/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; - font-size: 16px; + top: 88px; + font-size: 15px; z-index: 111; + color: red; } } \ 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 85803af..164fc02 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,12 +1,12 @@
- - - - - - - - + + + + + + + +
diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.scss b/src/app/key-unit/view-unit-details/view-unit-details.component.scss index ac24283..01a9116 100644 --- a/src/app/key-unit/view-unit-details/view-unit-details.component.scss +++ b/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; - font-size: 16px; + top: 88px; + font-size: 15px; z-index: 111; + color: red; } } \ No newline at end of file From 13de70dd54541f55cdf7ebbc6ac8da3a774d70fb Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 16 Mar 2021 15:16:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit/basicinfo/statisticsOfFireFightingFacilities.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html b/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html index 804ac91..587a18f 100644 --- a/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html +++ b/src/app/key-unit/basicinfo/statisticsOfFireFightingFacilities.html @@ -1,4 +1,4 @@
消防设施统计
-

{{item}}

+

{{item}}

\ No newline at end of file