Browse Source

电视墙与离线区分

qinhouyu 2 years ago
parent
commit
2cbe76db80

+ 8 - 1
src/api/components/supermap.js

@@ -84,6 +84,13 @@ export const iconList = {
   'sj-icon-map-centerdata-t-firecontrol-other-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png'),//其他消防力量
   'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
   'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
-  'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png')//水利摄像头
+  'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
+
+  // noStatus
+  'sj-icon-map-not-centerdata-river_camera': require('@/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-river_camera.png'),
+  'sj-icon-map-not-centerdata-sand-quarry-camera': require('@/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-sand-quarry-camera.png'),
+  'sj-icon-map-not-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-slmonitor.png'),
+  'sj-icon-map-not-centerdata-slmonitor-traffic': require('@/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-slmonitor-traffic.png'),
+
 
 }

BIN
src/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-river_camera.png


BIN
src/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-sand-quarry-camera.png


BIN
src/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-slmonitor-traffic.png


BIN
src/assets/icons/sj-icon-map/noStatus/sj-icon-map-not-centerdata-slmonitor.png


+ 45 - 0
src/components/eventLocation.vue

@@ -468,6 +468,51 @@ export default {
                 keepBindPopup: false,
                 isAggregation: false,
               };
+              if (res.data[i].cameraUse == 1) {
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  markersMap.click='preview'
+                } else {
+                  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 {
+                  markersMap.icon = 'camera-not'
+                  markersMap.click=''
+                }
+              }
+              else if (res.data[i].cameraUse == 3) {
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  markersMap.click=''
+                }
+              }
+              else if (res.data[i].cameraUse == 5) {
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                  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 {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  markersMap.click=''
+                }
+              }
               if (res.data[i].channelCode != null) {
                 markersMap.parameter = {
                   code: res.data[i].cameraCode,

+ 35 - 5
src/views/eventdetailsdialog.vue

@@ -2896,19 +2896,49 @@ export default {
                 markersMap.icon = "sj-icon-keyAreas";
               } else if (type == "sxt") {
                 if (res.data[i].cameraUse == 1) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                    markersMap.click=''
+                  }
                 }
                 else if (res.data[i].cameraUse == 2) {
-                  markersMap.icon = 'camera'
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'camera'
+                    markersMap.click=''
+                  } else {
+                    markersMap.icon = 'camera-not'
+                    markersMap.click=''
+                  }
                 }
                 else if (res.data[i].cameraUse == 3) {
-                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                    markersMap.click=''
+                  }
                 }
                 else if (res.data[i].cameraUse == 5) {
-                  markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                    markersMap.click=''
+                  }
                 }
                 else if (res.data[i].cameraUse == 4) {
-                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                  if (res.data[i].workingStatus == '0') {
+                    markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                    markersMap.click='preview'
+                  } else {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                    markersMap.click=''
+                  }
                 }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = "preview";

+ 44 - 6
src/views/firespread.vue

@@ -3113,12 +3113,50 @@ export default {
             isAggregation: true,
             radius: 0
           }
-          if(res.data.centermonitorTCamera.cameraUse==1)
-          {
-            markersMap.icon='sj-icon-map-centerdata-slmonitor'
-          } else {
-
-            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 {
+              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 {
+              markersMap.icon = 'camera-not'
+              markersMap.click=''
+            }
+          }
+          else if (res.data[i].cameraUse == 3) {
+            if (res.data[i].workingStatus == '0') {
+              markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+              markersMap.click='preview'
+            } else {
+              markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+              markersMap.click=''
+            }
+          }
+          else if (res.data[i].cameraUse == 5) {
+            if (res.data[i].workingStatus == '0') {
+              markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+              markersMap.click='preview'
+            } else {
+              markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+              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 {
+              markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+              markersMap.click=''
+            }
           }
           markersMap.bindPopupHtml = '<div class="map-tip">' +
             '<span>' +

+ 70 - 10
src/views/monitor.vue

@@ -1107,19 +1107,49 @@
                 isAggregation: false
               }
               if (res.data.visuForestCloudCameraBOList[i].cameraUse == 1) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                if (res.data.visuForestCloudCameraBOList[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                  markersMap.click=''
+                }
               }
               else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 2) {
-                markersMap.icon = 'camera'
+                if (res.data.visuForestCloudCameraBOList[i].workingStatus == '0') {
+                  markersMap.icon = 'camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'camera-not'
+                  markersMap.click=''
+                }
               }
               else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 3) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                if (res.data.visuForestCloudCameraBOList[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  markersMap.click=''
+                }
               }
               else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 5) {
-                markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                if (res.data.visuForestCloudCameraBOList[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                  markersMap.click=''
+                }
               }
               else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 4) {
-                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                if (res.data.visuForestCloudCameraBOList[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  markersMap.click=''
+                }
               }
               if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
                 markersMap.parameter = {
@@ -1235,19 +1265,49 @@
                 markersMap.parameter = []
               }
               if (res.data[i].cameraUse == 1) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                  markersMap.click=''
+                }
               }
               else if (res.data[i].cameraUse == 2) {
-                markersMap.icon = 'camera'
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'camera-not'
+                  markersMap.click=''
+                }
               }
               else if (res.data[i].cameraUse == 3) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  markersMap.click=''
+                }
               }
               else if (res.data[i].cameraUse == 5) {
-                markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-river_camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-river_camera'
+                  markersMap.click=''
+                }
               }
               else if (res.data[i].cameraUse == 4) {
-                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                if (res.data[i].workingStatus == '0') {
+                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                  markersMap.click='preview'
+                } else {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  markersMap.click=''
+                }
               }
               markersMap.lng = res.data[i].longitude
               markersMap.lat = res.data[i].latitude