|
@@ -2827,7 +2827,7 @@ export default {
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
icon: "marker",
|
|
icon: "marker",
|
|
bindPopupHtml: "",
|
|
bindPopupHtml: "",
|
|
- click: "",
|
|
|
|
|
|
+ click: "preview",
|
|
parameter: "",
|
|
parameter: "",
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: true,
|
|
isAggregation: true,
|
|
@@ -2847,21 +2847,64 @@ export default {
|
|
} else if (type == "zdqy") {
|
|
} else if (type == "zdqy") {
|
|
markersMap.icon = "sj-icon-keyAreas";
|
|
markersMap.icon = "sj-icon-keyAreas";
|
|
} else if (type == "sxt") {
|
|
} else if (type == "sxt") {
|
|
- if (res.data[i].cameraUse == 1) {
|
|
|
|
- markersMap.icon = "sj-icon-map-centerdata-slmonitor";
|
|
|
|
- } else if (res.data[i].cameraUse == 2) {
|
|
|
|
- markersMap.icon = "camera";
|
|
|
|
|
|
+ if(res.data[i].cameraUse==1)
|
|
|
|
+ {
|
|
|
|
+ if(res.data[i].workingStatus==0)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon='sj-icon-map-centerdata-slmonitor'
|
|
|
|
+ markersMap.click='preview'
|
|
|
|
+ }else if (res.data[i].workingStatus==1)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon='sj-icon-map-not-centerdata-slmonitor'
|
|
|
|
+ markersMap.click=''
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ } else if (res.data[i].cameraUse == 2){
|
|
|
|
+ if(res.data[i].workingStatus==0)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = "camera";
|
|
|
|
+ markersMap.click='preview'
|
|
|
|
+ }else if (res.data[i].workingStatus==1)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = "camera-not";
|
|
|
|
+ markersMap.click=''
|
|
|
|
+ }
|
|
} else if (res.data[i].cameraUse == 3) {
|
|
} else if (res.data[i].cameraUse == 3) {
|
|
- markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
|
|
|
|
- }
|
|
|
|
- else if (res.data[i].cameraUse == 4) {
|
|
|
|
- markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
|
|
|
|
- }
|
|
|
|
- else if (res.data[i].cameraUse == 5) {
|
|
|
|
- markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
|
|
|
|
- }
|
|
|
|
- if (res.data[i].cameraCode != null) {
|
|
|
|
- markersMap.click = "preview";
|
|
|
|
|
|
+ if(res.data[i].workingStatus==0)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
|
|
|
|
+ markersMap.click='preview'
|
|
|
|
+ }else if (res.data[i].workingStatus==1)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
|
|
|
|
+ markersMap.click=''
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ else if (res.data[i].cameraUse == 4) {
|
|
|
|
+ if(res.data[i].workingStatus==0)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
|
|
|
|
+ markersMap.click='preview'
|
|
|
|
+ }else if (res.data[i].workingStatus==1)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
|
|
|
|
+ markersMap.click=''
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ else if (res.data[i].cameraUse == 5) {
|
|
|
|
+ if(res.data[i].workingStatus==0)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
|
|
|
|
+ markersMap.click='preview'
|
|
|
|
+ }else if (res.data[i].workingStatus==1)
|
|
|
|
+ {
|
|
|
|
+ markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
|
|
|
|
+ markersMap.click=''
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (res.data[i].cameraCode != null) {
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
markersMap.parameter = {
|
|
markersMap.parameter = {
|
|
code: res.data[i].cameraCode,
|
|
code: res.data[i].cameraCode,
|