彭宇 %!s(int64=2) %!d(string=hai) anos
pai
achega
343b7f8443
Modificáronse 2 ficheiros con 16 adicións e 11 borrados
  1. 9 8
      src/components/vBottomMenu.vue
  2. 7 3
      src/views/eventdetailsdialog.vue

+ 9 - 8
src/components/vBottomMenu.vue

@@ -548,15 +548,16 @@ export default {
             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

+ 7 - 3
src/views/eventdetailsdialog.vue

@@ -20,8 +20,8 @@
                   <div class="dia-left-top-tit">应急预案</div>
                   <div class="dia-left-top-carousel">
                     <el-carousel height="30px" direction="vertical" :interval="2000">
-                      <el-carousel-item v-for="item in 3" :key="item">
-                        <a href="#">这是一条应急预案</a>
+                      <el-carousel-item>
+                        <a href="#">{{ visuForestCloudYuAnBo }}</a>
                       </el-carousel-item>
                     </el-carousel>
                   </div>
@@ -934,6 +934,7 @@ export default {
       latitude: null,
       eventLog: null,
       eventLogList: [],
+      visuForestCloudYuAnBo: null,
       eventDialog: false,
       radius: 1,//资源搜索半径
       resourcesList: [
@@ -1401,7 +1402,8 @@ export default {
       //获取事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventDialog = true
-        this.eventLogList = res.data.eventlog
+        this.eventLogList = res.data.eventlog//日志列表
+        this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
         if (res.data.catalogue != null && res.data.catalogue.length > 0) {
           this.eventStatusValue = res.data.catalogue[0].eventStatusValue
           this.eventType = res.data.catalogue[0].eventType
@@ -1451,6 +1453,7 @@ export default {
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventDialog = true
         this.eventLogList = res.data.eventlog
+        this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
         if (res.data.catalogue != null && res.data.catalogue.length > 0) {
           this.eventStatusValue = res.data.catalogue[0].eventStatusValue
           this.eventType = res.data.catalogue[0].eventType
@@ -1498,6 +1501,7 @@ export default {
       //刷新--事件日志
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventLogList = res.data.eventlog
+        this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
       })
     },
     // 页面元素转图片