|
@@ -174,7 +174,7 @@
|
|
|
var data = {
|
|
var data = {
|
|
|
"Status": true,
|
|
"Status": true,
|
|
|
"list": [{
|
|
"list": [{
|
|
|
- "id": "1_658",
|
|
|
|
|
|
|
+ "id": "D08652664",
|
|
|
"markType": 6,
|
|
"markType": 6,
|
|
|
"title": "监控",
|
|
"title": "监控",
|
|
|
"theName": "监控",
|
|
"theName": "监控",
|
|
@@ -230,7 +230,7 @@
|
|
|
if (markType == "6") { //监控
|
|
if (markType == "6") { //监控
|
|
|
var DeviceSerial = markObj.DeviceSerial;
|
|
var DeviceSerial = markObj.DeviceSerial;
|
|
|
var CameraNo = markObj.CameraNo;
|
|
var CameraNo = markObj.CameraNo;
|
|
|
- marker = createCameraMarker(lng, lat, icon, title, DeviceSerial, CameraNo);
|
|
|
|
|
|
|
+ marker = createCameraMarker(lng, lat, icon, title, id, CameraNo);
|
|
|
}
|
|
}
|
|
|
else //气象站
|
|
else //气象站
|
|
|
marker = createMarker(lng, lat, icon, title, content);
|
|
marker = createMarker(lng, lat, icon, title, content);
|
|
@@ -291,7 +291,7 @@
|
|
|
});
|
|
});
|
|
|
return markerx;
|
|
return markerx;
|
|
|
}
|
|
}
|
|
|
- function createCameraMarker(lng, lat, icon, title, DeviceSerial, CameraNo) {
|
|
|
|
|
|
|
+ function createCameraMarker(lng, lat, icon, title, id, CameraNo) {
|
|
|
|
|
|
|
|
var markerx = new BMap.Marker(new BMap.Point(lng, lat), { icon: icon });
|
|
var markerx = new BMap.Marker(new BMap.Point(lng, lat), { icon: icon });
|
|
|
markerx.addEventListener("click", function (e) {
|
|
markerx.addEventListener("click", function (e) {
|
|
@@ -300,7 +300,7 @@
|
|
|
layer.open({
|
|
layer.open({
|
|
|
type: 2,
|
|
type: 2,
|
|
|
area: ['1200px', '600px'],
|
|
area: ['1200px', '600px'],
|
|
|
- content: 'jkview' //这里content是一个URL,如果你不想让iframe出现滚动条,你还可以content: ['http://sentsin.com', 'no']
|
|
|
|
|
|
|
+ content: 'jkview?equip_id='+id //这里content是一个URL,如果你不想让iframe出现滚动条,你还可以content: ['http://sentsin.com', 'no']
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
|
});
|
|
});
|