彭宇 před 2 roky
rodič
revize
0ddde85a25
3 změnil soubory, kde provedl 34 přidání a 3 odebrání
  1. 8 0
      src/api/event.js
  2. 7 0
      src/views/event.vue
  3. 19 3
      src/views/forest.vue

+ 8 - 0
src/api/event.js

@@ -52,3 +52,11 @@ export function updateCentereventTForestfireStatus(id,zt) {
     method: 'get'
   })
 }
+//获取大华图片地址
+export function getImgUrl(data) {
+  return request({
+    url: '/monitor/DahuaController/getImgUrl',
+    method: 'get',
+    data:data
+  })
+}

+ 7 - 0
src/views/event.vue

@@ -1146,6 +1146,13 @@
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }else{
+                markersMap.click = "showEventInfo_Processed"
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +

+ 19 - 3
src/views/forest.vue

@@ -943,7 +943,6 @@
           that.url = '',
           that.resetQuery()
           getWarm(id).then(res => {
-            debugger
           let data = res.data
           that.cameraId = data.reportById
           that.reportTime = data.reportTime
@@ -1197,7 +1196,6 @@
         that.id=id;
         getForest(id).then(response => {
           let data = response.data
-          debugger
           if (data.eventStatus != 'event_event_status_1') {
             this.aniu = false
           }
@@ -1367,8 +1365,9 @@
         //点击今日事件前三个按钮列表
         let that = this
         getEventStatusList(eventStatus).then(res => {
-          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
+          that.$refs.supermap.clearM(true)
+          that.eventList=res.data.eventList;
           that.markersList = [];
           let markersMap = {
             lng: 124.59,
@@ -1376,6 +1375,7 @@
             icon: 'marker',
             bindPopupHtml: '',
             click: '',
+            parameter: '',
             keepBindPopup: false,
             isAggregation: false
           }
@@ -1383,7 +1383,15 @@
             if(res.data.eventList.length>500){
               markersMap.isAggregation = true
             }
+            if(eventStatus=="event_event_status_1_2_6"){
+              markersMap.click = "showEventInfo_Processed"
+            }else if(eventStatus=="event_event_status_4"){
+              markersMap.click = "showEventInfo_notProcessed"
+            }else{
+              markersMap.click = "showEventInfo_Processed"
+            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1447,6 +1455,14 @@
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }else{
+                markersMap.click = "showEventInfo_Processed"
+              }
+              markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +