数据中心

src/api/components/supermap.js

@@ -22,5 +22,12 @@ export const iconList = {
   'sj-icon-map-sh': require('@/assets/icons/sj-icon-map/sj-icon-map-sh.png'),
   'sj-icon-map-slfh': require('@/assets/icons/sj-icon-map/sj-icon-map-slfh.png'),
   'sj-icon-map-syqd': require('@/assets/icons/sj-icon-map/sj-icon-map-syqd.png'),
-  'sj-icon-map-xhs': require('@/assets/icons/sj-icon-map/sj-icon-map-xhs.png')
+  'sj-icon-map-xhs': require('@/assets/icons/sj-icon-map/sj-icon-map-xhs.png'),
+  //今日事件图标
+  'sj-icon-map-wcl': require('@/assets/icons/sj-icon-map/sj-icon-map-wcl.png'),
+  'sj-icon-map-clz': require('@/assets/icons/sj-icon-map/sj-icon-map-clz.png'),
+  'sj-icon-map-ywc': require('@/assets/icons/sj-icon-map/sj-icon-map-ywc.png'),
+  'sj-icon-map-rg': require('@/assets/icons/sj-icon-map/sj-icon-map-rg.png'),
+  'sj-icon-map-hx': require('@/assets/icons/sj-icon-map/sj-icon-map-hx.png'),
+  'sj-icon-map-kk': require('@/assets/icons/sj-icon-map/sj-icon-map-kk.png')
 }

src/views/event.vue

@@ -845,7 +845,6 @@
                   channelCode.push(res.data[i].channelCode);
                 }
               }
