|
@@ -3755,27 +3755,27 @@
|
|
|
}
|
|
|
if(d.is_lamp == 1){
|
|
|
let lampType = '';
|
|
|
- let bgColor = '';
|
|
|
+ // let bgColor = '';
|
|
|
let borderColor = '';
|
|
|
if(d.lampstatus == '0'){
|
|
|
d.runningState = 'malfunction'
|
|
|
lampType = 'fault'
|
|
|
- bgColor = '#ff0505';
|
|
|
+ // bgColor = '#ff0505';
|
|
|
borderColor = 'rgba(255, 5, 5, 0.14)';
|
|
|
}else{
|
|
|
d.runningState = 'malfunction'
|
|
|
if(d.netStatus == '0'){
|
|
|
lampType = 'off-line';
|
|
|
- bgColor = '#7c7c7c';
|
|
|
+ // bgColor = '#7c7c7c';
|
|
|
borderColor = 'rgba(167, 167, 167, 0.18)';
|
|
|
}else{
|
|
|
if(d.status == '1'){
|
|
|
lampType = 'on'
|
|
|
- bgColor = 'linear-gradient(#fc8440, #fe7121)';
|
|
|
+ // bgColor = 'linear-gradient(#fc8440, #fe7121)';
|
|
|
borderColor = 'rgba(253, 122, 48, 0.18)';
|
|
|
}else{
|
|
|
lampType = 'off'
|
|
|
- bgColor = '#ffb68d';
|
|
|
+ // bgColor = '#ffb68d';
|
|
|
borderColor = 'rgba(242, 223, 199, 0.18)';
|
|
|
}
|
|
|
}
|
|
@@ -4152,7 +4152,7 @@
|
|
|
if((!this_.lampEdit && d.id != this_.lampId) || this_.lampEdit){
|
|
|
if(d.is_lamp == 1){
|
|
|
let lampType = '';
|
|
|
- let bgColor = '';
|
|
|
+ // let bgColor = '';
|
|
|
let borderColor = '';
|
|
|
if(d.lampstatus == '0'){
|
|
|
d.runningState = '故障';
|
|
@@ -4160,7 +4160,7 @@
|
|
|
d.runningState = 'malfunction'
|
|
|
}
|
|
|
lampType = 'fault'
|
|
|
- bgColor = '#ff0505';
|
|
|
+ // bgColor = '#ff0505';
|
|
|
borderColor = 'rgba(255, 5, 5, 0.14)';
|
|
|
}else{
|
|
|
d.runningState = '正常'
|
|
@@ -4169,16 +4169,16 @@
|
|
|
}
|
|
|
if(d.netStatus == '0'){
|
|
|
lampType = 'off-line';
|
|
|
- bgColor = '#7c7c7c';
|
|
|
+ // bgColor = '#7c7c7c';
|
|
|
borderColor = 'rgba(167, 167, 167, 0.18)';
|
|
|
}else{
|
|
|
if(d.status == '1'){
|
|
|
lampType = 'on'
|
|
|
- bgColor = 'linear-gradient(#fc8440, #fe7121)';
|
|
|
+ // bgColor = 'linear-gradient(#fc8440, #fe7121)';
|
|
|
borderColor = 'rgba(253, 122, 48, 0.18)';
|
|
|
}else{
|
|
|
lampType = 'off'
|
|
|
- bgColor = '#ffb68d';
|
|
|
+ // bgColor = '#ffb68d';
|
|
|
borderColor = 'rgba(242, 223, 199, 0.18)';
|
|
|
}
|
|
|
}
|
|
@@ -4257,7 +4257,7 @@
|
|
|
position:[d.longitude, d.latitude], // 基点位置
|
|
|
offset:new AMap.Pixel(-(d.count.toString().length*8+20)/2,-27/2) // 相对于基点的偏移位置
|
|
|
});
|
|
|
- marker.on('click',function(e){
|
|
|
+ marker.on('click',function(){
|
|
|
// console.log(e)
|
|
|
this_.map.setZoomAndCenter(18, [d.f_longitude,d.f_latitude]);
|
|
|
})
|