|
@@ -176,11 +176,11 @@ export default {
|
|
|
},
|
|
|
timeRange: [new Date(new Date().toLocaleDateString()), new Date(new Date(new Date().toLocaleDateString()).getTime() + (24 * 60 * 60 * 1000)-1000)],
|
|
|
markerIcons: { // 覆盖物图标
|
|
|
- origin: 'https://rlfd.oss-cn-hangzhou.aliyuncs.com/wxt_school/origin_icon.png',
|
|
|
- terminus: 'https://rlfd.oss-cn-hangzhou.aliyuncs.com/wxt_school/terminus_icon.png',
|
|
|
+ origin: './icons/origin_icon.png',
|
|
|
+ terminus: './icons/terminus_icon.png',
|
|
|
|
|
|
- node_gps: 'https://rlfd.oss-cn-hangzhou.aliyuncs.com/wxt_school/node_gps.png',
|
|
|
- node_wifi: 'https://rlfd.oss-cn-hangzhou.aliyuncs.com/wxt_school/node_wifi.png',
|
|
|
+ node_gps:'./icons/node_gps.png',
|
|
|
+ node_wifi: './icons/node_wifi.png',
|
|
|
|
|
|
},
|
|
|
trackMarkers:[],
|
|
@@ -291,10 +291,11 @@ export default {
|
|
|
CreatePointMarkers(pointInfo, pType)
|
|
|
{
|
|
|
console.log(pType)
|
|
|
+ console.log(pointInfo)
|
|
|
|
|
|
var _this=this
|
|
|
var trackMarker;
|
|
|
- var trackPoint = new BMap.Point(pointInfo.Longitude, pointInfo.Latitude);
|
|
|
+ var trackPoint = new BMap.Point(pointInfo.GPS_X, pointInfo.GPS_Y);
|
|
|
|
|
|
if(pType=='node_wifi' || pType=='node_gps'){
|
|
|
var pointIcon = new BMap.Icon(this.markerIcons[pType], new BMap.Size(20, 20))
|