修改bug

src/components/eventLocation.vue

@@ -510,7 +510,7 @@ export default {
               }
               else if (res.data[i].cameraUse == 5) {
                 if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  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-t-hydraulic-reservoir-camera'

src/views/eventdetailsdialog.vue

@@ -2930,7 +2930,7 @@ export default {
                 }
                 else if (res.data[i].cameraUse == 5) {
                   if (res.data[i].workingStatus == 0) {
-                    markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                    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-t-hydraulic-reservoir-camera'

src/views/firespread.vue

@@ -2627,7 +2627,7 @@ export default {
                 }
                 else if (res.data[i].cameraUse == 5) {
                   if (res.data[i].workingStatus == 0) {
-                    markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                    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-t-hydraulic-reservoir-camera'

src/views/forest.vue

@@ -524,6 +524,7 @@
         this.title = '四平市态势感知平台'
       }, 1000)
       setTimeout(() => {
+        this.getResourcesCount();
         this.getTodayEvents(this.getCurrentDataStr())
         this.getDeptEventCount(this.getCurrentDataStr())
         this.getWeather(this.getCurrentDataStr())
@@ -533,7 +534,6 @@
         this.getExposureStage(this.getCurrentDataStr())
         this.getSupermap(this.getCurrentDataStr())
         this.getMenuEventType()
-        this.getResourcesCount();
       }, 2000)
       /** ----------------------------------weosocket开始------------------------------------- */
       // this.initWebSocket()
@@ -668,6 +668,7 @@
       //查询各类资源的数量
       getResourcesCount() {
         let that = this;
+        that.resourcesList = []
         fireControlViewList("jiaotong").then(function (res) {
           for (let i = 0; i < res.data.length; i++) {
             if(res.data[i].type !='centerdata_t_forest_fireteam'){
@@ -809,7 +810,6 @@
           "                </div>" +
           "                </div>" +
           "                </span></div>";
-        return markersMap;
         let that = this
         getResourcesCount().then(res => {
           this.resourcesCountList = res.data;
@@ -819,6 +819,7 @@
             that.$set(that.resourcesCountList[index], 'bg', getIconBg(icon));
           })
         })
+        return markersMap;
       },
       sewageOutletClick(data) {
         const params = Object.assign({});
@@ -1478,20 +1479,8 @@
           } else {
             setTimeout(() => {
               that.$refs.supermap.clearM()
-              //数据自动落点开始
-              let maxCount = 150; //落点数超过这个数的资源不落点
-              let list = that.resourcesCountList;
-              let types = [];
-              if(list == undefined || list == null) return
-              for (let i = 0; i < list.length; i++) { //获取符合要求的类型及数量
-                if (list[i].num <= maxCount) {
-                  types.push(list[i].type);
-                }
-              }
-              for (let i = 0; i < types.length; i++) {
-                that.selectResourcesByLabel(types[i], '所有');
-              }
-              //数据自动落点结束
+
+              that.getResourcesCount();
             }, 2000)
           }
         })

src/views/monitor.vue

@@ -1535,7 +1535,7 @@
 
               } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 5) {
                 if (res.data.visuForestCloudCameraBOList[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.icon = 'sj-icon-map-centerdata-river_camera'
                   markersMap.click = 'preview'
                 } else if (res.data.visuForestCloudCameraBOList[i].workingStatus == 1) {
                   markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
@@ -1674,7 +1674,7 @@
               
               } else if (res.data[i].cameraUse == 5) {
                 if (res.data[i].workingStatus == 0) {
-                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  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-t-hydraulic-reservoir-camera'