|
|
@@ -1132,6 +1132,7 @@
|
|
|
historyEcharts:false,
|
|
|
},
|
|
|
mapEnIsTrue:false,
|
|
|
+ myChart:null,
|
|
|
}
|
|
|
},
|
|
|
computed:{
|
|
|
@@ -1147,7 +1148,8 @@
|
|
|
GoogleJS_frequency:'GoogleJS_frequency',
|
|
|
role:'role',
|
|
|
sideBarCompanyType:'sideBarCompanyType',
|
|
|
- browserLanguage:'browserLanguage'
|
|
|
+ browserLanguage:'browserLanguage',
|
|
|
+ updateRemRatio:'updateRemRatio',
|
|
|
})
|
|
|
},
|
|
|
components:{sideBarIdcol},
|
|
|
@@ -1429,10 +1431,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this_.map.getZoom(),
|
|
|
lampid:'-1',
|
|
|
},
|
|
|
@@ -1510,10 +1512,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this_.map.getZoom(),
|
|
|
lampid:'-1',
|
|
|
},
|
|
|
@@ -1954,7 +1956,7 @@
|
|
|
}
|
|
|
this.$nextTick(function(){
|
|
|
if(document.getElementsByClassName('history_echarts')[0]){
|
|
|
- const myChart = this.$echarts.init(document.getElementsByClassName('history_echarts')[0]);
|
|
|
+ this.myChart = this.$echarts.init(document.getElementsByClassName('history_echarts')[0]);
|
|
|
let arry = [],hh,month,dd,mm;
|
|
|
for(let d of data.updatetime){
|
|
|
d = new Date(d);month = d.getMonth()+1;dd = d.getDate();
|
|
|
@@ -2046,17 +2048,17 @@
|
|
|
},
|
|
|
series: series,
|
|
|
};
|
|
|
- myChart.setOption(option,true);
|
|
|
+ this.myChart.setOption(option,true);
|
|
|
|
|
|
- window.onresize = function(){
|
|
|
- if(document.body.offsetWidth <1500){
|
|
|
- this_.legendWidth = '180px';
|
|
|
- }else{
|
|
|
- this_.legendWidth = 'auto';
|
|
|
- }
|
|
|
- myChart.setOption(option,true);
|
|
|
- myChart.resize();
|
|
|
- }
|
|
|
+ // window.onresize = function(){
|
|
|
+ // if(document.body.offsetWidth <1500){
|
|
|
+ // this_.legendWidth = '180px';
|
|
|
+ // }else{
|
|
|
+ // this_.legendWidth = 'auto';
|
|
|
+ // }
|
|
|
+ // myChart.setOption(option,true);
|
|
|
+ // myChart.resize();
|
|
|
+ // }
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -3665,10 +3667,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this_.map.getZoom(),
|
|
|
lampid:lampId,
|
|
|
},
|
|
|
@@ -3695,10 +3697,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this.getZoom(),
|
|
|
lampid:lampId,
|
|
|
},
|
|
|
@@ -3739,11 +3741,17 @@
|
|
|
}else{
|
|
|
this_.mapTCtype = 'Satellite'
|
|
|
}
|
|
|
+ console.log(this_.mapTCtype)
|
|
|
for(let d of data){
|
|
|
if(!isTrue){
|
|
|
let decrypt = this_.bd_decrypt(d.longitude,d.latitude,this_.mapTCtype == 'Satellite');
|
|
|
d.longitude = decrypt.lng;
|
|
|
d.latitude = decrypt.lat;
|
|
|
+ if(d.f_longitude&&d.f_latitude){
|
|
|
+ let f_decrypt = this_.bd_decrypt(d.f_longitude,d.f_latitude,this_.mapTCtype == 'Satellite');
|
|
|
+ d.f_longitude = f_decrypt.lng;
|
|
|
+ d.f_latitude = f_decrypt.lat;
|
|
|
+ }
|
|
|
}
|
|
|
if(d.is_lamp == 1){
|
|
|
let lampType = '';
|
|
|
@@ -3774,7 +3782,8 @@
|
|
|
}
|
|
|
let lamp_icon;
|
|
|
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>`
|
|
|
}else{
|
|
|
lamp_icon = `<div class="lamp lamp_${d.id} ${lampType} lamp_icon lamp_Satellite_${lampType}_${d.direction}"></div>`
|
|
|
}
|
|
|
@@ -3877,8 +3886,8 @@
|
|
|
e.cancelBubble = true; //IE阻止冒泡方法
|
|
|
}
|
|
|
// console.log(e,this.getPosition())
|
|
|
- this_.map.setZoom(this_.map.getZoom()+1);
|
|
|
- this_.map.setCenter(new google.maps.LatLng(this.getPosition().lat(),this.getPosition().lng()));
|
|
|
+ this_.map.setZoom(18);
|
|
|
+ this_.map.setCenter(new google.maps.LatLng(Number(d.f_latitude),Number(d.f_longitude)));
|
|
|
})
|
|
|
this_.markerListHCEn.push(this_.marker)
|
|
|
}else if(d.is_video == 1){
|
|
|
@@ -4034,10 +4043,10 @@
|
|
|
section:this.roadId,
|
|
|
type:this.operationType,
|
|
|
keyword:this.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this.map.getZoom(),
|
|
|
lampid:lampId,
|
|
|
},
|
|
|
@@ -4064,10 +4073,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this_.map.getZoom(),
|
|
|
lampid:lampId,
|
|
|
},
|
|
|
@@ -4101,10 +4110,10 @@
|
|
|
section:this_.roadId,
|
|
|
type:this_.operationType,
|
|
|
keyword:this_.keyword,
|
|
|
- lng_low:encrypt_low.bd_lng,
|
|
|
- lat_low:encrypt_low.bd_lat,
|
|
|
- lng_high:encrypt_high.bd_lng,
|
|
|
- lat_high:encrypt_high.bd_lat,
|
|
|
+ lng_low:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_low.bd_lng:encrypt_high.bd_lng,
|
|
|
+ lat_low:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_low.bd_lat:encrypt_high.bd_lat,
|
|
|
+ lng_high:encrypt_low.bd_lng<encrypt_high.bd_lng?encrypt_high.bd_lng:encrypt_low.bd_lng,
|
|
|
+ lat_high:encrypt_low.bd_lat<encrypt_high.bd_lat?encrypt_high.bd_lat:encrypt_low.bd_lat,
|
|
|
multiple:this_.map.getZoom(),
|
|
|
lampid:lampId,
|
|
|
},
|
|
|
@@ -4133,6 +4142,11 @@
|
|
|
let wgs84togcj02 = this_.wgs84togcj02(d.longitude,d.latitude);
|
|
|
d.longitude = wgs84togcj02.lng;
|
|
|
d.latitude = wgs84togcj02.lat;
|
|
|
+ if(d.f_longitude&&d.f_latitude){
|
|
|
+ let f_wgs84togcj02 = this_.wgs84togcj02(d.f_longitude,d.f_latitude);
|
|
|
+ d.f_longitude = f_wgs84togcj02.lng;
|
|
|
+ d.f_latitude = f_wgs84togcj02.lat;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if((!this_.lampEdit && d.id != this_.lampId) || this_.lampEdit){
|
|
|
@@ -4171,7 +4185,7 @@
|
|
|
}
|
|
|
let lamp_icon;
|
|
|
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>`
|
|
|
}
|
|
|
@@ -4245,7 +4259,7 @@
|
|
|
});
|
|
|
marker.on('click',function(e){
|
|
|
// console.log(e)
|
|
|
- this_.map.setZoomAndCenter(this_.map.getZoom()+1, [e.lnglat.lng,e.lnglat.lat]);
|
|
|
+ this_.map.setZoomAndCenter(18, [d.f_longitude,d.f_latitude]);
|
|
|
})
|
|
|
this_.map.add(marker);
|
|
|
this_.markerListHC.push(marker)
|
|
|
@@ -4495,17 +4509,18 @@
|
|
|
},
|
|
|
//百度坐标转高德（传入经度、纬度）
|
|
|
bd_decrypt(lng, lat,isGcj02) {
|
|
|
-
|
|
|
+ lng = Number(lng);
|
|
|
+ lat = Number(lat);
|
|
|
var PI = 3.1415926535897932384626;
|
|
|
var a = 6378245.0;
|
|
|
var ee = 0.00669342162296594323;
|
|
|
function out_of_china(lng, lat) {
|
|
|
return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
|
|
|
}
|
|
|
- if (out_of_china(lng, lat)&&isGcj02) {
|
|
|
+ console.log(lng,lat,out_of_china(lng, lat),isGcj02)
|
|
|
+ if (out_of_china(lng, lat)||isGcj02) {
|
|
|
return {lng: lng, lat: lat}
|
|
|
- }
|
|
|
- else {
|
|
|
+ }else {
|
|
|
var dlat = this.transformlat(lng - 105.0, lat - 35.0);
|
|
|
var dlng = this.transformlng(lng - 105.0, lat - 35.0);
|
|
|
var radlat = lat / 180.0 * PI;
|
|
|
@@ -4521,6 +4536,8 @@
|
|
|
},
|
|
|
//高德坐标转百度（传入经度、纬度）
|
|
|
bd_encrypt(lng, lat,isWgs84) {
|
|
|
+ lng = Number(lng);
|
|
|
+ lat = Number(lat);
|
|
|
var PI = 3.1415926535897932384626;
|
|
|
var a = 6378245.0;
|
|
|
var ee = 0.00669342162296594323;
|
|
|
@@ -4553,6 +4570,8 @@
|
|
|
}
|
|
|
},
|
|
|
wgs84togcj02(lng, lat) {
|
|
|
+ lng = Number(lng);
|
|
|
+ lat = Number(lat);
|
|
|
// var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
|
|
|
var PI = 3.1415926535897932384626;
|
|
|
var a = 6378245.0;
|
|
|
@@ -4581,6 +4600,8 @@
|
|
|
// }
|
|
|
},
|
|
|
gcj02towgs84(lng, lat) {
|
|
|
+ lng = Number(lng);
|
|
|
+ lat = Number(lat);
|
|
|
// var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
|
|
|
var PI = 3.1415926535897932384626;
|
|
|
var a = 6378245.0;
|
|
|
@@ -4799,7 +4820,19 @@
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
+ updateRemRatio(){
|
|
|
+
|
|
|
+ if(document.body.offsetWidth <1500){
|
|
|
+ this.legendWidth = '180px';
|
|
|
+ }else{
|
|
|
+ this.legendWidth = 'auto';
|
|
|
+ }
|
|
|
+ // myChart.setOption(option,true);
|
|
|
+ if(this.myChart){
|
|
|
+ this.myChart.resize();
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -4813,14 +4846,14 @@
|
|
|
&.Lamp_active{
|
|
|
// transform: translate(-5px, -5px);
|
|
|
position: relative;
|
|
|
- top: -5px;
|
|
|
- left: -5px;
|
|
|
+ // top: -5px;
|
|
|
+ // left: -5px;
|
|
|
>.lamp{
|
|
|
- width: 26px !important;
|
|
|
- height: 26px !important;
|
|
|
+ width: 38px !important;
|
|
|
+ height: 38px !important;
|
|
|
position: relative;
|
|
|
- top: 0px;
|
|
|
- left: 0px;
|
|
|
+ // top: 0px;
|
|
|
+ // left: 0px;
|
|
|
}
|
|
|
>.map_lamp_info{
|
|
|
top: -155px;left: -160px;
|
|
|
@@ -4833,7 +4866,7 @@
|
|
|
border: none !important;
|
|
|
cursor: pointer;
|
|
|
.lamp_icon{
|
|
|
- width: 42px;height: 42px;
|
|
|
+ width: 38px;height: 38px;
|
|
|
background-size: 100% 100%;
|
|
|
background-position: 0 0;
|
|
|
}
|
|
|
@@ -4888,6 +4921,68 @@
|
|
|
.lamp_Satellite_fault_3{
|
|
|
background-image: url('../img/GIS/lamp_type/lamp_night_fault_3.png');
|
|
|
}
|
|
|
+ .lamp_icon_new{
|
|
|
+ width: 38px;height: 38px;
|
|
|
+ background-size: 100% 100%;
|
|
|
+ background-position: 0 0;
|
|
|
+ &.lamp_Satellite_off_0{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_fault_0{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_fault_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_fault_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_off-line_0{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off-line_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off-line_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_on_0{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_on_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_on_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .lamp_TileLayer{
|
|
|
+ border: none !important;
|
|
|
+ cursor: pointer;
|
|
|
+ .lamp_icon_new{
|
|
|
+ width: 38px;height: 38px;
|
|
|
+ background-size: 100% 100%;
|
|
|
+ background-position: 0 0;
|
|
|
+ &.lamp_Satellite_off{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_fault{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_fault_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_fault_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_off-line{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off-line_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_off-line_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ &.lamp_Satellite_on{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_on_0.png');
|
|
|
+ &.Lamp_active{
|
|
|
+ background-image: url('../img/GIS/lamp_2d_type/lamp_on_1.png');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/*历史弹框*/
|
XAWDJ0277HWXPT2\Administrator
