Bladeren bron

修改BUG

彭宇 2 jaren geleden
bovenliggende
commit
3150798595
1 gewijzigde bestanden met toevoegingen van 34 en 38 verwijderingen
  1. 34 38
      src/views/eventdetailsdialog.vue

+ 34 - 38
src/views/eventdetailsdialog.vue

@@ -1759,13 +1759,12 @@
 					this.eventDialog = true
 					this.eventLogList = res.data.eventlog //日志列表
 					this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo //应急预案
-					if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-						this.address = res.data.catalogue[0].address
-						this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-						this.eventType = res.data.catalogue[0].eventType
-						this.eventId = res.data.catalogue[0].id
-						this.longitude = res.data.catalogue[0].longitude
-						this.latitude = res.data.catalogue[0].latitude
+						this.address = res.data.catalogue.address
+						this.eventStatusValue = res.data.catalogue.eventStatusValue
+						this.eventType = res.data.catalogue.eventType
+						this.eventId = res.data.catalogue.id
+						this.longitude = res.data.catalogue.longitude
+						this.latitude = res.data.catalogue.latitude
 						let markersMap = {
 							lng: 124.59,
 							lat: 43.02,
@@ -1777,22 +1776,22 @@
 							isAggregation: false,
 							radius: 0
 						}
-						if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data
-							.catalogue[0].urgeCount == 0) {
+						if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data
+							.catalogue.urgeCount == 0) {
 							markersMap.icon = 'sj-icon-map-xinshangbao'
 						}
-						if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data
-							.catalogue[0].urgeCount > 0) {
+						if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data
+							.catalogue.urgeCount > 0) {
 							markersMap.icon = 'sj-icon-map-cuiban'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
 							markersMap.icon = 'sj-icon-map-qianshou'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
 							markersMap.icon = 'sj-icon-map-banjie'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
 							markersMap.icon = 'sj-icon-map-guidang'
 						}
-						markersMap.lng = res.data.catalogue[0].longitude
-						markersMap.lat = res.data.catalogue[0].latitude
+						markersMap.lng = res.data.catalogue.longitude
+						markersMap.lat = res.data.catalogue.latitude
 						if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data
 							.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res
 							.data.eventdetail[0].fireRadius > 0) {
@@ -1802,10 +1801,9 @@
 							that.$refs.supermapDialog.dynamicPlotting() //弹出动态绘制窗口,防止截图位置改变
 							that.$refs.supermapDialog.clearM(false)
 							that.$refs.supermapDialog.setMarkersRadius([markersMap])
-							that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data
-								.catalogue[0].longitude)
+							that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data
+								.catalogue.longitude)
 						}, 2000)
-					}
 					if (res.data.centermonitorTCamera != null) {
 						let markersMap = {
 							lng: 124.59,
@@ -1846,13 +1844,12 @@
 					this.eventDialog = true
 					this.eventLogList = res.data.eventlog
 					this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo //应急预案
-					if (res.data.catalogue != null && res.data.catalogue.length > 0) {
-						this.address = res.data.catalogue[0].address
-						this.eventStatusValue = res.data.catalogue[0].eventStatusValue
-						this.eventType = res.data.catalogue[0].eventType
-						this.eventId = res.data.catalogue[0].id
-						this.latitude = res.data.catalogue[0].latitude
-						this.longitude = res.data.catalogue[0].longitude
+						this.address = res.data.catalogue.address
+						this.eventStatusValue = res.data.catalogue.eventStatusValue
+						this.eventType = res.data.catalogue.eventType
+						this.eventId = res.data.catalogue.id
+						this.latitude = res.data.catalogue.latitude
+						this.longitude = res.data.catalogue.longitude
 						let markersMap = {
 							lng: 124.59,
 							lat: 43.02,
@@ -1864,22 +1861,22 @@
 							isAggregation: false,
 							radius: 0
 						}
-						if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data
-							.catalogue[0].urgeCount == 0) {
+						if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data
+							.catalogue.urgeCount == 0) {
 							markersMap.icon = 'sj-icon-map-xinshangbao'
 						}
-						if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data
-							.catalogue[0].urgeCount > 0) {
+						if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data
+							.catalogue.urgeCount > 0) {
 							markersMap.icon = 'sj-icon-map-cuiban'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_2') {
 							markersMap.icon = 'sj-icon-map-qianshou'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_5') {
 							markersMap.icon = 'sj-icon-map-banjie'
-						} else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
+						} else if (res.data.catalogue.eventStatusValue == 'forest_event_status_6') {
 							markersMap.icon = 'sj-icon-map-guidang'
 						}
-						markersMap.lng = res.data.catalogue[0].longitude
-						markersMap.lat = res.data.catalogue[0].latitude
+						markersMap.lng = res.data.catalogue.longitude
+						markersMap.lat = res.data.catalogue.latitude
 						if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data
 							.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res
 							.data.eventdetail[0].fireRadius > 0) {
@@ -1894,10 +1891,9 @@
 							} else {
 								that.$refs.supermapDialog.setMarkers([markersMap])
 							}
-							that.$refs.supermapDialog.dropLocation(res.data.catalogue[0].latitude, res.data
-								.catalogue[0].longitude)
+							that.$refs.supermapDialog.dropLocation(res.data.catalogue.latitude, res.data
+								.catalogue.longitude)
 						}, 2000)
-					}
           if (res.data.centermonitorTCamera != null) {
             let markersMap = {
               lng: 124.59,