Browse Source

no message

XAWDJ0277HWXPT2\Administrator 4 years atrás
parent
commit
e273693ee2

web/css/chunk-476b0587.48a83204.css → web/css/chunk-11144905.48a83204.css


File diff suppressed because it is too large
+ 1 - 1
web/index.html


File diff suppressed because it is too large
+ 2 - 2
web/js/app.ca619ff7.js


File diff suppressed because it is too large
+ 1 - 1
web/js/app.ca619ff7.js.map


File diff suppressed because it is too large
+ 4 - 0
web/js/chunk-11144905.f036052e.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-11144905.f036052e.js.map


File diff suppressed because it is too large
+ 0 - 4
web/js/chunk-476b0587.5425d601.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-476b0587.5425d601.js.map


+ 18 - 18
webConfig/src/views/GISMap.vue

@@ -2979,11 +2979,11 @@
                         }
 
                         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>';
-                        }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({
                           position:new google.maps.LatLng(Number(this.lampLatitude),Number(this.lampLongitude)),
                           map: this_.map,
@@ -3090,11 +3090,11 @@
                         this.lampLongitude = data.data.longitude;
                         this.lampLatitude = data.data.latitude;
                         let url;
-                        if(this_.mapTCtype == 'TileLayer'){
+                        // if(this_.mapTCtype == 'TileLayer'){
                             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) {
                             this_.positionPicker = new PositionPicker({
@@ -3846,19 +3846,19 @@
                                 }
                             }
                             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 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({
                               position:new google.maps.LatLng(Number(d.latitude),Number(d.longitude)),
                               map: this_.map,
 
                               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}
                                         <div class="map_lamp_info map_lamp_info_${d.id}">
                                         <div class="map_lamp_info_bg">
@@ -4254,16 +4254,16 @@
                                     }
                                 }
                                 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>`
-                                }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({
                                     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}
                                             <div class="map_lamp_info map_lamp_info_${d.id}">
                                             <div class="map_lamp_info_bg">