diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 88e57a8..b713e0a 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -226,7 +226,10 @@ export default { result.lon = decimalToDms(result.lon || result.longitude) result.lat = decimalToDms(result.lat || result.latitude, false) - this.currStationInfo = result + let params = this.currList.find(item => { + return item.stationId === result.stationId + }) + this.currStationInfo = {result,...params} } else { this.$message.error(message) } diff --git a/src/views/stationOperation/components/markerPopupColumns.js b/src/views/stationOperation/components/markerPopupColumns.js index b9febda..a7c35b4 100644 --- a/src/views/stationOperation/components/markerPopupColumns.js +++ b/src/views/stationOperation/components/markerPopupColumns.js @@ -116,6 +116,24 @@ export default { }, { label: 'TYPE', key: 'type' + }, { + label: 'USED', + key: 'used' + }, { + label: 'PHD', + key: 'phd' + }, { + label: 'PHDF', + key: 'phdf' + }, { + label: 'MET', + key: 'met' + }, { + label: 'SOH', + key: 'soh' + }, { + label: 'PHDF+MET+SOH', + key: 'phdMetSoh' }], [MarkerType.ImsRnStationG]: [{ label: 'COUNTRYCODE', @@ -153,6 +171,24 @@ export default { }, { label: 'TYPE', key: 'type' + }, { + label: 'USED', + key: 'used' + }, { + label: 'PHD', + key: 'phd' + }, { + label: 'PHDF', + key: 'phdf' + }, { + label: 'MET', + key: 'met' + }, { + label: 'SOH', + key: 'soh' + }, { + label: 'PHDF+MET+SOH', + key: 'phdMetSoh' }], [MarkerType.NRL]: [{ label: 'COUNTRYCODE',