电视墙与离线区分

src/api/components/supermap.js

@@ -67,4 +67,11 @@ export const iconList = {
   'sj-icon-map-centerdata-t-forest-firehydrant@2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_forest_firehydrant@2.png'),//地下消防栓
   'sj-icon-map-centerdata-t-forest-firehydrant@3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_t_forest_firehydrant@3.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'),
+
 }

src/components/eventLocation.vue

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

src/views/eventdetailsdialog.vue

@@ -2121,6 +2121,7 @@ export default {
   },
   data() {
     return {
+      centermonitorTCamera:null,
       //地图tool开关
       mapToolShow: false,
       mapToolCheckAll: false,
@@ -2632,17 +2633,56 @@ export default {
       this.$refs.bottomMenu.showChangChild = false;
     },
     initByCameras() {
-      const params = Object.assign({});
-      params.longitude = this.longitude;
-      params.latitude = this.latitude;
-      params.type = "8";
-      initByCameras(params).then((res) => {
-        this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, res.data);
-        this.$refs.bottomMenu.showMeasure = false;
-        this.$refs.bottomMenu.showChild = false;
-        this.$refs.bottomMenu.showBanChild = false;
-        this.$refs.bottomMenu.showChangChild = false;
-      });
+      // const params = Object.assign({})
+      // params.longitude = this.longitude;
+      // params.latitude = this.latitude;
+      // params.type = '8'
+      // initByCameras(params).then(res => {
+      //   this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, res.data);
+      //   this.$refs.bottomMenu.showMeasure = false
+      //   this.$refs.bottomMenu.showChild = false
+      //   this.$refs.bottomMenu.showBanChild = false
+      //   this.$refs.bottomMenu.showChangChild = false
+      // })
+      let that = this
+      if(that.centermonitorTCamera == null){
+        this.$message.warning("当前事件无绑定摄像头")
+        return
+      }
+      let tvListJson = [{
+        "switchTab": "2",
+        "treeLabels": [{
+          "id": null,
+          "labelCode": "999",
+          "labelName": "电视墙",
+          "cameraType": null,
+          "parentLabelCode": ""
+        },
+          {
+            "id": "spcamera00010",
+            "labelCode": that.centermonitorTCamera.cameraCode,
+            "labelName": that.centermonitorTCamera.cameraName,
+            "cameraType": that.centermonitorTCamera.cameraType,
+            "parentLabelCode": "999"
+          }
+        ],
+        "labelChannels": [{
+          "labelCode": that.centermonitorTCamera.cameraCode,
+          "channelDates": [{
+            "channelCode": that.centermonitorTCamera.cameraCode,
+            "channelName": that.centermonitorTCamera.cameraName,
+            "channelSn": null,
+            "cameraType": that.centermonitorTCamera.cameraType,
+            "online": "1",
+            "cameraCode": null
+          }]
+        }]
+      }]
+      this.$refs.TVWall.showTVWall1(this.longitude, this.latitude, tvListJson);
+      this.$refs.bottomMenu.showMeasure = false
+      this.$refs.bottomMenu.showChild = false
+      this.$refs.bottomMenu.showBanChild = false
+      this.$refs.bottomMenu.showChangChild = false
     },
     showUpdateYjYuAn() {
       listYuAn().then((res) => {
@@ -2857,19 +2897,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";
@@ -3572,6 +3642,8 @@ export default {
         }
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
+          that.centermonitorTCamera = null;
+          that.centermonitorTCamera = res.data.centermonitorTCamera;
           that.cameraCode = res.data.centermonitorTCamera.id;
           let markersMap = {
             lng: 124.59,
@@ -3694,6 +3766,8 @@ export default {
 
         markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
+          that.centermonitorTCamera = null;
+          that.centermonitorTCamera = res.data.centermonitorTCamera;
           let markersMap = {
             lng: 124.59,
             lat: 43.02,

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>' +

src/views/monitor.vue

@@ -1210,19 +1210,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 = {
@@ -1340,19 +1370,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

vue.config.js

@@ -53,8 +53,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:3031`,
         // target: `http://192.168.31.180:3031`,
-        // target: `http://192.168.31.93:3031`,
-         target: `http://121.36.228.66:3031`,
+        target: `http://192.168.31.134:3031`,
+        //  target: `http://121.36.228.66:3031`,
         //  target: `https://29613561xe.eicp.vip`,
         changeOrigin: true,
         pathRewrite: {