diff --git a/package.json b/package.json
index fb9aaf4..4cadcf1 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
"axios": "^1.2.2",
"core-js": "^3.8.3",
"echarts": "^5.4.1",
- "echarts-gl": "^2.0.9",
"element-ui": "^2.15.12",
"highcharts": "^9.3.3",
"js-cookie": "^3.0.1",
diff --git a/src/App.vue b/src/App.vue
index b05ed17..ae2acd1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,17 +27,21 @@
.BMap_pop {
margin-top: 0.5rem;
- div{
+
+ div {
border: 0 !important;
background-color: transparent !important;
}
- div{
- img{
+
+ div {
+ img {
display: none;
}
}
- .BMap_center{
+
+ .BMap_center {
top: -0.2rem !important;
+ width:3.97rem !important;
height: 2.2rem !important;
background-image: url(@/assets/images/infowindow_bg.png) !important;
background-color: transparent !important;
@@ -45,6 +49,16 @@
border: 0 !important;
background-size: 100% 100% !important;
}
+
+ img {
+ top: 0 !important;
+ width: 0.14rem !important;
+ height: 0.14rem !important;
+ }
+}
+
+.BMap_shadow {
+ display: none;
}
.BMap_bubble_pop {
diff --git a/src/api/data.js b/src/api/data.js
index 144b0fd..8a2fe16 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -1,7 +1,15 @@
import request from '@/util/axios'
//公参
-export const carList = [{ cardNo: '鲁LE990Z', deviceId: '41000001254', key: 'NDEwMDAwMDEyNTQ=' }, { cardNo: '鲁LD35633', deviceId: '41000001270', key: 'NDEwMDAwMDEyNzA=' }, ];
+export const carList = [
+ { cardNo: '鲁LT728K', deviceId: '41000001292', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LR960V', deviceId: '41000001265', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LB568X', deviceId: '41000001286', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LX835N', deviceId: '41000001296', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LF990N', deviceId: '41000001253', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LD35633', deviceId: '41000001270', key: 'NDEwMDAwMDEyNTQ=' },
+ { cardNo: '鲁LE990Z', deviceId: '41000001254', key: 'NDEwMDAwMDEyNzA=' },
+];
export const appKey = '69800851-4554-4EEC-8D12-E4211B952798';//轮子appkey
export const key = '266843ed-5d4f-472c-beec-e5e50a114d47';//中瑞key
diff --git a/src/views/components/carMile.vue b/src/views/components/carMile.vue
index a1abc9d..f24327d 100644
--- a/src/views/components/carMile.vue
+++ b/src/views/components/carMile.vue
@@ -11,7 +11,7 @@
| 排名 |
车牌号 |
- 昨日里程 (km/h) |
+ 昨日里程 (km) |
轨迹查询 |
@@ -110,6 +110,10 @@ export default {
color: #fff;
font-size: 0.14rem;
padding: 0.08rem 0;
+ div{
+ color: #fff;
+ font-size: 0.14rem;
+ }
}
&:nth-child(1) {
diff --git a/src/views/components/pathMap.vue b/src/views/components/pathMap.vue
index c6113c3..509fef1 100644
--- a/src/views/components/pathMap.vue
+++ b/src/views/components/pathMap.vue
@@ -29,15 +29,13 @@ export default {
beforeCreate() {
clearInterval(this.setInterval);
},
+ created() {
+ },
mounted() {
this.initMap();
window.addEventListener('resize', () => {
- // if (this.setInterval) {
- // clearInterval(this.setInterval);
- // }
- // this.initMap();
if (this.baiduMap) {
- this.baiduMap.centerAndZoom(point, 11);
+ this.backMap();
}
});
},
@@ -56,7 +54,7 @@ export default {
this.baiduMap = new BMap.Map('container');
this.baiduMap.centerAndZoom(point, 11);
this.baiduMap.enableScrollWheelZoom(true);
- this.baiduMap.setMapStyle({style:'midnight'});
+ this.baiduMap.setMapStyle({ style: 'midnight' });
// this.baiduMap.setMapStyleV2({
// styleJson: styleJson
// })
@@ -111,7 +109,9 @@ export default {
this.queryLunz(item.deviceId, item.key, item.cardNo, index);
})
clearInterval(this.setInterval);
+ let timer = 0;
this.setInterval = setInterval(() => {
+ console.log(timer++)
// this.view.removeAllLayers();
this.markList.map(mark => {
this.baiduMap.removeOverlay(mark);
@@ -161,12 +161,12 @@ export default {
let sContent = `
${carNo}
-
${this.locationStatus[res.Data.SbcStatus]}
+
${this.locationStatus[res.Data.SbcStatus]}
${res.Data.spd}km/h
-
+
最后定位时间:
${res.Data.GPSTimeStamp.replace("T", " ")}
-
+
`;
let infoWindow = new BMap.InfoWindow(sContent, { width: 367, height: 220 });
// marker添加点击事件
@@ -255,10 +255,10 @@ export default {
}
param = {
"IMEI": deviceId,
- "StartDateTime":dateFormat(new Date(yesterDay2), 'yyyy-MM-dd'),
- "EndDateTime":dateFormat(new Date(yesterDay1), 'yyyy-MM-dd'),
- "MaxValues":500,
- "LocType":1
+ "StartDateTime": dateFormat(new Date(yesterDay2), 'yyyy-MM-dd'),
+ "EndDateTime": dateFormat(new Date(yesterDay1), 'yyyy-MM-dd'),
+ "MaxValues": 500,
+ "LocType": 1
}
lunzApi.getLocationsByImei2(this.appKey, param).then(res => {
if (res.Data == null) {
diff --git a/src/views/dashboard/home.vue b/src/views/dashboard/home.vue
index f5d7d38..9fa3c93 100644
--- a/src/views/dashboard/home.vue
+++ b/src/views/dashboard/home.vue
@@ -234,7 +234,6 @@ HighchartsMore(Highcharts);
HighchartsDrilldown(Highcharts);
Highcharts3D(Highcharts);
Highmaps(Highcharts);
-import "echarts-gl";
import axios from "axios";
import * as XLSX from "xlsx/xlsx.mjs";
import Swiper from "swiper";