-              //this.preview("ZgVzqsjwA1DT3G85KJ7HH0");
               if(channelCode!=null&&channelCode.length>0){
                 this.preview(channelCode);
               }else{
@@ -981,18 +980,18 @@
           that.todayEventCountList = res.data.eventcountStatus
           that.todayEventSourcetList = res.data.eventcountSource
 
-		  res.data.eventcountStatus.forEach(function(data, index) {
-		  	that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
-		  	that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
-		  	that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
+          res.data.eventcountStatus.forEach(function(data, index) {
+            that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
+            that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
+            that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
 
-		  });
-		  res.data.eventcountSource.forEach(function(data, index) {
-		  	that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
-		  	that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
-		  	that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
+          });
+          res.data.eventcountSource.forEach(function(data, index) {
+            that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
+            that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
+            that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
 
-		  });
+          });
           //  事件分布
           that.todayEventCountDeptList = res.data.eventcountDept
           //  事件分类
@@ -1010,7 +1009,7 @@
 
           that.markersList = [];
           that.eventList = [];
-          if(res.data.eventListAll!=null&&res.data.eventListAll.length>0){
+          if (res.data.eventListAll != null && res.data.eventListAll.length > 0) {
             for (let i = 0; i < res.data.eventListAll.length; i++) {
               let markersMap = {
                 lng: 124.59,
@@ -1022,22 +1021,26 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventListAll.length>50){
+              if (res.data.eventListAll.length > 50) {
                 markersMap.isAggregation = true
               }
-              if(res.data.eventListAll[i].eventStatus=="event_event_status_1"||res.data.eventListAll[i].eventStatus=="event_event_status_2"||res.data.eventListAll[i].eventStatus=="event_event_status_6"){
+              if (res.data.eventListAll[i].eventStatus == "event_event_status_1" || res.data.eventListAll[i].eventStatus == "event_event_status_2" || res.data.eventListAll[i].eventStatus == "event_event_status_6") {
                 markersMap.click = "showEventInfo_Processed"
-              }else if(res.data.eventListAll[i].eventStatus=="event_event_status_4"){
+                markersMap.icon = "sj-icon-map-clz"
+              } else if (res.data.eventListAll[i].eventStatus == "event_event_status_4") {
                 markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              } else {
+                markersMap.icon = "sj-icon-map-ywc"
               }
               markersMap.parameter = res.data.eventListAll[i].id
               markersMap.lng = res.data.eventListAll[i].longitude
-              markersMap.lat =res.data.eventListAll[i].latitude
+              markersMap.lat = res.data.eventListAll[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度：' +res.data.eventListAll[i].longitude + ',' +res.data.eventListAll[i]
+                '                  <h4>经纬度：' + res.data.eventListAll[i].longitude + ',' + res.data.eventListAll[i]
                   .latitude + '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -1045,38 +1048,39 @@
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件名称：' +res.data.eventListAll[i].eventTitle + '</h4>' +
+                '                  <h4>事件名称：' + res.data.eventListAll[i].eventTitle + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件时间：' +res.data.eventListAll[i].reportTime + '</h4>' +
+                '                  <h4>事件时间：' + res.data.eventListAll[i].reportTime + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '</div>';
               that.markersList.push(markersMap)
             }
-            that.eventList=res.data.eventListAll;
+            that.eventList = res.data.eventListAll;
             setTimeout(() => {
               that.$refs.supermap.clearM(false)
               that.$refs.supermap.clearM(true)
               that.$refs.supermap.setMarkers(that.markersList)
-            },1000)
+            }, 1000)
           }
         })
       },
       todayEventCountSetMarkers(eventStatus) {
+        if (eventStatus == "event_event_status_3") {
+          return
+        }
         //点击今日事件前三个按钮列表
         let that = this
         getEventStatusList(eventStatus).then(res => {
-          that.$refs.supermap.clearM(false)
-          that.$refs.supermap.clearM(true)
-          that.markersList = [];
           that.eventList = [];
-          if(res.data.eventList!=null&&res.data.eventList.length>0){
+          that.markersList = [];
+          if (res.data.eventList != null && res.data.eventList.length > 0) {
             for (let i = 0; i < res.data.eventList.length; i++) {
               let markersMap = {
                 lng: 124.59,
@@ -1088,24 +1092,26 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventList.length>50){
+              if (res.data.eventList.length > 50) {
                 markersMap.isAggregation = true
               }
-              if(eventStatus=="event_event_status_1_2_6"){
+              if (eventStatus == "event_event_status_1_2_6") {
                 markersMap.click = "showEventInfo_Processed"
-              }else if(eventStatus=="event_event_status_4"){
+                markersMap.icon = "sj-icon-map-clz"
+              } else if (eventStatus == "event_event_status_4") {
                 markersMap.click = "showEventInfo_notProcessed"
-              }else{
-                markersMap.click = "showEventInfo_Processed"
+                markersMap.icon = "sj-icon-map-wcl"
+              } else {
+                markersMap.icon = "sj-icon-map-ywc"
               }
               markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
-              markersMap.lat =res.data.eventList[i].latitude
+              markersMap.lat = res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度：' +res.data.eventList[i].longitude + ',' +res.data.eventList[i]
+                '                  <h4>经纬度：' + res.data.eventList[i].longitude + ',' + res.data.eventList[i]
                   .latitude + '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -1113,33 +1119,27 @@
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件名称：' +res.data.eventList[i].eventTitle + '</h4>' +
+                '                  <h4>事件名称：' + res.data.eventList[i].eventTitle + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件时间：' +res.data.eventList[i].reportTime + '</h4>' +
+                '                  <h4>事件时间：' + res.data.eventList[i].reportTime + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '</div>';
               that.markersList.push(markersMap)
             }
-            that.eventList=res.data.eventList;
-            that.$refs.supermap.setMarkers(that.markersList)
+            that.eventList = res.data.eventList;
           }
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
+          setTimeout(() => {
+            that.$refs.supermap.clearM(true)
+            that.$refs.supermap.clearM(false)
+            that.$refs.supermap.setMarkers(that.markersList)
+          }, 500)
         })
       },
       todayEventSourcetSetMarkers(eventSource) {
@@ -1150,26 +1150,32 @@
           that.$refs.supermap.clearM(false)
           that.eventList = [];
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
+
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>50){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>50){
+                markersMap.isAggregation = true
+              }
+              if(eventSource="event_source_1_3"){
+                markersMap.icon = "sj-icon-map-rg"
+              }else if(eventSource="camera_type_1"){
+                markersMap.icon = "sj-icon-map-hx"
+              }else{
+                markersMap.icon = "sj-icon-map-kk"
+              }
               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
@@ -1202,16 +1208,6 @@
             that.eventList=res.data.eventList;
             that.$refs.supermap.setMarkers(that.markersList)
           }
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       todayEventByDeptIdList(deptId) {
@@ -1222,21 +1218,29 @@
           that.$refs.supermap.clearM(false)
           that.markersList = [];
           that.eventList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>50){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
-
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>50){
+                markersMap.isAggregation = true
+              }
+              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"
+                markersMap.icon = "sj-icon-map-clz"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              }else{
+                markersMap.icon = "sj-icon-map-ywc"
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1268,16 +1272,6 @@
             that.eventList=res.data.eventList;
             that.$refs.supermap.setMarkers(that.markersList)
           }
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       todayEventByTypeList(eventType) {
@@ -1302,6 +1296,15 @@
               if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
+              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"
+                markersMap.icon = "sj-icon-map-clz"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              }else{
+                markersMap.icon = "sj-icon-map-ywc"
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1333,16 +1336,6 @@
             that.$refs.supermap.setMarkers(that.markersList)
           }
           that.eventList=res.data.eventList;
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       dropLocation(lat,lng) {

src/views/forest.vue

@@ -1114,7 +1114,6 @@
                   channelCode.push(res.data[i].channelCode);
                 }
               }
