1

src/api/components/supermap.js

@@ -94,4 +94,9 @@ export const iconList = {
   '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_water_flow_rate': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_flow_rate.png'),//专职站
+  'sj-icon-map-not-centerdata-t-hydraulic-reservoir-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-sand-quarry-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'),//水利摄像头
+
 }

src/components/eventLocation.vue

@@ -462,6 +462,61 @@ 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 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,

src/views/eventdetailsdialog.vue

@@ -2156,7 +2156,6 @@ export default {
       sendTaskSource: null, //任务来源
       sendTaskTitle: null, //联动标题
       sendTaskContent: null, //联动内容
-      centermonitorTCamera: null, //事件摄像头
       sendLianDongDept: [], //联动部门
       eventTypeList: [], //事件类型列表
       guanLianYuAnList: [], //关联预案列表
@@ -2263,6 +2262,7 @@ export default {
       /** *****************事件流程***************************/
       showEventConfirm: false, //事件签收弹窗
       showGuanLianYuAnConfirm: false, //调整关联预案弹窗
+      centermonitorTCamera: null, //事件摄像头
       showEventConfirm_gd: false, //事件火险报告弹窗
       address: null, //事件上报地址
       eventStatusValue: null, //事件状态
@@ -2887,19 +2887,61 @@ 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].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.click = "preview";
                   // markersMap.parameter = res.data[i].cameraCode
@@ -3602,7 +3644,7 @@ export default {
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.centermonitorTCamera = null;
-          that.centermonitorTCamera = res.data.centermonitorTCamera;
+          that.centermonitorTCamera = res.data.centermonitorTCamera
           that.cameraCode = res.data.centermonitorTCamera.id;
           let markersMap = {
             lng: 124.59,
@@ -3726,7 +3768,7 @@ export default {
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.centermonitorTCamera = null;
-          that.centermonitorTCamera = res.data.centermonitorTCamera;
+          that.centermonitorTCamera = res.data.centermonitorTCamera
           let markersMap = {
             lng: 124.59,
             lat: 43.02,

src/views/firespread.vue

@@ -2423,19 +2423,59 @@ 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'
-              }
-              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].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.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode

src/views/monitor.vue

@@ -1499,17 +1499,49 @@
               }
 
               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 if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  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 if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  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 if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  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 if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  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-t-hydraulic-reservoir-camera'
+                  markersMap.click = 'preview'
+                } else if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.click = ''
+                }
               }
-
               markersMap.lng = res.data.visuForestCloudCameraBOList[i].longitude;
               markersMap.lat = res.data.visuForestCloudCameraBOList[i].latitude;
               markersMap.radius =
@@ -1977,4 +2009,4 @@
     height: 600px;
     border: 1px solid red;
   }
-</style>
+</style>