彭宇 3 роки тому
батько
коміт
dabc6861ad
2 змінених файлів з 30 додано та 3 видалено
  1. 14 1
      src/views/event.vue
  2. 16 2
      src/views/forest.vue

+ 14 - 1
src/views/event.vue

@@ -1134,7 +1134,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">' +
@@ -1188,6 +1194,13 @@
           that.eventList = [];
           if(res.data.eventList!=null&&res.data.eventList.length>0){
             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"
+              }
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,

+ 16 - 2
src/views/forest.vue

@@ -46,14 +46,21 @@
 					</div>
 					<div class="i-list-con h-25">
 						<div id="personnel-chart" style="width: 100%;height:12vh;"></div>
-						<div class="d-l-con-icon"  v-for="(item,index) in visuForestCloudRYBO">
-							<div class="icon-con w-50">
+						<div class="d-l-con-icon">
+							<div class="icon-con w-50"  v-for="(item,index) in visuForestCloudRYBO" v-if="index%2==0">
 								<div class="icon icon-mid el-icon-user"></div>
 								<div class="icon-text">
 									<h5>{{item.job}}</h5>
 									<h6>{{item.number}}</h6>
 								</div>
 							</div>
+							<div class="icon-con w-50  m-btm-no"  v-for="(item,index) in visuForestCloudRYBO" v-if="index%2!=0">
+								<div class="icon icon-mid el-icon-user"></div>
+								<div class="icon-text">
+                  <h5>{{item.job}}</h5>
+                  <h6>{{item.number}}</h6>
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -1464,6 +1471,13 @@
 
           if(res.data.eventList!=null&&res.data.eventList.length>0){
             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"
+              }
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,