-              //this.preview("ZgVzqsjwA1DT3G85KJ7HH0");
               if(channelCode!=null&&channelCode.length>0){
                 this.preview(channelCode);
               }else{
@@ -1254,73 +1253,7 @@
               that.sourceData.push(aa);
             }
           }
-
-          // that.markersList = [];
-          // if(res.data.visuForestVgdEventBOList!=null&&res.data.visuForestVgdEventBOList.length>0){
-          //   for (let i = 0; i < res.data.visuForestVgdEventBOList.length; i++) {
-          //     let markersMap = {
-          //       lng: 124.59,
-          //       lat: 43.02,
-          //       icon: 'marker',
-          //       bindPopupHtml: '',
-          //       click: '',
-          //       parameter: '',
-          //       keepBindPopup: false,
-          //       isAggregation: false
-          //     }
-          //     if(res.data.visuForestVgdEventBOList.length>500){
-          //       markersMap.isAggregation = true
-          //     }
-          //     if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_1"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_2"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_6"){
-          //       markersMap.click = "showEventInfo_Processed"
-          //     }else if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_4"){
-          //       markersMap.click = "showEventInfo_notProcessed"
-          //     }else{
-          //       markersMap.click = "showEventInfo_Processed"
-          //     }
-          //     markersMap.parameter = res.data.visuForestVgdEventBOList[i].id
-          //     markersMap.lng = res.data.visuForestVgdEventBOList[i].longitude
-          //     markersMap.lat =res.data.visuForestVgdEventBOList[i].latitude
-          //     markersMap.bindPopupHtml = '<div class="map-tip">' +
-          //       '<span>' +
-          //       '                  <div class="d-l-con">' +
-          //       '                  <div class="d-l-l-text">' +
-          //       '                  <h4>经纬度：' +res.data.visuForestVgdEventBOList[i].longitude + ',' +res.data.visuForestVgdEventBOList[i]
-          //         .latitude + '</h4>' +
-          //       '                </div>' +
-          //       '                </div>' +
-          //       '                </span>' +
-          //       '<span>' +
-          //       '                  <div class="d-l-con">' +
-          //       '                  <div class="d-l-l-text">' +
-          //       '                  <h4>事件名称：' +res.data.visuForestVgdEventBOList[i].eventTitle + '</h4>' +
-          //       '                </div>' +
-          //       '                </div>' +
-          //       '                </span>' +
-          //       '<span>' +
-          //       '                  <div class="d-l-con">' +
-          //       '                  <div class="d-l-l-text">' +
-          //       '                  <h4>事件时间：' +res.data.visuForestVgdEventBOList[i].reportTime + '</h4>' +
-          //       '                </div>' +
-          //       '                </div>' +
-          //       '                </span>' +
-          //       '</div>';
-          //     that.markersList.push(markersMap)
-          //   }
-          //   setTimeout(() => {
-          //     that.$refs.supermap.clearM(false)
-          //     that.$refs.supermap.setMarkers(that.markersList)
-          //   }, 1000);
-          // }
-
           that.visuForestCloudRYBO=res.data.visuForestCloudRYBO;
