修改事件资源落点聚合

src/views/eventdetailsdialog.vue

@@ -2272,8 +2272,7 @@ console.log(this.dutysystemTableData)
         if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
-
-        markersMapList.push(markersMap)
+        markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.cameraCode = res.data.centermonitorTCamera.id;
           let markersMap = {
@@ -2299,7 +2298,6 @@ console.log(this.dutysystemTableData)
             '</div>'
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
-
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
@@ -2361,6 +2359,7 @@ console.log(this.dutysystemTableData)
         if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
+
         markersMapList.push(markersMap)
         if (res.data.centermonitorTCamera != null) {
           let markersMap = {
@@ -2386,13 +2385,14 @@ console.log(this.dutysystemTableData)
             '</div>'
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
+
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
-          that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
           that.$refs.supermapDialog.clearM(false)
           that.$refs.supermapDialog.clearM(true)
-            that.$refs.supermapDialog.setMarkersRadius(markersMapList)
+          that.$refs.supermapDialog.setMarkersRadius(markersMapList)
+          that.$refs.supermapDialog.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
         }, 2000)
       })
     },

src/views/firespread.vue

@@ -2868,7 +2868,7 @@ export default {
       this.eventLogList = []
     },
     showEventDialog(eventCode) {
-      this.fireControlViewList()
+      this.getNewDataByDate(this.calendarDay)
       this.eventCode = eventCode
       let that = this
       //获取事件详情
@@ -2918,8 +2918,7 @@ export default {
         if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
-
-        markersMapList.push(markersMap)
+        markersMapList.push(markersMap);
         if (res.data.centermonitorTCamera != null) {
           that.cameraCode = res.data.centermonitorTCamera.id;
           let markersMap = {
@@ -2945,10 +2944,10 @@ export default {
             '</div>'
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
-
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
+          that.$refs.supermapDialog1.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
           that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
           that.$refs.supermapDialog1.clearM(false)
           that.$refs.supermapDialog1.clearM(true)
@@ -3006,6 +3005,7 @@ export default {
         if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
+
         markersMapList.push(markersMap)
         if (res.data.centermonitorTCamera != null) {
           let markersMap = {
@@ -3031,13 +3031,14 @@ export default {
             '</div>'
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
+
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
-          that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
           that.$refs.supermapDialog1.clearM(false)
           that.$refs.supermapDialog1.clearM(true)
           that.$refs.supermapDialog1.setMarkersRadius(markersMapList)
+          that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
         }, 2000)
       })
     },