|
@@ -373,7 +373,7 @@
|
|
|
<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
|
|
|
</div>
|
|
|
<div class="i-list-con small-bottom-margin h-19">
|
|
|
- <dv-scroll-ranking-board :config="reportList" style="width: 100%;height: 20vh; padding:.5rem 1rem"/>
|
|
|
+ <dv-scroll-ranking-board :config="reportList" style="width: 100%;height: 300px; padding:.5rem 1rem"/>
|
|
|
</div>
|
|
|
</dv-border-box-13>
|
|
|
</div>
|
|
@@ -565,12 +565,10 @@ export default {
|
|
|
if (this.eventList[i].eventStatusValue == 'forest_event_status_1' && this.eventList[i].urgeCount == 0) {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-xinshangbao'
|
|
|
- markersMap.isAggregation = true
|
|
|
}
|
|
|
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 = true
|
|
|
} else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-qianshou'
|
|
@@ -582,7 +580,6 @@ export default {
|
|
|
} else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-guidang'
|
|
|
- markersMap.isAggregation = true
|
|
|
}
|
|
|
markersMap.parameter = this.eventList[i].eventCode
|
|
|
markersMap.lng = this.eventList[i].longitude
|
|
@@ -927,12 +924,10 @@ export default {
|
|
|
if (this.eventList[i].eventStatusValue == 'forest_event_status_1' && this.eventList[i].urgeCount == 0) {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-xinshangbao'
|
|
|
- markersMap.isAggregation = true
|
|
|
}
|
|
|
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 = true
|
|
|
} else if (this.eventList[i].eventStatusValue == 'forest_event_status_2') {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-qianshou'
|
|
@@ -944,7 +939,6 @@ export default {
|
|
|
} else if (this.eventList[i].eventStatusValue == 'forest_event_status_6') {
|
|
|
markersMap.click = 'showEventDialog'
|
|
|
markersMap.icon = 'sj-icon-map-guidang'
|
|
|
- markersMap.isAggregation = true
|
|
|
}
|
|
|
markersMap.parameter = this.eventList[i].eventCode
|
|
|
markersMap.lng = this.eventList[i].longitude
|