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..f117852 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: 480px;
+ width: 400px;
position: absolute;
right: 30px;
top: 15px;
@@ -277,7 +277,7 @@
cursor: pointer;
}
.submit{
- width: 68px;
+ width: 60px;
height: 30px;
text-align: center;
border: 0;
@@ -287,7 +287,7 @@
color: #fff;
}
.cancel{
- width: 96px;
+ width: 70px;
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 a0623cd..0d49be6 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -19,9 +19,9 @@ 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/areaicon.png'}, */
- {name:'图层选择',iconImg:'/assets/images/coverageicon.png'}]
+ // {name:'测量工具',iconImg:'/assets/images/distanceicon.png'},
+ // {name:'图层选择',iconImg:'/assets/images/coverageicon.png'}
+ ]
keyUnitList:any = []
waterList = [
{id:'0',name:'消火栓',selected:false},
@@ -310,10 +310,7 @@ export class GisLabelingComponent implements OnInit {

导航
-

全景漫游
-

三维场景
-

查看预案
-

分享
+

三维场景编制
`
// 创建一个自定义内容的 infowindow 实例
@@ -325,10 +322,7 @@ 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)
})
@@ -737,10 +731,7 @@ export class GisLabelingComponent implements OnInit {

导航
-

全景漫游
-

三维场景
-

查看预案
-

分享
+

三维场景编制
`
// 创建一个自定义内容的 infowindow 实例
@@ -752,10 +743,7 @@ 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],
@@ -765,10 +753,7 @@ 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 75c3abf..dc99e18 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: 92px;
+ width: 130px;
height: 36px;
background: #FFFFFF;
border: 1px solid #EEF1F5;