|
@@ -1277,7 +1277,7 @@ export default {
|
|
markersMap.parameter = {
|
|
markersMap.parameter = {
|
|
code: res.data.visuForestCloudCameraBOList[i].cameraCode,
|
|
code: res.data.visuForestCloudCameraBOList[i].cameraCode,
|
|
name: res.data.visuForestCloudCameraBOList[i].cameraName,
|
|
name: res.data.visuForestCloudCameraBOList[i].cameraName,
|
|
- type: res.data.visuForestCloudCameraBOList[i].cameraFactory,
|
|
|
|
|
|
+ type: res.data.visuForestCloudCameraBOList[i].cameraType,
|
|
};
|
|
};
|
|
} else {
|
|
} else {
|
|
markersMap.parameter = [];
|
|
markersMap.parameter = [];
|
|
@@ -1400,15 +1400,22 @@ export default {
|
|
markersMap.parameter = {
|
|
markersMap.parameter = {
|
|
code: res.data[i].cameraCode,
|
|
code: res.data[i].cameraCode,
|
|
name: res.data[i].cameraName,
|
|
name: res.data[i].cameraName,
|
|
- type: res.data[i].cameraFactory,
|
|
|
|
|
|
+ type: res.data[i].cameraType,
|
|
};
|
|
};
|
|
} else {
|
|
} else {
|
|
markersMap.parameter = [];
|
|
markersMap.parameter = [];
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if (res.data[i].cameraUse == 1) {
|
|
|
|
+ markersMap.icon = "sj-icon-map-centerdata-slmonitor";
|
|
|
|
+ } else if (res.data[i].cameraUse == 2) {
|
|
|
|
+ markersMap.icon = "camera";
|
|
|
|
+ }else if (res.data[i].cameraUse == 3) {
|
|
|
|
+ markersMap.icon = "sj-icon-map-centerdata-slmonitor-traffic";
|
|
|
|
+ }
|
|
markersMap.lng = res.data[i].longitude;
|
|
markersMap.lng = res.data[i].longitude;
|
|
markersMap.lat = res.data[i].latitude;
|
|
markersMap.lat = res.data[i].latitude;
|
|
markersMap.radius = res.data[i].cameraRadius;
|
|
markersMap.radius = res.data[i].cameraRadius;
|
|
|
|
+
|
|
markersMap.bindPopupHtml =
|
|
markersMap.bindPopupHtml =
|
|
'<div class="map-tip">' +
|
|
'<div class="map-tip">' +
|
|
"<span>" +
|
|
"<span>" +
|