-          // VisuForestCloudTodaySjfbBO: (2) [{…}, {…}]
-          // baseinfo: {baseinfo: '子挖的'}基本情况
-          // cameraList: (2) [{…}, {…}]
-          // visuForestCloudRYBO: (3) [{…}, {…}, {…}]
-          // visuForestCloudTodaySjlyBOList: (3) [{…}, {…}, {…}]
-          // visuForestCloudTodayTjBO: {wclCount: '82', clzCount: '0', ybjCount: '0'}
-          // visuForestVgdEventBOList
           this.cameraChat();
         })
       },
@@ -1331,19 +1264,19 @@
           //今日事件
           that.todayEventCountList = res.data.eventcountStatus
           that.todayEventSourcetList = res.data.eventcountSource
-					//插入图标
-					res.data.eventcountStatus.forEach(function(data, index) {
-						that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
-						that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
-						that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
+          //插入图标
+          res.data.eventcountStatus.forEach(function(data, index) {
+            that.$set(that.todayEventCountList[0], 'icon', 'sj-icon-wcl');
+            that.$set(that.todayEventCountList[1], 'icon', 'sj-icon-clz');
+            that.$set(that.todayEventCountList[2], 'icon', 'sj-icon-ywc');
 
-					});
-					res.data.eventcountSource.forEach(function(data, index) {
-						that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
-						that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
-						that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
+          });
+          res.data.eventcountSource.forEach(function(data, index) {
+            that.$set(that.todayEventSourcetList[0], 'icon', 'sj-icon-rg');
+            that.$set(that.todayEventSourcetList[1], 'icon', 'sj-icon-hx');
+            that.$set(that.todayEventSourcetList[2], 'icon', 'sj-icon-kk');
 
-					});
+          });
           //  事件分布
           that.todayEventCountDeptList = res.data.eventcountDept
           //  事件分类
@@ -1358,7 +1291,7 @@
           }
           this.eventChart()
           that.markersList = [];
-          if(res.data.eventListAll!=null&&res.data.eventListAll.length>0){
+          if (res.data.eventListAll != null && res.data.eventListAll.length > 0) {
             for (let i = 0; i < res.data.eventListAll.length; i++) {
               let markersMap = {
                 lng: 124.59,
@@ -1370,22 +1303,26 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventListAll.length>50){
+              if (res.data.eventListAll.length > 50) {
                 markersMap.isAggregation = true
               }
-              if(res.data.eventListAll[i].eventStatus=="event_event_status_1"||res.data.eventListAll[i].eventStatus=="event_event_status_2"||res.data.eventListAll[i].eventStatus=="event_event_status_6"){
+              if (res.data.eventListAll[i].eventStatus == "event_event_status_1" || res.data.eventListAll[i].eventStatus == "event_event_status_2" || res.data.eventListAll[i].eventStatus == "event_event_status_6") {
                 markersMap.click = "showEventInfo_Processed"
-              }else if(res.data.eventListAll[i].eventStatus=="event_event_status_4"){
+                markersMap.icon = "sj-icon-map-clz"
+              } else if (res.data.eventListAll[i].eventStatus == "event_event_status_4") {
                 markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              } else {
+                markersMap.icon = "sj-icon-map-ywc"
               }
               markersMap.parameter = res.data.eventListAll[i].id
               markersMap.lng = res.data.eventListAll[i].longitude
-              markersMap.lat =res.data.eventListAll[i].latitude
+              markersMap.lat = res.data.eventListAll[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度：' +res.data.eventListAll[i].longitude + ',' +res.data.eventListAll[i]
+                '                  <h4>经纬度：' + res.data.eventListAll[i].longitude + ',' + res.data.eventListAll[i]
                   .latitude + '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -1393,26 +1330,26 @@
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件名称：' +res.data.eventListAll[i].eventTitle + '</h4>' +
+                '                  <h4>事件名称：' + res.data.eventListAll[i].eventTitle + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件时间：' +res.data.eventListAll[i].reportTime + '</h4>' +
+                '                  <h4>事件时间：' + res.data.eventListAll[i].reportTime + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '</div>';
               that.markersList.push(markersMap)
             }
-            that.eventList=res.data.eventListAll;
+            that.eventList = res.data.eventListAll;
             setTimeout(() => {
               that.$refs.supermap.clearM(false)
               that.$refs.supermap.clearM(true)
               that.$refs.supermap.setMarkers(that.markersList)
-            },1000)
+            }, 1000)
           }
         })
       },
