Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/board/GPS/index.vue

@@ -55,8 +55,8 @@
       <div class="info1">监控单元数量</div>
       <div class="info2">设备数量</div>
       <div class="info3">在线设备数量</div>
-      <div class="num1">{{ num1 }}</div>
-      <div class="num2">{{ num2 }}</div>
+      <div class="num1">{{ num2 }}</div>
+      <div class="num2">{{ num1 }}</div>
       <div class="num3">{{ num3 }}</div>
     </div>
     <div id="map" class="map"></div>
@@ -140,6 +140,7 @@ export default {
   },
   methods: {
     async getData() {
+      if(this.$store.getters.sceneId === null) return
       await this.createMap()
       await this.getAlarmStats()
       await this.getAubDevice()
@@ -227,6 +228,7 @@ export default {
       map.setFitView()
     },
     async getAlarmStats() {
+      if(this.$store.getters.sceneId === null) return
       const {data} = await alarmStats(this.$store.getters.sceneId)
       let option1 = {
         ...this.chart1Option,