修改图标

src/api/components/supermap.js

@@ -41,5 +41,14 @@ export const iconList = {
   'sj-icon-checkpoint': require('@/assets/icons/sj-icon-map/sj-icon-map-fhjcz.png'),//检查站
   'sj-icon-fireteam': require('@/assets/icons/sj-icon-map/sj-icon-map-slfh.png'),//防火队
   'sj-icon-tcqh': require('@/assets/icons/sj-icon-map/sj-icon-map-syqd.png'),//重点区域
-  'sj-icon-jkzx': require('@/assets/icons/sj-icon-map/sj-icon-map-wcl.png'),//摄像头
+
+
+  //首页事件上报状态
+  'sj-icon-map-xinshangbao': require('@/assets/icons/sj-icon-map/sj-icon-map-xinshangbao.png'),//新上报
+  'sj-icon-map-cuiban': require('@/assets/icons/sj-icon-map/sj-icon-map-cuiban.png'),//催办
+  'sj-icon-map-qianshou': require('@/assets/icons/sj-icon-map/sj-icon-map-qianshou.png'),//签收
+  'sj-icon-map-guidang': require('@/assets/icons/sj-icon-map/sj-icon-map-guidang.png'),//归档
+  'sj-icon-map-banjie': require('@/assets/icons/sj-icon-map/sj-icon-map-banjie.png'),//办结
+
+
 }

src/views/eventdetailsdialog.vue

@@ -1419,16 +1419,16 @@ export default {
             isAggregation: false,
             radius: 0
           }
-
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1') {
-            markersMap.icon = 'sj-icon-map-wcl'
-            markersMap.isAggregation = false
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_4' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
-            markersMap.icon = 'sj-icon-map-clz'
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount>0) {
+            markersMap.icon = 'sj-icon-map-xinshangbao'
+          }if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount==0) {
+            markersMap.icon = 'sj-icon-map-cuiban'
+          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+            markersMap.icon = 'sj-icon-map-qianshou'
+          }else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+            markersMap.icon = 'sj-icon-map-banjie'
           } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
-            markersMap.icon = 'sj-icon-map-ywc'
-          } else {
-            markersMap.icon = 'sj-icon-map-clz'
+            markersMap.icon = 'sj-icon-map-guidnag'
           }
           markersMap.lng = res.data.catalogue[0].longitude
           markersMap.lat = res.data.catalogue[0].latitude
@@ -1466,14 +1466,16 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1') {
-            markersMap.icon = 'sj-icon-map-wcl'
-          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_4' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
-            markersMap.icon = 'sj-icon-map-clz'
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount>0) {
+            markersMap.icon = 'sj-icon-map-xinshangbao'
+          }if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount==0) {
+            markersMap.icon = 'sj-icon-map-cuiban'
+          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+            markersMap.icon = 'sj-icon-map-qianshou'
+          }else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+            markersMap.icon = 'sj-icon-map-banjie'
           } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
-            markersMap.icon = 'sj-icon-map-ywc'
-          } else {
-            markersMap.icon = 'sj-icon-map-clz'
+            markersMap.icon = 'sj-icon-map-guidnag'
           }
           markersMap.lng = res.data.catalogue[0].longitude
           markersMap.lat = res.data.catalogue[0].latitude

src/views/forest.vue

@@ -539,19 +539,23 @@ export default {
           if (this.eventList.length > 50) {
             markersMap.isAggregation = true
           }
-          if (this.eventList[i].eventStatusValue == 'forest_event_status_1') {
+          if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount>0) {
             markersMap.click = 'showEventDialog'
-            markersMap.icon = 'sj-icon-map-wcl'
+            markersMap.icon = 'sj-icon-map-xinshangbao'
             markersMap.isAggregation = false
-          } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2' || this.eventList[i].eventStatusValue == 'forest_event_status_3' || this.eventList[i].eventStatusValue == 'forest_event_status_4' || this.eventList[i].eventStatusValue == 'forest_event_status_5') {
+          }if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount==0) {
             markersMap.click = 'showEventDialog'
-            markersMap.icon = 'sj-icon-map-clz'
-          } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
+            markersMap.icon = 'sj-icon-map-cuiban'
+            markersMap.isAggregation = false
+          } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
             markersMap.click = 'showEventDialog'
-            markersMap.icon = 'sj-icon-map-ywc'
-          } else {
+            markersMap.icon = 'sj-icon-map-qianshou'
+          }else if (this.eventList[i].eventStatusValue == 'forest_event_status_5') {
             markersMap.click = 'showEventDialog'
-            markersMap.icon = 'sj-icon-map-clz'
+            markersMap.icon = 'sj-icon-map-banjie'
+          } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
+            markersMap.click = 'showEventDialog'
+            markersMap.icon = 'sj-icon-map-guidnag'
           }
           markersMap.parameter = this.eventList[i].eventCode
           markersMap.lng = this.eventList[i].longitude
@@ -893,25 +897,23 @@ export default {
             if (this.eventList.length > 50) {
               markersMap.isAggregation = true
             }
-            if (this.eventList[i].eventStatusValue == 'forest_event_status_1') {
-              if (this.eventList[i].urgeCount > 0) {
-                markersMap.click = 'showEventDialog'
-                markersMap.icon = 'sj-icon-map-wcl'
-                markersMap.isAggregation = false
-              } else {
-                markersMap.click = 'showEventDialog'
-                markersMap.icon = 'sj-icon-map-wcl'
-                markersMap.isAggregation = false
-              }
-            } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2' || this.eventList[i].eventStatusValue == 'forest_event_status_3' || this.eventList[i].eventStatusValue == 'forest_event_status_4' || this.eventList[i].eventStatusValue == 'forest_event_status_5') {
+            if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount>0) {
               markersMap.click = 'showEventDialog'
-              markersMap.icon = 'sj-icon-map-clz'
-            } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
+              markersMap.icon = 'sj-icon-map-xinshangbao'
+              markersMap.isAggregation = false
+            }if (this.eventList[i].eventStatusValue == 'forest_event_status_1'&&this.eventList[i].urgeCount==0) {
+              markersMap.click = 'showEventDialog'
+              markersMap.icon = 'sj-icon-map-cuiban'
+              markersMap.isAggregation = false
+            } else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
               markersMap.click = 'showEventDialog'
-              markersMap.icon = 'sj-icon-map-ywc'
-            } else {
+              markersMap.icon = 'sj-icon-map-qianshou'
+            }else if (this.eventList[i].eventStatusValue == 'forest_event_status_5') {
+              markersMap.click = 'showEventDialog'
+              markersMap.icon = 'sj-icon-map-banjie'
+            } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
               markersMap.click = 'showEventDialog'
-              markersMap.icon = 'sj-icon-map-clz'
+              markersMap.icon = 'sj-icon-map-guidnag'
             }
             markersMap.parameter = this.eventList[i].eventCode
             markersMap.lng = this.eventList[i].longitude