Forráskód Böngészése

摄像头在不在线类型添加

王通 1 éve
szülő
commit
1cb44d5cb2

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

@@ -64,5 +64,8 @@ export const iconList = {
   'sj-icon-map-centerdata-sand-quarry-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-sand-quarry-camera.png'),//水利摄像头
   'sj-icon-map-centerdata-t-hydraulic-reservoir':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-hydraulic-reservoir.png'),//水利摄像头
   'sj-icon-map-centerdata-t-environment-water-monitor':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_environment_water_monitor.png'),//水利摄像头
-
+  'sj-icon-map-not-centerdata-sand-quarry-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-sand-quarry-camera.png'),//水利摄像头
+  'sj-icon-map-not-centerdata-slmonitor':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-slmonitor.png'),//水利摄像头
+  'sj-icon-map-not-centerdata-river_camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-river_camera.png'),//水利摄像头
+  'sj-icon-map-not-centerdata-slmonitor-traffic':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-not-centerdata-slmonitor-traffic.png'),//水利摄像头
 }

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


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


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


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


+ 59 - 2
src/components/eventLocation.vue

@@ -454,7 +454,7 @@ export default {
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
-                icon: "camera",
+                icon: (res.data[i].workingStatus==0?"camera":"camera-not"),
                 bindPopupHtml: "",
                 click: "preview",
                 parameter: "",
@@ -462,7 +462,64 @@ export default {
                 keepBindPopup: false,
                 isAggregation: false,
               };
-              if (res.data[i].channelCode != null) {
+              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) {
+                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].channelCode != null) {
                 markersMap.parameter = {
                   code: res.data[i].cameraCode,
                   name: res.data[i].cameraName,

+ 58 - 15
src/views/eventdetailsdialog.vue

@@ -2827,7 +2827,7 @@ export default {
                 lat: 43.02,
                 icon: "marker",
                 bindPopupHtml: "",
-                click: "",
+                click: "preview",
                 parameter: "",
                 keepBindPopup: false,
                 isAggregation: true,
@@ -2847,21 +2847,64 @@ export default {
               } else if (type == "zdqy") {
                 markersMap.icon = "sj-icon-keyAreas";
               } 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) {
-                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 = {
                     code: res.data[i].cameraCode,

+ 52 - 8
src/views/firespread.vue

@@ -2401,7 +2401,7 @@ export default {
                 lat: 43.02,
                 icon: 'marker',
                 bindPopupHtml: '',
-                click: '',
+                click: 'preview',
                 parameter: '',
                 keepBindPopup: false,
                 isAggregation: true
@@ -2423,21 +2423,65 @@ export default {
               } else if (type == 'sxt') {
                 if(res.data[i].cameraUse==1)
                 {
-                  markersMap.icon='sj-icon-map-centerdata-slmonitor'
-                } else  if (res.data[i].cameraUse == 2){
+                  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=''
+                  }
 
-                  markersMap.icon='camera'
+                } 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) {
-                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 if (res.data[i].workingStatus==1)
+                  {
+                    markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                    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 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) {
-                markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  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.click = 'preview'
+
                   // markersMap.parameter = res.data[i].cameraCode
                   markersMap.parameter = {code:res.data[i].cameraCode,
                     type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}

+ 56 - 11
src/views/monitor.vue

@@ -1416,19 +1416,64 @@ export default {
             } else {
               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";
-            }else if (res.data[i].cameraUse == 4) {
-              markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-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) {
+              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 == 5) {
-              markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir'
+            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=''
+              }
+
             }
-            markersMap.lng = res.data[i].longitude;
+            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=''
+              }
+
+              markersMap.lng = res.data[i].longitude;
             markersMap.lat = res.data[i].latitude;
             markersMap.radius = res.data[i].cameraRadius;