@@ -1442,8 +1379,12 @@
               }
               if(eventStatus=="event_event_status_1_2_6"){
                 markersMap.click = "showEventInfo_Processed"
+                markersMap.icon = "sj-icon-map-clz"
               }else if(eventStatus=="event_event_status_4"){
                 markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              }else{
+                markersMap.icon = "sj-icon-map-ywc"
               }
               markersMap.parameter = res.data.eventList[i].id
               markersMap.lng = res.data.eventList[i].longitude
@@ -1481,16 +1422,6 @@
             that.$refs.supermap.clearM(false)
             that.$refs.supermap.setMarkers(that.markersList)
           },500)
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       todayEventSourcetSetMarkers(eventSource) {
@@ -1509,6 +1440,13 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
+              if(eventSource="event_source_1_3"){
+                markersMap.icon = "sj-icon-map-rg"
+              }else if(eventSource="camera_type_1"){
+                markersMap.icon = "sj-icon-map-hx"
+              }else{
+                markersMap.icon = "sj-icon-map-kk"
+              }
               if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
@@ -1552,17 +1490,6 @@
             that.$refs.supermap.clearM(false)
             that.$refs.supermap.setMarkers(that.markersList)
           },500)
-
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       todayEventByDeptIdList(deptId) {
@@ -1585,8 +1512,12 @@
               }
               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"
+                markersMap.icon = "sj-icon-map-clz"
               }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
                 markersMap.click = "showEventInfo_notProcessed"
+                markersMap.icon = "sj-icon-map-wcl"
+              }else{
+                markersMap.icon = "sj-icon-map-ywc"
               }
               if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
@@ -1626,16 +1557,6 @@
             that.$refs.supermap.clearM(false)
             that.$refs.supermap.setMarkers(that.markersList)
           },500)
-          // eventCode: "718b040cf1f747eb8ab4ffc6db643ca0"
-          // eventContent: "集安-东明-可见光2022-06-27 02:42:04烟雾报警"
-          // eventSource: "event_source_2"
-          // eventStatus: "event_event_status_4"
-          // eventTitle: "集安-东明点位2022-06-27 02:42:04烟雾报警"
-          // id: "01458301eb834f3da5be16a75cd38bb6"
-          // latitude: "43.85618180244526"
-          // longitude: "125.31971797326736"
-          // reportBy: "集安-东明点位"
-          // reportTime: "2022-06-27 02:42:04"
         })
       },
       showDevice(deviceType){
@@ -1683,22 +1604,6 @@
                 '                </span>' +
                 '</div>';
               this.cameraMarkersList.push(markersMap);
-              //   cameraAccount: "1"
-              // cameraCode: "1000010"
-              // cameraFactory: "2"
-              // cameraIp: "1"
-              // cameraName: "2"
-              // cameraPasword: "2"
-              // cameraPort: 2
-              // cameraRadius: 20
-              // cameraRegion: "3"
-              // dataDeptId: null
-              // dataStatus: null
-              // eventType: null
-              // height: "11"
-              // id: "0d165fc362514f79b12a899ea66295fd"
-              // latitude: "49.325625"
-              // longitude: "125.3333"
             }
             this.$refs.supermap.setMarkers(this.cameraMarkersList)
           }