From 062b80ea168fd2512ff9c0e5c82aa2188ed638bf Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 27 Oct 2023 17:06:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=82=B9=E5=87=BB=E5=8F=B0=E7=AB=99?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=89=93=E5=BC=80=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E7=8A=B6=E6=80=81=E5=BC=B9=E7=AA=97=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8F=B0=E7=AB=99=E5=9C=A8=E5=B7=B2?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=9A=84=E5=8F=B0=E7=AB=99=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E5=B0=86=E5=85=B6=E5=9C=A8=E5=8F=B3=E4=BE=A7=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=BD=AE=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stationOperation/components/MapMarker.vue |  2 +-
 src/views/stationOperation/components/MapPane.vue   | 13 ++++++++++---
 src/views/stationOperation/index.vue                |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue
index 662ce29..83b15e6 100644
--- a/src/views/stationOperation/components/MapMarker.vue
+++ b/src/views/stationOperation/components/MapMarker.vue
@@ -136,7 +136,7 @@ export default {
       img.draggable = false
       img.src = MarkerIcon[stationInfo.stationType]
       img.addEventListener('click', () => {
-        this.$emit('markerClick')
+        this.$emit('markerClick', stationInfo)
       })
 
       img.addEventListener('mouseover', () => {
diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 5dcf50f..adc5605 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -14,7 +14,7 @@
       <div class="map-pane-operators-main-operator">
         <div>
           <img v-if="dataStatusModalVisible" src="@/assets/images/station-operation/analyze-active.png" />
-          <img v-else src="@/assets/images/station-operation/analyze.png" @click="handleOpenAnalyzeModal" />
+          <img v-else src="@/assets/images/station-operation/analyze.png" @click="handleOpenAnalyzeModal()" />
         </div>
         <div>
           <img
@@ -423,7 +423,9 @@ export default {
 
       showPane: true,
       spinLoading: false,
-      maskVisi: false
+      maskVisi: false,
+
+      stationInfo: undefined
     }
   },
   created() {
@@ -616,7 +618,8 @@ export default {
     },
 
     // 打开分析弹窗
-    handleOpenAnalyzeModal() {
+    handleOpenAnalyzeModal(stationInfo) {
+      this.stationInfo = stationInfo
       this.dataStatusModalVisible = true
     },
 
@@ -743,6 +746,10 @@ export default {
         this.maskVisi = false
         this.spinLoading = false
         if (success) {
+          // 如果从地图的Marker上点开，且点开的为已关注的台站，则把这个台站放到前面
+          if(this.stationInfo) {
+            result.sort(({ stationId }) => stationId == this.stationInfo.stationId? -1: 1) // chrome 和 firefox下表现不同，但都能将目标值排到第一个
+          }
           const statusList = []
           result.forEach(item => {
             const detectorArr = item.detectors[item.stationId]
diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue
index e70c785..b4ef162 100644
--- a/src/views/stationOperation/index.vue
+++ b/src/views/stationOperation/index.vue
@@ -525,8 +525,8 @@ export default {
     },
 
     // 地图图标点击
-    onMarkerClick() {
-      this.$refs.mapPane.handleOpenAnalyzeModal()
+    onMarkerClick(stationInfo) {
+      this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
     },
 
     getScrollContainer() {