From dd38481e0aa73f8c1a55b279946a8c6fc8704c1e Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 13 Jan 2021 10:41:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9B=9E=E9=80=80]=20GIS=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gis-labeling/gis-labeling.component.scss | 6 ++--- .../gis-labeling/gis-labeling.component.ts | 23 +++++++++++++++---- src/styles.scss | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) 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 f117852..c234832 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.scss +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.scss @@ -219,7 +219,7 @@ //右上角div .rightTopBox{ - width: 400px; + width: 480px; position: absolute; right: 30px; top: 15px; @@ -277,7 +277,7 @@ cursor: pointer; } .submit{ - width: 60px; + width: 68px; height: 30px; text-align: center; border: 0; @@ -287,7 +287,7 @@ color: #fff; } .cancel{ - width: 70px; + width: 96px; height: 30px; background: #EEF1F5; opacity: 1; 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 0d49be6..faa2a67 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -19,8 +19,8 @@ export class GisLabelingComponent implements OnInit { selectedTitle:number titleList = [ {name:'重点单位',iconImg:'/assets/images/uniticon.png'}, {name:'水源',iconImg:'/assets/images/watericon.png'}, - // {name:'测量工具',iconImg:'/assets/images/distanceicon.png'}, - // {name:'图层选择',iconImg:'/assets/images/coverageicon.png'} + {name:'测量工具',iconImg:'/assets/images/distanceicon.png'}, + {name:'图层选择',iconImg:'/assets/images/coverageicon.png'} ] keyUnitList:any = [] waterList = [ @@ -310,7 +310,10 @@ export class GisLabelingComponent implements OnInit {
基本信息
导航
-
三维场景编制
+
全景漫游
+
三维场景
+
查看预案
+
分享
` // 创建一个自定义内容的 infowindow 实例 @@ -322,7 +325,10 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(item) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(item) })//导航点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(item) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(item) })//三维场景点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(item) })//查看预案点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(item) })//分享点击事件 }); markerArr.push(labelMarker) }) @@ -731,7 +737,10 @@ export class GisLabelingComponent implements OnInit {
基本信息
导航
-
三维场景编制
+
全景漫游
+
三维场景
+
查看预案
+
分享
` // 创建一个自定义内容的 infowindow 实例 @@ -743,7 +752,10 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 + 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) })//分享点击事件 marker.on('click', (ev) => { //marker点击事件 this.infoWindow = new AMap.InfoWindow({ position: [e.location.x,e.location.y], @@ -753,7 +765,10 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 + 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); //设置地图中心点 diff --git a/src/styles.scss b/src/styles.scss index dc99e18..75c3abf 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -111,7 +111,7 @@ table td.mat-footer-cell:last-of-type{ //gis标点弹出框样式 #gispopupbox{ .btn{ - width: 130px; + width: 92px; height: 36px; background: #FFFFFF; border: 1px solid #EEF1F5;