From 66ed29a8ee39f328ef5a7b2452202d54e6ce958f Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 23 Mar 2021 15:59:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]gis=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=93=8D=E5=BA=94=E5=BC=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allaround/allaround.component.html | 87 +------------------ .../allaround/allaround.component.scss | 27 +++++- .../allaround/allaround.component.ts | 4 +- .../allaround/imgdetails.component.html | 35 ++++---- .../fire-facilities.component.scss | 17 +++- .../fire-facilities.component.ts | 4 +- .../fire-facilities/imagesdata.component.ts | 3 +- .../fire-facilities/previewImg.html | 32 +++---- .../realistic-picture.component.scss | 46 +++++++--- .../gis-labeling/gis-labeling.component.html | 4 +- .../gis-labeling/gis-labeling.component.scss | 16 +++- .../gis-labeling/gis-labeling.component.ts | 5 +- .../key-site-look/key-site.component.scss | 44 +++++++--- .../key-site-look/key-site.component.ts | 3 +- .../key-site-look/keysiteimgs.component.html | 35 ++++---- .../plan-list/openPlanTool.html | 4 +- .../plan-list/openPlanTool.scss | 10 +++ .../plan-list/plan-list.component.scss | 6 +- .../plan-list/plan-list.component.ts | 2 - .../realistic-picture-look/previewImg.html | 32 +++---- .../realistic-picture.component.scss | 56 ++++++++---- .../realistic-picture.component.ts | 3 +- .../collection-tools.component.html | 8 +- .../collection-tools.component.scss | 11 ++- src/app/ui/collection-tools-plan/panel.scss | 5 +- src/assets/css/newStyle.css | 5 ++ src/styles.scss | 2 +- 27 files changed, 282 insertions(+), 224 deletions(-) diff --git a/src/app/gis-management/allaround/allaround.component.html b/src/app/gis-management/allaround/allaround.component.html index 1ac2e1a..7bf8a27 100644 --- a/src/app/gis-management/allaround/allaround.component.html +++ b/src/app/gis-management/allaround/allaround.component.html @@ -7,83 +7,6 @@ * @LastEditTime: 2020-11-26 17:11:54 -->
- -
@@ -92,8 +15,6 @@ 单位毗邻 - -
@@ -122,11 +43,9 @@
- - - - -
+ + +
diff --git a/src/app/gis-management/allaround/allaround.component.scss b/src/app/gis-management/allaround/allaround.component.scss index 1787bbb..e9cfc27 100644 --- a/src/app/gis-management/allaround/allaround.component.scss +++ b/src/app/gis-management/allaround/allaround.component.scss @@ -32,7 +32,6 @@ flex-direction: row; .left{ width: 45%; - //height: 140px; img{ width: 140px; height: 100px; @@ -40,6 +39,11 @@ cursor:pointer; } } + @media screen and (min-width:1000px) and (max-width:1400px){ + .left{ + width: 57%; + } + } .right{ width: 40%; margin-top: 4%; @@ -84,8 +88,13 @@ } } } - //预览图片 +.bigimgbox{ + width: 1500px; + height: 900px; + display: flex; + align-items: center; +} .previewImgBox { width: 1500px; height: 700px; @@ -104,4 +113,16 @@ //预览图片旋转角度 .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);} +@media screen and (min-width:1000px) and (max-width:1400px){ + .bigimgbox{ + width:900px; + height: 580px; + } + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } +} diff --git a/src/app/gis-management/allaround/allaround.component.ts b/src/app/gis-management/allaround/allaround.component.ts index 207c144..4f1d3e7 100644 --- a/src/app/gis-management/allaround/allaround.component.ts +++ b/src/app/gis-management/allaround/allaround.component.ts @@ -75,8 +75,8 @@ 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, + id:'gisImgDialog'}); dialogRef.afterClosed().subscribe(); } else{ const config = new MatSnackBarConfig(); diff --git a/src/app/gis-management/allaround/imgdetails.component.html b/src/app/gis-management/allaround/imgdetails.component.html index b341979..c9c6055 100644 --- a/src/app/gis-management/allaround/imgdetails.component.html +++ b/src/app/gis-management/allaround/imgdetails.component.html @@ -1,18 +1,21 @@ -
图片详情
-
-
-
- -
-
-
- -
-
+
+ +
+
+
+ +
+
+
+ + +
+
+
+
- -
- -
\ No newline at end of file diff --git a/src/app/gis-management/fire-facilities/fire-facilities.component.scss b/src/app/gis-management/fire-facilities/fire-facilities.component.scss index 0ec681a..537daea 100644 --- a/src/app/gis-management/fire-facilities/fire-facilities.component.scss +++ b/src/app/gis-management/fire-facilities/fire-facilities.component.scss @@ -194,8 +194,9 @@ //img图片列表页面 .imageList { - width: 100%; - height: 100%; + width:1350px; + height:700px; + overflow-y: auto; .imageListBox { width: 100%; @@ -219,4 +220,14 @@ } } } - \ No newline at end of file + @media screen and (max-width:1300px){ + .imageList{ + width:911px; + height:570px; + .imageListBox { + .imagesBox{ + width:275px; + } + } + } + } \ No newline at end of file diff --git a/src/app/gis-management/fire-facilities/fire-facilities.component.ts b/src/app/gis-management/fire-facilities/fire-facilities.component.ts index 6fb00eb..dbc99d3 100644 --- a/src/app/gis-management/fire-facilities/fire-facilities.component.ts +++ b/src/app/gis-management/fire-facilities/fire-facilities.component.ts @@ -420,7 +420,7 @@ export class FireFacilitiesComponent 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'; @@ -446,7 +446,7 @@ export class FireFacilitiesComponent 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'; diff --git a/src/app/gis-management/fire-facilities/imagesdata.component.ts b/src/app/gis-management/fire-facilities/imagesdata.component.ts index d82be4e..4a86c14 100644 --- a/src/app/gis-management/fire-facilities/imagesdata.component.ts +++ b/src/app/gis-management/fire-facilities/imagesdata.component.ts @@ -34,8 +34,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/gis-management/fire-facilities/previewImg.html b/src/app/gis-management/fire-facilities/previewImg.html index 109fba0..7b3e203 100644 --- a/src/app/gis-management/fire-facilities/previewImg.html +++ b/src/app/gis-management/fire-facilities/previewImg.html @@ -6,20 +6,22 @@ * @LastEditors: sueRimn * @LastEditTime: 2020-11-27 08:47:38 --> -
图片详情
-
-
-
- -
+
+
图片详情
+
+
+
+ +
+
-
- - -
-
+ + +
+
+
+ +
+ +
- -
- -
\ No newline at end of file diff --git a/src/app/gis-management/fire-facilities/realistic-picture.component.scss b/src/app/gis-management/fire-facilities/realistic-picture.component.scss index 075375c..ac615a5 100644 --- a/src/app/gis-management/fire-facilities/realistic-picture.component.scss +++ b/src/app/gis-management/fire-facilities/realistic-picture.component.scss @@ -156,19 +156,37 @@ -//预览图片 -.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: 588px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } + } } + diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.html b/src/app/gis-management/gis-labeling/gis-labeling.component.html index 36afe0e..19fe6b8 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.html +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.html @@ -81,9 +81,9 @@
- +
- + diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.scss b/src/app/gis-management/gis-labeling/gis-labeling.component.scss index c234832..cd26292 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.scss +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.scss @@ -1,8 +1,8 @@ .content { width: 100%; height: 100%; - min-width: 1024px; - min-height: 768px; + // min-width: 1024px; + // min-height: 768px; box-sizing: border-box; padding: 1px; position: relative; @@ -22,6 +22,7 @@ box-sizing: border-box; padding: 3px; } + //左侧工作区 显隐图标 .publicButton { display: block; @@ -37,6 +38,7 @@ .leftHide { left: 400px; } + .leftShow { left: 0px;; } @@ -364,3 +366,13 @@ outline-color: #FFFFFF; } } + + +@media screen and (min-width:1200px) and (max-width:1300px){ + .leftDiv { + width: 328px; + } + #leftHide{ + left: 328px; + } +} \ No newline at end of file diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts index 498da37..9c912de 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -782,7 +782,7 @@ export class GisLabelingComponent implements OnInit {
查看预案
分享
-
` +
` // 创建一个自定义内容的 infowindow 实例 this.infoWindow = new AMap.InfoWindow({ position: [e.location.x,e.location.y], @@ -810,8 +810,7 @@ export class GisLabelingComponent implements OnInit { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(e) })//分享点击事件 }) - - this.map.setZoomAndCenter(13,marker._position); //设置地图中心点 + this.map.setZoomAndCenter(13,[marker._position[0],marker._position[1]+0.015]); //设置地图中心点 this.allCompany = [] } else { const config = new MatSnackBarConfig(); diff --git a/src/app/gis-management/key-site-look/key-site.component.scss b/src/app/gis-management/key-site-look/key-site.component.scss index 5186f22..0f6cce4 100644 --- a/src/app/gis-management/key-site-look/key-site.component.scss +++ b/src/app/gis-management/key-site-look/key-site.component.scss @@ -121,19 +121,35 @@ table { .rotateA {transform: rotate(90deg) scale(0.75);} .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: 588px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } + } } diff --git a/src/app/gis-management/key-site-look/key-site.component.ts b/src/app/gis-management/key-site-look/key-site.component.ts index 6e77fb0..130ca09 100644 --- a/src/app/gis-management/key-site-look/key-site.component.ts +++ b/src/app/gis-management/key-site-look/key-site.component.ts @@ -159,8 +159,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/gis-management/key-site-look/keysiteimgs.component.html b/src/app/gis-management/key-site-look/keysiteimgs.component.html index 992faec..cced074 100644 --- a/src/app/gis-management/key-site-look/keysiteimgs.component.html +++ b/src/app/gis-management/key-site-look/keysiteimgs.component.html @@ -1,18 +1,21 @@ -
图片详情
-
-
-
- -
-
-
- -
-
+
+
图片详情
+
+
+
+ +
+
+
+ + +
+
+
+ +
+ +
- -
- -
\ No newline at end of file diff --git a/src/app/gis-management/plan-list/openPlanTool.html b/src/app/gis-management/plan-list/openPlanTool.html index 9c385b7..2c411a2 100644 --- a/src/app/gis-management/plan-list/openPlanTool.html +++ b/src/app/gis-management/plan-list/openPlanTool.html @@ -1,3 +1,3 @@ -
+
-
\ No newline at end of file +
diff --git a/src/app/gis-management/plan-list/openPlanTool.scss b/src/app/gis-management/plan-list/openPlanTool.scss index e69de29..2a259d1 100644 --- a/src/app/gis-management/plan-list/openPlanTool.scss +++ b/src/app/gis-management/plan-list/openPlanTool.scss @@ -0,0 +1,10 @@ +.divbox{ + width: 1500px; + height:850px +} +@media screen and (min-width:1000px) and (max-width:1400px){ + .divbox{ + width: 950px; + height: 618px; + } +} \ No newline at end of file diff --git a/src/app/gis-management/plan-list/plan-list.component.scss b/src/app/gis-management/plan-list/plan-list.component.scss index b346dcf..7649972 100644 --- a/src/app/gis-management/plan-list/plan-list.component.scss +++ b/src/app/gis-management/plan-list/plan-list.component.scss @@ -27,7 +27,6 @@ div{ width: 110px; height: 110px; - img{ width: 100%; height: 100%; @@ -41,4 +40,9 @@ width: 110px; } } + @media screen and (min-width:1200px) and (max-width:1300px){ + .contantitem{ + margin-right: 30px; + } + } } \ 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 1b56d2f..cb7a60b 100644 --- a/src/app/gis-management/plan-list/plan-list.component.ts +++ b/src/app/gis-management/plan-list/plan-list.component.ts @@ -51,8 +51,6 @@ export class PlanListComponent implements OnInit { sessionStorage.setItem("companyId",this.unitId) let data = {select: item, key: index, allBuildings: this.allBuildings} let dialogRef = this.dialog.open(OpenPlanToolDialog,{//调用open方法打开对话框并且携带参数过去 - width: '1500px', - height:'850px', id:'openPlanToolDialog', data }); diff --git a/src/app/gis-management/realistic-picture-look/previewImg.html b/src/app/gis-management/realistic-picture-look/previewImg.html index 1cde6b9..6261a50 100644 --- a/src/app/gis-management/realistic-picture-look/previewImg.html +++ b/src/app/gis-management/realistic-picture-look/previewImg.html @@ -1,17 +1,19 @@ -
图片详情
-
-
-
- -
+
+
图片详情
+
+
+
+ +
+
-
- - -
-
+ + +
+
+
+ +
+ +
- -
- -
\ No newline at end of file diff --git a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss index 05d59e7..c4ef540 100644 --- a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss +++ b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss @@ -84,6 +84,16 @@ margin-left: 5%; margin-top: 7%; } + @media screen and (max-width:1300px){ + img{ + width: 138px; + height: 100px; + margin-left: 5%; + margin-top: 7%; + } + } + + input{ width: 80%; border: none; @@ -211,19 +221,35 @@ -//预览图片 -.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: 588px; + //预览图片 + .previewImgBox { + width: 800px; + height: 500px; + text-align: center; + } + } +} \ No newline at end of file diff --git a/src/app/gis-management/realistic-picture-look/realistic-picture.component.ts b/src/app/gis-management/realistic-picture-look/realistic-picture.component.ts index 262d8c2..71345c9 100644 --- a/src/app/gis-management/realistic-picture-look/realistic-picture.component.ts +++ b/src/app/gis-management/realistic-picture-look/realistic-picture.component.ts @@ -129,8 +129,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/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index 9cc69c0..9c962df 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -47,16 +47,16 @@
-
+
keyboard_arrow_up keyboard_arrow_down -
-
+
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.scss b/src/app/ui/collection-tools-plan/collection-tools.component.scss index e99f1d4..530106a 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.scss +++ b/src/app/ui/collection-tools-plan/collection-tools.component.scss @@ -139,7 +139,7 @@ border: 1px solid #E6EAEE; width: 235px; left: 0; - z-index: 111; + z-index: 112; .leftDragDiv{ position: absolute; right: 0; @@ -156,6 +156,15 @@ border: 1px solid #E6EAEE; width: 235px; right: 0; + } + @media screen and (min-width:1200px) and (max-width:1300px){ + .functionalDomainLeft{ + min-width: 195px; + width: 195px; + } + .functionalDomainRight{ + width: 195px; + } } //右边导航栏显示隐藏 .togglePanel2 { diff --git a/src/app/ui/collection-tools-plan/panel.scss b/src/app/ui/collection-tools-plan/panel.scss index 09b8ceb..96ef92f 100644 --- a/src/app/ui/collection-tools-plan/panel.scss +++ b/src/app/ui/collection-tools-plan/panel.scss @@ -24,7 +24,10 @@ .hover { width: 18px; height: 18px; - margin-left: 90px; + // margin-left: 90px; + position: absolute; + right: 26px; + z-index:112; border: 1px solid #999; border-radius: 3px; .mat-icon {font-size: 18px; color: #999;} diff --git a/src/assets/css/newStyle.css b/src/assets/css/newStyle.css index 0ac2d32..20ddbcd 100644 --- a/src/assets/css/newStyle.css +++ b/src/assets/css/newStyle.css @@ -531,3 +531,8 @@ z-index: */ /*# sourceMappingURL=style.css.map */ +@media screen and (min-width:1200px) and (max-width:1300px){ + #chartMap{ + padding-left: 25px; + } +} \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index a3aae23..9938e5b 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -139,7 +139,7 @@ table td.mat-footer-cell:last-of-type{ } //弹出框样式取消padding -#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater,#videodialog,#addLinkageForce,#videodialog2{ +#shareDialog,#lookPlanDialog,#openPlanToolDialog,#addWater,#videodialog,#addLinkageForce,#videodialog2,#gisImgDialog{ padding: 0; }