\ No newline at end of file
diff --git a/src/app/key-unit/key-site/key-site.component.scss b/src/app/key-unit/key-site/key-site.component.scss
index 08d9639..56e3a25 100644
--- a/src/app/key-unit/key-site/key-site.component.scss
+++ b/src/app/key-unit/key-site/key-site.component.scss
@@ -41,18 +41,36 @@ table {
.rotateB {transform: rotate(180deg)}
.rotateC {transform: rotate(270deg) scale(0.75);}
//预览图片
-.previewImgBox {
- width: 1500px;
- height: 700px;
- text-align: center;
- img{
- width: auto;
- height: auto;
- max-width: 100%;
- height: 100%;}
+.imgDiaLogBox{
+ width: 1450px;
+ height: 810px;
+ //预览图片
+ .previewImgBox {
+ width: 1350px;
+ height: 700px;
+ text-align: center;
+ img{
+ width: auto;
+ height: auto;
+ max-width: 100%;
+ height: 100%;}
+ }
+ .previewImgBottom {
+ text-align: center;
+ height: 30px;
+ margin: 20px auto;
+ }
}
-.previewImgBottom {
- text-align: center;
- height: 30px;
- margin: 20px auto;
+
+@media screen and (max-width:1300px){
+ .imgDiaLogBox{
+ width: 920px;
+ height: 600px;
+ //预览图片
+ .previewImgBox {
+ width: 800px;
+ height: 500px;
+ text-align: center;
+ }
+ }
}
diff --git a/src/app/key-unit/key-site/key-site.component.ts b/src/app/key-unit/key-site/key-site.component.ts
index b72badc..5353305 100644
--- a/src/app/key-unit/key-site/key-site.component.ts
+++ b/src/app/key-unit/key-site/key-site.component.ts
@@ -150,8 +150,7 @@ export class KeySiteComponent implements OnInit {
if (e.length) {
let data = e
const dialogRef = this.dialog.open(KeySiteImgs, {//调用open方法打开对话框并且携带参数过去
- width: '1600px',
- height:'900px',data});
+ data});
dialogRef.afterClosed().subscribe();
} else {
const config = new MatSnackBarConfig();
diff --git a/src/app/key-unit/key-site/keyimgdetail.component.html b/src/app/key-unit/key-site/keyimgdetail.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/key-unit/key-site/keyimgdetail.component.ts b/src/app/key-unit/key-site/keyimgdetail.component.ts
deleted file mode 100644
index 655cf04..0000000
--- a/src/app/key-unit/key-site/keyimgdetail.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import Swiper from 'swiper';
-
-
-
-@Component({
- selector: 'keyimgdetail',
- templateUrl: './keyimgdetail.component.html',
- styleUrls: ['./key-site.component.scss']
- })
-export class KeyImgDetail {
-
-}
-
\ No newline at end of file
diff --git a/src/app/key-unit/key-site/keysiteimgs.component.html b/src/app/key-unit/key-site/keysiteimgs.component.html
index 992faec..cced074 100644
--- a/src/app/key-unit/key-site/keysiteimgs.component.html
+++ b/src/app/key-unit/key-site/keysiteimgs.component.html
@@ -1,18 +1,21 @@
-
-
-
-
![]()
-
-
-
-
-
-
+
+
图片详情
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts
index 8ffd21f..db6b376 100644
--- a/src/app/key-unit/key-unit.module.ts
+++ b/src/app/key-unit/key-unit.module.ts
@@ -59,7 +59,6 @@ import {ImgDetails} from './allaround/imgdetails.component'
import { RealisticPictureComponent, previewImg, addRealPicture, editRealPicture } from './realistic-picture/realistic-picture.component';
import { FileUploadModule } from 'ng2-file-upload';
import {KeySiteComponent} from './key-site/key-site.component'
-import {KeyImgDetail} from './key-site/keyimgdetail.component'
import {KeySiteImgs} from './key-site/keysiteimgs.component'
import {UploadingCADComponent,readFile,editFile} from './uploading-cad/uploading-cad.component'
import { KeySiteLookComponent } from './key-site-look/key-site.component';
@@ -87,7 +86,7 @@ import { upname } from './key-unit-management/key-unit-management.component';
import { companyAuditResult } from './key-unit-management/key-unit-management.component'
@NgModule({
- declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,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],
exports:[ViewUnitDetailsPlanComponent],
imports: [
CommonModule,
diff --git a/src/app/key-unit/realistic-picture-look/previewImg.html b/src/app/key-unit/realistic-picture-look/previewImg.html
index 1cde6b9..6261a50 100644
--- a/src/app/key-unit/realistic-picture-look/previewImg.html
+++ b/src/app/key-unit/realistic-picture-look/previewImg.html
@@ -1,17 +1,19 @@
-
图片详情
-
-
-
-
![]()
-
+
+
图片详情
+
+
+
+
![]()
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
index 075375c..e3d207b 100644
--- a/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
+++ b/src/app/key-unit/realistic-picture-look/realistic-picture.component.scss
@@ -154,21 +154,37 @@
.rotateB {transform: rotate(180deg)}
.rotateC {transform: rotate(270deg) scale(0.75);}
-
-
//预览图片
-.previewImgBox {
- width: 1500px;
- height: 700px;
- text-align: center;
- img{
- width: auto;
- height: auto;
- max-width: 100%;
- height: 100%;}
-}
-.previewImgBottom {
- text-align: center;
- height: 30px;
- margin: 20px auto;
+.imgDiaLogBox{
+ width: 1450px;
+ height: 810px;
+ //预览图片
+ .previewImgBox {
+ width: 1350px;
+ height: 700px;
+ text-align: center;
+ img{
+ width: auto;
+ height: auto;
+ max-width: 100%;
+ height: 100%;}
+ }
+ .previewImgBottom {
+ text-align: center;
+ height: 30px;
+ margin: 20px auto;
+ }
}
+
+@media screen and (max-width:1300px){
+ .imgDiaLogBox{
+ width: 920px;
+ height: 600px;
+ //预览图片
+ .previewImgBox {
+ width: 800px;
+ height: 500px;
+ text-align: center;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/key-unit/realistic-picture-look/realistic-picture.component.ts b/src/app/key-unit/realistic-picture-look/realistic-picture.component.ts
index cf1dc66..7aeee4e 100644
--- a/src/app/key-unit/realistic-picture-look/realistic-picture.component.ts
+++ b/src/app/key-unit/realistic-picture-look/realistic-picture.component.ts
@@ -122,8 +122,7 @@ export class RealisticPictureLookComponent implements OnInit {
allImages:this.allImages,
imgIndex: index}
let dialogRef = this.dialog.open(previewImg3,
- {width: '1600px',
- height:'900px',data});
+ {data});
dialogRef.afterClosed().subscribe();
}
diff --git a/src/app/key-unit/realistic-picture/previewImg.html b/src/app/key-unit/realistic-picture/previewImg.html
index 1cde6b9..6261a50 100644
--- a/src/app/key-unit/realistic-picture/previewImg.html
+++ b/src/app/key-unit/realistic-picture/previewImg.html
@@ -1,17 +1,19 @@
-
图片详情
-
-
-
-
![]()
-
+
+
图片详情
+
+
+
+
![]()
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/realistic-picture/realistic-picture.component.scss b/src/app/key-unit/realistic-picture/realistic-picture.component.scss
index 075375c..8e3fdbe 100644
--- a/src/app/key-unit/realistic-picture/realistic-picture.component.scss
+++ b/src/app/key-unit/realistic-picture/realistic-picture.component.scss
@@ -157,18 +157,36 @@
//预览图片
-.previewImgBox {
- width: 1500px;
- height: 700px;
- text-align: center;
- img{
- width: auto;
- height: auto;
- max-width: 100%;
- height: 100%;}
-}
-.previewImgBottom {
- text-align: center;
- height: 30px;
- margin: 20px auto;
+.imgDiaLogBox{
+ width: 1450px;
+ height: 810px;
+ //预览图片
+ .previewImgBox {
+ width: 1350px;
+ height: 700px;
+ text-align: center;
+ img{
+ width: auto;
+ height: auto;
+ max-width: 100%;
+ height: 100%;}
+ }
+ .previewImgBottom {
+ text-align: center;
+ height: 30px;
+ margin: 20px auto;
+ }
}
+
+@media screen and (max-width:1300px){
+ .imgDiaLogBox{
+ width: 920px;
+ height: 600px;
+ //预览图片
+ .previewImgBox {
+ width: 800px;
+ height: 500px;
+ text-align: center;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/key-unit/realistic-picture/realistic-picture.component.ts b/src/app/key-unit/realistic-picture/realistic-picture.component.ts
index 343f875..4b66124 100644
--- a/src/app/key-unit/realistic-picture/realistic-picture.component.ts
+++ b/src/app/key-unit/realistic-picture/realistic-picture.component.ts
@@ -123,8 +123,7 @@ export class RealisticPictureComponent implements OnInit {
allImages:this.allImages,
imgIndex: index}
let dialogRef = this.dialog.open(previewImg,
- {width: '1600px',
- height:'900px',data});
+ {data});
dialogRef.afterClosed().subscribe();
}
diff --git a/src/app/key-unit/router-gis/router-gis.component.scss b/src/app/key-unit/router-gis/router-gis.component.scss
index b9fc918..af4eedc 100644
--- a/src/app/key-unit/router-gis/router-gis.component.scss
+++ b/src/app/key-unit/router-gis/router-gis.component.scss
@@ -106,6 +106,12 @@
}
}
}
+@media screen and (max-width:1400px){
+ .routeGIS{
+ max-height: 520px;
+ }
+}
+
.routeGISPublicIcon { position: absolute; color: #fff; font-size: 14px; } //导航 定位部分公共样式
//选择路线 方案 button
.routeType { margin: 0 10px; outline: none; border: none; background-color: transparent; font-size: 14px; font-weight: 550; color: rgb(122, 116, 116); }
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html
index c250122..b2d0bbf 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -69,7 +69,7 @@