fix 1打印日之前面加上飞机名字 2menu缩进按钮后加上延迟半秒更新地图组件大小

src/views/layout/components/headbar.vue

@@ -23,7 +23,7 @@
           <!-- 账号id显示 -->
           <el-dropdown-item command="go-adminEdit">
             <i class="el-icon-user-solid m-r-10"></i>
-            <font class="brandFontColor">{{ this.$store.state.user.name }}</font>
+            <font class="brandFontColor">{{ $store.state.user.name }}</font>
           </el-dropdown-item>
           <!-- 自定义语言设置为右侧弹出 -->
           <el-dropdown-item>

src/views/layout/components/main/download/index.vue

@@ -43,7 +43,7 @@ export default {
   methods: {
     downloadApk () {
       const link = document.createElement('a')
-      link.href = 'https://szdot.top/app-release.apk'
+      link.href = 'https://szdot.top/lz-app-release.apk'
       link.target = '_blank'
       link.download = 'KPT-SP_v1.01.apk'
       document.body.appendChild(link)

src/views/layout/components/main/home/index.vue

@@ -130,10 +130,19 @@ export default {
       deep: true
     },
     /**
-     * @description: 侧边栏显隐
+     * @description: 侧边栏缩进有变化时 地图重新自适应
      */
-    isCollapse () {
-      return this.$store.state.app.isCollapse
+    isCollapse: {
+      handler (val) {
+        if (val) {
+          setTimeout(() => {
+            this.$nextTick(() => {
+              this.$refs.mapbox.handleResize()
+            })
+          }, 500)
+        }
+      },
+      deep: true
     }
   },
   destroyed () {

src/views/layout/components/main/planes/index.vue

@@ -290,11 +290,14 @@ export default {
     isCollapse: {
       handler (val) {
         if (val) {
-          this.$nextTick(() => {
-            this.$refs.mapbox.handleResize()
-          })
+          setTimeout(() => {
+            this.$nextTick(() => {
+              this.$refs.mapbox.handleResize()
+            })
+          }, 500)
         }
-      }
+      },
+      deep: true
     }
   }
 }

src/views/layout/components/main/planes/swarm.vue

@@ -307,10 +307,19 @@ export default {
       deep: true
     },
     /**
-     * @description: 侧边栏显隐
+     * @description: 侧边栏缩进有变化时 地图重新自适应
      */
-    isCollapse () {
-      return this.$store.state.app.isCollapse
+    isCollapse: {
+      handler (val) {
+        if (val) {
+          setTimeout(() => {
+            this.$nextTick(() => {
+              this.$refs.mapbox.handleResize()
+            })
+          }, 500)
+        }
+      },
+      deep: true
     }
   }
 }

src/views/layout/components/main/route/add.vue

@@ -80,6 +80,12 @@ export default {
      */
     routeList () {
       return this.$store.state.routeList
+    },
+    /**
+     * @description: 侧边栏显隐
+     */
+    isCollapse () {
+      return this.$store.state.app.isCollapse
     }
   },
   methods: {
@@ -169,6 +175,21 @@ export default {
   watch: {
     routeList () {
       this.initPage()// 初始化页面
+    },
+    /**
+     * @description: 侧边栏缩进有变化时 地图重新自适应
+     */
+    isCollapse: {
+      handler (val) {
+        if (val) {
+          setTimeout(() => {
+            this.$nextTick(() => {
+              this.$refs.mapbox.handleResize()
+            })
+          }, 500)
+        }
+      },
+      deep: true
     }
   },
   created () {

src/views/layout/index.vue

@@ -134,6 +134,7 @@ export default {
      * @param {*} res 飞机列表
      */
     airList (res) {
+      console.log(res)
       /* mqtt */
       mqtt.mqttConf()// 连接mqtt
       // 订阅飞机信息
@@ -220,7 +221,7 @@ export default {
                   plane.planeState[key] = homePosition
                 } else if (key === 'statusText') {
                   /* 飞控信息 插入日志 */
-                  this.$store.dispatch('fetchLog', { content: jsonData[key], color: '#f57c00' })
+                  this.$store.dispatch('fetchLog', { content: `${plane.name}--${jsonData[key]}`, color: '#f57c00' })
                 } else {
                   plane.planeState[key] = jsonData[key] // 按订阅信息 刷新飞机状态
                 }