From a4e284711c26d174b1cd691c6d2b76d8c51795a1 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Fri, 1 Sep 2023 11:17:46 +0800
Subject: [PATCH] =?UTF-8?q?station=20=E5=9C=B0=E5=9B=BEicon=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stationOperation/components/MapMarker.vue |  5 ++-
 .../components/markerPopupColumns.js          | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

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',