添加摄像头类型图标

src/api/components/supermap.js

@@ -72,11 +72,12 @@ export const iconList = {
   'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png'),//水压传感器
   'sj-icon-map-centerdata-slmonitor-traffic': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor-traffic.png'),//交通精细化摄像头
   'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
+  'sj-icon-map-centerdata-river_camera': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-river_camera.png'),//水利摄像头
+  '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-traffic-warning-sign': require('@/assets/icons/sj-icon-map/traffic-resources-warning_sign.png'),//警示牌
   'sj-icon-map-centerdata-t-traffic-bridge': require('@/assets/icons/sj-icon-map/traffic-resources-bridge.png'),//桥梁
   'sj-icon-map-centerdata-t-traffic-culvert': require('@/assets/icons/sj-icon-map/traffic-resources-culvert.png'),//涵洞
-  'sj-icon-map-centerdata-t-hydraulic-reservoir': require('@/assets/icons/sj-icon-map/sj-icon-map-centerdata-t-hydraulic-reservoir.png'),//涵洞
 
   //云图图标
   'sj-icon-map-centerdata-t-forest-waterintake': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-waterintake.png'),//取水口

src/views/monitor.vue

@@ -227,7 +227,7 @@
     },
     data() {
       return {
-        jkListIcon:'sj-icon-jkzx',
+        jkListIcon: 'sj-icon-jkzx',
         cgqData: [],
         iconCurrentIndex1: "-1",
         listCurrentIndex1: "-1",
@@ -372,34 +372,34 @@
       },
       showTVWall(cameraParam) {
         let tvListJson = [{
-                  "switchTab": "2",
-                  "treeLabels": [{
-                    "id": null,
-                    "labelCode": "999",
-                    "labelName": "电视墙",
-                    "cameraType": null,
-                    "parentLabelCode": ""
-                  },
-                    {
-                      "id": "spcamera00010",
-                      "labelCode": cameraParam.cameraCode,
-                      "labelName": cameraParam.cameraName,
-                      "cameraType": cameraParam.cameraType,
-                      "parentLabelCode": "999"
-                    }
-                  ],
-                  "labelChannels": [{
-                    "labelCode": cameraParam.cameraCode,
-                    "channelDates": [{
-                      "channelCode": cameraParam.cameraCode,
-                      "channelName": cameraParam.cameraName,
-                      "channelSn": null,
-                      "cameraType": cameraParam.cameraType,
-                      "online": "1",
-                      "cameraCode": null
-                    }]
-                  }]
-                }]
+          "switchTab": "2",
+          "treeLabels": [{
+              "id": null,
+              "labelCode": "999",
+              "labelName": "电视墙",
+              "cameraType": null,
+              "parentLabelCode": ""
+            },
+            {
+              "id": "spcamera00010",
+              "labelCode": cameraParam.cameraCode,
+              "labelName": cameraParam.cameraName,
+              "cameraType": cameraParam.cameraType,
+              "parentLabelCode": "999"
+            }
+          ],
+          "labelChannels": [{
+            "labelCode": cameraParam.cameraCode,
+            "channelDates": [{
+              "channelCode": cameraParam.cameraCode,
+              "channelName": cameraParam.cameraName,
+              "channelSn": null,
+              "cameraType": cameraParam.cameraType,
+              "online": "1",
+              "cameraCode": null
+            }]
+          }]
+        }]
         this.$refs.TVWall.showTVWall(tvListJson, [{
           channelId: cameraParam.channelCode,
         }, ]);
@@ -487,7 +487,7 @@
           .then(function(res) {
             // that.loudspeakerNum = res.data.length;
             that.visuForestCloudCameraBOListSearch = [];
-            that.visuForestCloudCameraBOList=[];
+            that.visuForestCloudCameraBOList = [];
             if (res.data != null && res.data.length > 0) {
               for (let j = 0; j < res.data.length; j++) {
                 let dat = {
@@ -595,7 +595,7 @@
         let markersList = [];
         getMonitorDeviceAndDataList(this.deptId).then((res) => {
           this.visuForestCloudCameraBOListSearch = [];
-          this.visuForestCloudCameraBOList=[]
+          this.visuForestCloudCameraBOList = []
           list = res.data;
           //this.sensorNum = list.length
           list.forEach((item) => {
@@ -1253,18 +1253,18 @@
           that.keyAreaList = res.data;
         });
       },
-      getRegionalFlag(id,index) {
+      getRegionalFlag(id, index) {
         //获取重点区域
         this.listCurrentIndex3 = index;
         let that = this;
         getRegionalFlag(id).then((res) => {
           that.graphicsList = [];
-        //地图标记
-        let latLngs = JSON.parse(res.data.data.latLngs!=null?res.data.data.latLngs:'[]')
-        if (latLngs.length > 0) {
-          for (let i = 0; i < latLngs.length; i++) {
-            that.graphicsList.push(latLngs[i].lng);
-            that.graphicsList.push(latLngs[i].lat);
+          //地图标记
+          let latLngs = JSON.parse(res.data.data.latLngs != null ? res.data.data.latLngs : '[]')
+          if (latLngs.length > 0) {
+            for (let i = 0; i < latLngs.length; i++) {
+              that.graphicsList.push(latLngs[i].lng);
+              that.graphicsList.push(latLngs[i].lat);
             }
             setTimeout(() => {
               that.$refs.supermap.clearG();
@@ -1504,6 +1504,10 @@
                 markersMap.icon = "camera";
               } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 3) {
                 markersMap.icon = "sj-icon-map-centerdata-slmonitor-traffic";
+              } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 4) {
+                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+              } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 5) {
+                markersMap.icon = 'sj-icon-map-centerdata-river_camera'
               }
 
               markersMap.lng = res.data.visuForestCloudCameraBOList[i].longitude;
@@ -1607,6 +1611,10 @@
                 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'
+              } else if (res.data[i].cameraUse == 5) {
+                markersMap.icon = 'sj-icon-map-centerdata-river_camera'
               }
               markersMap.lng = res.data[i].longitude;
               markersMap.lat = res.data[i].latitude;