事件详情日志上传文件展示

src/assets/styles/base.scss

@@ -65,13 +65,13 @@ $eventStateColor-qs:#f18425;
 $eventStateColor-wb: #c2bc43;
 $eventStateColor-cf: #a23737;
 $eventStateColor-bj: #6ae08f;
-$eventStateColor-gd: #0bef03;
+$eventStateColor-gd: #0369ef;
 
 $eventStateColor-xsb:#11b57e;
 $eventStateColor-cb:#e63b4a;
 $eventStateColor-yqs:#f18425;
 $eventStateColor-ld:#a23737;
-$eventStateColor-tb:#4fc1e0;
+$eventStateColor-tb:#0369ef;
 
 
 //日历状态
@@ -1521,6 +1521,24 @@ div::-webkit-scrollbar {
 							border-radius: .2rem;
 						}
 					}
+					.event-state-cb{
+						display:flex;
+						align-items: center;
+						i{
+							color:$eventStateColor-cb;
+							font-size: 1rem;
+							margin-left: -.5rem;
+						}
+						.event-list-state-cb{
+							width: fit-content;
+							background-color: $eventStateColor-cb;
+							color: $white;
+							padding: .4rem;
+							margin-left: -.5rem;
+							margin-bottom: .2rem;
+							border-radius: .2rem;
+						}
+					}
 					.event-state-qs{
 						display:flex;
 						align-items: center;

src/components/vBottomMenu.vue

@@ -25,7 +25,7 @@
       </div>
       <div class="btm-left-tip">
         <div class="btm-left-block btm-left-state-c6"></div>
-        填报
+        归档
       </div>
       <div class="btm-legend" @click="btmIndent">
         <span>图例</span>

src/views/eventdetailsdialog.vue

@@ -1326,9 +1326,9 @@ export default {
           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 == 'event_event_status_4' || res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
+          } 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'
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_6') {
+          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-ywc'
           } else {
             markersMap.icon = 'sj-icon-map-clz'
@@ -1369,17 +1369,14 @@ export default {
             isAggregation: false,
             radius: 0
           }
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_2' || res.data.catalogue[0].eventStatusValue == 'forest_event_status_3') {
-            markersMap.icon = 'sj-icon-map-clz'
-            markersMap.isAggregation = false
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_4') {
-            markersMap.icon = 'sj-icon-map-wcl'
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_5') {
-            markersMap.icon = 'sj-icon-map-wcl'
-          } else if (res.data.catalogue[0].eventStatusValue == 'event_event_status_6') {
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1') {
             markersMap.icon = 'sj-icon-map-wcl'
-          } else {
+          } 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'
+          } 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.lng = res.data.catalogue[0].longitude
           markersMap.lat = res.data.catalogue[0].latitude
@@ -1523,7 +1520,7 @@ export default {
     height: 2rem;
     border: 1px $searchBorder;
     text-align: center;
-	
+
   }
 
   .font1 {
@@ -1553,7 +1550,7 @@ export default {
   table tr td input:hover{
 	  background: $eventBG;
   }
-  
+
 
   .int_tr td input {
     text-align: center !important;
@@ -1601,12 +1598,12 @@ export default {
     resize: none;
 	background: none ;
 	color: $inBlue;
-	
+
   }
   .table2 tr td textarea:hover {
 	background: $eventBG;
   }
- 
+
   .tr_border td {
     border-right: 0px !important;
     border-left: 0px !important;

src/views/forest.vue

@@ -198,10 +198,16 @@
                     <img src="../assets/images/integrated/event-img-sub.png"/>
                   </div>
                   <div class="bgt-info">
-                    <div v-if="item.eventStatusValue=='forest_event_status_1'" class="event-state-sb">
+                    <div v-if="item.eventStatusValue=='forest_event_status_1'&&item.urgeCount==0" class="event-state-sb">
                       <i class="el-icon-caret-left"></i>
                       <div class="event-list-state-sb">
-                        {{ item.eventStatus }}
+                        新上报
+                      </div>
+                    </div>
+                    <div v-if="item.eventStatusValue=='forest_event_status_1'&&item.urgeCount>0" class="event-state-cb">
+                      <i class="el-icon-caret-left"></i>
+                      <div class="event-list-state-cb">
+                        催办
                       </div>
                     </div>
                     <div v-if="item.eventStatusValue=='forest_event_status_2'" class="event-state-qs">
@@ -234,7 +240,7 @@
                         归档
                       </div>
                     </div>
-                    <div class="bgt-info-name">{{ item.reportor }}</div>
+                    <div class="bgt-info-name">{{ item.reportor }} {{ item.eventName }}</div>
                     <div class="bgt-info-place">
                       <ul>
                         <li>{{ item.reportTime }}</li>
@@ -467,10 +473,10 @@ export default {
             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 == 'event_event_status_4' || this.eventList[i].eventStatusValue == 'event_event_status_5') {
+          } 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') {
             markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-clz'
-          } else if (this.eventList[i].eventStatusValue == 'event_event_status_6') {
+          } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
             markersMap.click = 'showEventDialog'
             markersMap.icon = 'sj-icon-map-ywc'
           } else {
@@ -787,6 +793,7 @@ export default {
       //右侧获取事件列表
       getEventList({ day: day }).then(res => {
         this.eventList = res.data
+        console.log(this.eventList)
         this.eventListAll = res.data
         that.markersList = []
         if (this.eventList != null && this.eventList.length > 0) {
@@ -805,13 +812,19 @@ export default {
               markersMap.isAggregation = true
             }
             if (this.eventList[i].eventStatusValue == 'forest_event_status_1') {
-              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 == 'event_event_status_4' || this.eventList[i].eventStatusValue == 'event_event_status_5') {
+              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') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-clz'
-            } else if (this.eventList[i].eventStatusValue == 'event_event_status_6') {
+            } else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
               markersMap.click = 'showEventDialog'
               markersMap.icon = 'sj-icon-map-ywc'
             } else {