-
+
@@ -18,9 +18,10 @@
-
+
\ No newline at end of file
diff --git a/src/app/gis-management/plan-list/plan-list.component.ts b/src/app/gis-management/plan-list/plan-list.component.ts
index cb7a60b..196a60d 100644
--- a/src/app/gis-management/plan-list/plan-list.component.ts
+++ b/src/app/gis-management/plan-list/plan-list.component.ts
@@ -1,5 +1,5 @@
-import { HttpClient } from '@angular/common/http';
-import { Component, Inject, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { HttpClient} from '@angular/common/http';
+import { Component, Inject, OnInit, Renderer2, ViewChild,Input } from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
@@ -10,7 +10,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
})
export class PlanListComponent implements OnInit {
constructor(private http: HttpClient,public snackBar: MatSnackBar,public dialog: MatDialog) { }
-
+ @Input() public planType: any;//data名字根据引用场景自定义
//单位相关数据
unitId:any = sessionStorage.getItem('unitId')
diff --git a/src/app/key-unit/allaround/allaround.component.scss b/src/app/key-unit/allaround/allaround.component.scss
index 4ac5e3b..a180eb7 100644
--- a/src/app/key-unit/allaround/allaround.component.scss
+++ b/src/app/key-unit/allaround/allaround.component.scss
@@ -9,6 +9,7 @@
//图片外部div
.allImgs {
display: flex;
+ height: 100%;
overflow-y: auto;
flex-direction: row;
flex-wrap: wrap;
@@ -33,23 +34,43 @@
}
}
-//预览图片
-.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;
-}
+
//预览图片旋转角度
.rotateA {transform: rotate(90deg) scale(0.75);}
.rotateB {transform: rotate(180deg)}
-.rotateC {transform: rotate(270deg) scale(0.75);}
\ No newline at end of file
+.rotateC {transform: rotate(270deg) scale(0.75);}
+
+//预览图片
+.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;
+ }
+ }
+}
diff --git a/src/app/key-unit/allaround/allaround.component.ts b/src/app/key-unit/allaround/allaround.component.ts
index 2c4b7d4..9e75636 100644
--- a/src/app/key-unit/allaround/allaround.component.ts
+++ b/src/app/key-unit/allaround/allaround.component.ts
@@ -67,8 +67,7 @@ export class AllaroundComponent implements OnInit {
if (e.length && e!=null) {
let data = e
const dialogRef = this.dialog.open(ImgDetails, {//调用open方法打开对话框并且携带参数过去
- width: '1600px',
- height:'900px',data});
+ data});
dialogRef.afterClosed().subscribe();
} else{
const config = new MatSnackBarConfig();
diff --git a/src/app/key-unit/allaround/imgdetails.component.html b/src/app/key-unit/allaround/imgdetails.component.html
index b341979..caadda4 100644
--- a/src/app/key-unit/allaround/imgdetails.component.html
+++ b/src/app/key-unit/allaround/imgdetails.component.html
@@ -1,18 +1,21 @@
-
+
-
+
{{item.name}}
@@ -38,5 +39,7 @@
+
+
图片详情
-
-
-
-
-
-
+
- ![]()
-
-
-
+
-
-图片详情
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
index 7248739..f44e577 100644
--- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
+++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.scss
@@ -115,11 +115,10 @@ textarea {
}
-
//img图片列表页面
.imageList {
- width: 100%;
- height: 100%;
+ width: 1450px;
+ height: 810px;
overflow-y: auto;
.imageListBox {
width: 100%;
@@ -143,3 +142,16 @@ textarea {
}
}
}
+
+
+@media screen and (max-width:1300px){
+ .imageList{
+ width: 920px;
+ height: 600px;
+ .imageListBox {
+ .imagesBox {
+ width: 270px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
index 926c2b7..10c786d 100644
--- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
+++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts
@@ -448,7 +448,7 @@ export class FireFightingDeviceLookComponent implements OnInit {
}); //newDate
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData2,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData2,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -474,7 +474,7 @@ export class FireFightingDeviceLookComponent implements OnInit {
data.images.push(elements)} });
});
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData2,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData2,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -509,7 +509,7 @@ export class FireFightingDeviceLookComponent implements OnInit {
}); //newDate
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData2,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData2,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -536,7 +536,7 @@ export class FireFightingDeviceLookComponent implements OnInit {
});
});
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData2,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData2,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
diff --git a/src/app/key-unit/fire-fighting-device-look/imagesdata.component.ts b/src/app/key-unit/fire-fighting-device-look/imagesdata.component.ts
index a28433e..ea378a9 100644
--- a/src/app/key-unit/fire-fighting-device-look/imagesdata.component.ts
+++ b/src/app/key-unit/fire-fighting-device-look/imagesdata.component.ts
@@ -26,8 +26,7 @@ export class ImagesData2 {
allImages:this.data.images,
imgIndex: index}
let dialogRef = this.dialog.open(previewBigImg2,
- {width: '1600px',
- height:'900px',data});
+ {data});
}
}
diff --git a/src/app/key-unit/fire-fighting-device-look/previewImg.html b/src/app/key-unit/fire-fighting-device-look/previewImg.html
index 1cde6b9..6261a50 100644
--- a/src/app/key-unit/fire-fighting-device-look/previewImg.html
+++ b/src/app/key-unit/fire-fighting-device-look/previewImg.html
@@ -1,17 +1,19 @@
-图片详情
-
-
-
- ![]()
-
+
-
-
+
+
+ 图片详情
+
+
-
-
-
-
+
+
+
+
+
+
-
+ ![]()
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
index 7248739..f071e6e 100644
--- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
+++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.scss
@@ -118,8 +118,8 @@ textarea {
//img图片列表页面
.imageList {
- width: 100%;
- height: 100%;
+ width: 1450px;
+ height: 810px;
overflow-y: auto;
.imageListBox {
width: 100%;
@@ -143,3 +143,17 @@ textarea {
}
}
}
+
+
+@media screen and (max-width:1300px){
+ .imageList{
+ width: 920px;
+ height: 600px;
+ .imageListBox {
+ .imagesBox {
+ width: 270px;
+ }
+ }
+ }
+}
+
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
index 53abf57..f3b7943 100644
--- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
+++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts
@@ -441,7 +441,7 @@ export class FireFightingDeviceComponent implements OnInit {
}); //newDate
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -467,7 +467,7 @@ export class FireFightingDeviceComponent implements OnInit {
data.images.push(elements)} });
});
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -502,7 +502,7 @@ export class FireFightingDeviceComponent implements OnInit {
}); //newDate
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
@@ -529,7 +529,7 @@ export class FireFightingDeviceComponent implements OnInit {
});
});
if (data.images.length) {
- let dialogRef = this.dialog.open(ImagesData,{width:'1350px',height:'700px',data}); //打开图片弹窗
+ let dialogRef = this.dialog.open(ImagesData,{data}); //打开图片弹窗
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
diff --git a/src/app/key-unit/fire-fighting-device/imagesdata.component.ts b/src/app/key-unit/fire-fighting-device/imagesdata.component.ts
index 05c43e1..e3d6dff 100644
--- a/src/app/key-unit/fire-fighting-device/imagesdata.component.ts
+++ b/src/app/key-unit/fire-fighting-device/imagesdata.component.ts
@@ -26,8 +26,7 @@ export class ImagesData {
allImages:this.data.images,
imgIndex: index}
let dialogRef = this.dialog.open(previewBigImg,
- {width: '1600px',
- height:'900px',data});
+ {data});
}
}
diff --git a/src/app/key-unit/fire-fighting-device/previewImg.html b/src/app/key-unit/fire-fighting-device/previewImg.html
index 1cde6b9..6261a50 100644
--- a/src/app/key-unit/fire-fighting-device/previewImg.html
+++ b/src/app/key-unit/fire-fighting-device/previewImg.html
@@ -1,17 +1,19 @@
-图片详情
-
-
-
- ![]()
-
+
-
-
+
+
+ 图片详情
+
+
-
-
-
-
+
+
+
+
+
+
-
+ ![]()
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/app/key-unit/key-site-look/key-site.component.scss b/src/app/key-unit/key-site-look/key-site.component.scss
index 438b588..774c314 100644
--- a/src/app/key-unit/key-site-look/key-site.component.scss
+++ b/src/app/key-unit/key-site-look/key-site.component.scss
@@ -42,18 +42,37 @@ 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%;}
-}
-.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/key-site-look/key-site.component.ts b/src/app/key-unit/key-site-look/key-site.component.ts
index 053dc20..d9cd4da 100644
--- a/src/app/key-unit/key-site-look/key-site.component.ts
+++ b/src/app/key-unit/key-site-look/key-site.component.ts
@@ -142,8 +142,7 @@ export class KeySiteLookComponent implements OnInit {
if (e.length) {
let data = e
const dialogRef = this.dialog.open(KeySiteImgs2, {//调用open方法打开对话框并且携带参数过去
- width: '1600px',
- height:'900px',data});
+ data});
dialogRef.afterClosed().subscribe();
} else {
const config = new MatSnackBarConfig();
diff --git a/src/app/key-unit/key-site-look/keyimgdetail.component.html b/src/app/key-unit/key-site-look/keyimgdetail.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/key-unit/key-site-look/keyimgdetail.component.ts b/src/app/key-unit/key-site-look/keyimgdetail.component.ts
deleted file mode 100644
index 655cf04..0000000
--- a/src/app/key-unit/key-site-look/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-look/keysiteimgs.component.html b/src/app/key-unit/key-site-look/keysiteimgs.component.html
index 992faec..8845e85 100644
--- a/src/app/key-unit/key-site-look/keysiteimgs.component.html
+++ b/src/app/key-unit/key-site-look/keysiteimgs.component.html
@@ -1,18 +1,20 @@
-图片详情
-
-
-
-
-
-
-
+
- ![]()
-
-
-
+
-
-图片详情
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
-
-
\ 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 @@
-