Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

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', () => {

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]

src/views/stationOperation/index.vue

@@ -525,8 +525,8 @@ export default {
     },
 
     // 地图图标点击
-    onMarkerClick() {
-      this.$refs.mapPane.handleOpenAnalyzeModal()
+    onMarkerClick(stationInfo) {
+      this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
     },
 
     getScrollContainer() {