|
@@ -2979,11 +2979,11 @@
|
|
}
|
|
}
|
|
|
|
|
|
let div;
|
|
let div;
|
|
- if(this_.mapTCtype == 'TileLayer'){
|
|
|
|
|
|
+ // if(this_.mapTCtype == 'TileLayer'){
|
|
div = '<div class="lm_img_mover" style="text-align:center;border:11px solid '+borderColor+'; border-radius:50%;cursor:pointer;"><div style="text-align:center;background:'+bgColor+';background-clip: padding-box;border:2px solid #fff; height: 16px; width: 16px; border-radius:50%;"></div></div>';
|
|
div = '<div class="lm_img_mover" style="text-align:center;border:11px solid '+borderColor+'; border-radius:50%;cursor:pointer;"><div style="text-align:center;background:'+bgColor+';background-clip: padding-box;border:2px solid #fff; height: 16px; width: 16px; border-radius:50%;"></div></div>';
|
|
- }else{
|
|
|
|
- div = `<div class="lm_img_mover" style="width:42px;height:42px;background-image:url(${require('../img/GIS/lamp_type/lamp_night_'+this_.lampType+'_'+data.data.direction+'.png')});background-size:100% 100%;background-position: 0 0;"></div>`;
|
|
|
|
- }
|
|
|
|
|
|
+ // }else{
|
|
|
|
+ // div = `<div class="lm_img_mover" style="width:42px;height:42px;background-image:url(${require('../img/GIS/lamp_type/lamp_night_'+this_.lampType+'_'+data.data.direction+'.png')});background-size:100% 100%;background-position: 0 0;"></div>`;
|
|
|
|
+ // }
|
|
this_.positionPicker = new RichMarker({
|
|
this_.positionPicker = new RichMarker({
|
|
position:new google.maps.LatLng(Number(this.lampLatitude),Number(this.lampLongitude)),
|
|
position:new google.maps.LatLng(Number(this.lampLatitude),Number(this.lampLongitude)),
|
|
map: this_.map,
|
|
map: this_.map,
|
|
@@ -3090,11 +3090,11 @@
|
|
this.lampLongitude = data.data.longitude;
|
|
this.lampLongitude = data.data.longitude;
|
|
this.lampLatitude = data.data.latitude;
|
|
this.lampLatitude = data.data.latitude;
|
|
let url;
|
|
let url;
|
|
- if(this_.mapTCtype == 'TileLayer'){
|
|
|
|
|
|
+ // if(this_.mapTCtype == 'TileLayer'){
|
|
url = require('../img/GIS/'+this_.lampType+'-icon.png');
|
|
url = require('../img/GIS/'+this_.lampType+'-icon.png');
|
|
- }else{
|
|
|
|
- url = require('../img/GIS/lamp_type/lamp_night_'+this_.lampType+'_'+data.data.direction+'.png');
|
|
|
|
- }
|
|
|
|
|
|
+ // }else{
|
|
|
|
+ // url = require('../img/GIS/lamp_type/lamp_night_'+this_.lampType+'_'+data.data.direction+'.png');
|
|
|
|
+ // }
|
|
/*路灯方向*/
|
|
/*路灯方向*/
|
|
AMapUI.loadUI(['misc/PositionPicker'], function(PositionPicker) {
|
|
AMapUI.loadUI(['misc/PositionPicker'], function(PositionPicker) {
|
|
this_.positionPicker = new PositionPicker({
|
|
this_.positionPicker = new PositionPicker({
|
|
@@ -3846,19 +3846,19 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
let lamp_icon;
|
|
let lamp_icon;
|
|
- if(this_.mapTCtype == 'TileLayer'){
|
|
|
|
|
|
+ // if(this_.mapTCtype == 'TileLayer'){
|
|
// lamp_icon = `<div style="text-align:center;background:${bgColor};background-clip:padding-box;border:2px solid #fff; height: 16px; width: 16px; border-radius:50%;" class="lamp lamp_${d.id} ${lampType}"></div>`
|
|
// lamp_icon = `<div style="text-align:center;background:${bgColor};background-clip:padding-box;border:2px solid #fff; height: 16px; width: 16px; border-radius:50%;" class="lamp lamp_${d.id} ${lampType}"></div>`
|
|
lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon_new lamp_Satellite_${lampType}"></div>`
|
|
lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon_new lamp_Satellite_${lampType}"></div>`
|
|
- }else{
|
|
|
|
- lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon lamp_Satellite_${lampType}_${d.direction}"></div>`
|
|
|
|
- }
|
|
|
|
|
|
+ // }else{
|
|
|
|
+ // lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon lamp_Satellite_${lampType}_${d.direction}"></div>`
|
|
|
|
+ // }
|
|
|
|
|
|
this_.marker = new RichMarker({
|
|
this_.marker = new RichMarker({
|
|
position:new google.maps.LatLng(Number(d.latitude),Number(d.longitude)),
|
|
position:new google.maps.LatLng(Number(d.latitude),Number(d.longitude)),
|
|
map: this_.map,
|
|
map: this_.map,
|
|
|
|
|
|
draggable: false,
|
|
draggable: false,
|
|
- content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;cursor: pointer;" class="lamp lamp_${d.id} ${lampType} lamp_${this_.mapTCtype}">
|
|
|
|
|
|
+ content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;cursor: pointer;" class="lamp lamp_${d.id} ${lampType} lamp_TileLayer">
|
|
${lamp_icon}
|
|
${lamp_icon}
|
|
<div class="map_lamp_info map_lamp_info_${d.id}">
|
|
<div class="map_lamp_info map_lamp_info_${d.id}">
|
|
<div class="map_lamp_info_bg">
|
|
<div class="map_lamp_info_bg">
|
|
@@ -4254,16 +4254,16 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
let lamp_icon;
|
|
let lamp_icon;
|
|
- if(this_.mapTCtype == 'TileLayer'){
|
|
|
|
|
|
+ // if(this_.mapTCtype == 'TileLayer'){
|
|
lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon_new lamp_Satellite_${lampType}"></div>`
|
|
lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon_new lamp_Satellite_${lampType}"></div>`
|
|
- }else{
|
|
|
|
- lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon lamp_Satellite_${lampType}_${d.direction}"></div>`
|
|
|
|
- }
|
|
|
|
|
|
+ // }else{
|
|
|
|
+ // lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon lamp_Satellite_${lampType}_${d.direction}"></div>`
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
|
this_.markers.push(new AMap.Marker({
|
|
this_.markers.push(new AMap.Marker({
|
|
position:[d.longitude,d.latitude],
|
|
position:[d.longitude,d.latitude],
|
|
- content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;cursor: pointer;" class="lamp lamp_${d.id} ${lampType} lamp_${this_.mapTCtype}">
|
|
|
|
|
|
+ content: `<div style="text-align:center;border:11px solid ${borderColor};border-radius:50%;cursor: pointer;" class="lamp lamp_${d.id} ${lampType} lamp_TileLayer">
|
|
${lamp_icon}
|
|
${lamp_icon}
|
|
<div class="map_lamp_info map_lamp_info_${d.id}">
|
|
<div class="map_lamp_info map_lamp_info_${d.id}">
|
|
<div class="map_lamp_info_bg">
|
|
<div class="map_lamp_info_bg">
|