Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy

src/views/stationOperation/components/MapPane.vue

@@ -697,6 +697,7 @@ export default {
             this.$message.success('Save Success')
             await this.getDataRecieveSettings()
             this.startGetDataReceiveStatusList()
+            this.$emit('focusStationChange')
           } else {
             this.$message.error(message)
           }

src/views/stationOperation/index.vue

@@ -156,6 +156,7 @@
           @filterMarker="onFilterMarker"
           @drawCircle="onDrawCircle"
           @mapSourceChange="handleMapSourceChange"
+          @focusStationChange="getFollowedStationList"
         />
       </Map>
     </div>
@@ -200,6 +201,9 @@ export default {
     clearInterval(this.timer)
     this.timer = null
   },
+  activated() {
+    this.getFollowedStationList()
+  },
   data() {
     return {
       activeKey: '1',
@@ -240,7 +244,6 @@ export default {
   },
   created() {
     this.getStationList()
-    this.getFollowedStationList()
     this.getStationTypeList()
     this.getStationTree()
   },