Merge branch '兰州学校' of http://111.229.174.37:3000/Food/food into 兰州学校

src/store/index.js

@@ -529,6 +529,7 @@ const store = new Vuex.Store({
       params.append('class_name', form.class_name)
       params.append('wheelbase', form.wheelbase)
       params.append('category', form.category)
+      params.append('weight_max', form.weight_max)
       params.append('describe', form.describe)
       const res = await api.post('savePlaneClass', params)
       if (res.data.status === 1) {

src/views/404.vue

@@ -9,12 +9,6 @@
       </div>
       <div class="bullshit">
         <div class="bullshit__oops">页面走丢了!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://flicube.com" target="_blank">飞行魔方官网</a>
-        </div>
-        <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below
-          to return to the homepage.</div>
         <a href="/" class="bullshit__return-home">回首页</a>
       </div>
     </div>

src/views/layout/components/menubar.vue

@@ -3,11 +3,11 @@
     <!-- logo -->
     <div class="sidebar-logo-container" :class="{ 'collapse': isCollapse }">
       <div v-if="isCollapse" key="isCollapse" class="sidebar-logo-link" @click="isTap = !isTap">
-        <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo">
+        <!-- <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo"> -->
       </div>
       <!-- 展开状态下 -->
       <div v-else key="expand" class="sidebar-logo-link" @click="isTap = !isTap">
-        <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo">
+        <!-- <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo"> -->
         <div class="sidebar-title-wrap">
           <h1 class="sidebar-title">{{ title }}</h1>
           <i class="el-icon-more arrow-icon" :class="{ rotate: !isTap }"></i>
@@ -53,7 +53,7 @@ export default {
   name: 'Menubar',
   data () {
     return {
-      title: '无人机控制终端',
+      title: 'KPT-SP',
       isTap: true, // 终端 后台切换
       show: true// 导航栏 动画切换
     }
@@ -161,13 +161,17 @@ export default {
     /**
        * @description: 监听飞机列表 有刷新导航栏
        */
-    airList (val) {
+    airList: {
-      this.loadRoute(val)
+      handler (val) {
-      this.$forceUpdate()// 刷新本组件
+        this.loadRoute(val)
+        this.$forceUpdate()// 刷新本组件
+      },
+      immediate: true, // 立即执行一次
+      deep: true // 深度监听
     },
     isTap (val) {
       if (val) {
-        this.title = '控制终端'
+        this.title = 'KPT-SP'
       } else {
         this.title = '后台管理'
       }

src/views/login.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="login-container flex column mc">
     <div class="title-container fb l-h-32 flex mac">
-      <img src="@/assets/logo.png" class="m-r-15">
+      <font class="f1 f-s-22">KPT-SP 无人机监管平台</font>
-      <font class="f1 f-s-22">飞行魔方</font>
       <font class="f2 f-s-10 m-l-5" style="vertical-align :top">v.1.0.1</font>
     </div>
     <el-form ref="loginForm" :model="loginForm" class="login-form" auto-complete="on" label-position="left">
-      <h3 class="f-s-30 m-b-15 fc">Authorize</h3>
+      <h3 class="f-s-30 m-b-15 fc">登录</h3>
       <el-form-item prop="username">
         <span class="svg-container"><i class="iconfont icon-yonghuziliao f-s-24"></i></span>
         <el-input ref="username" class="usernameBox" v-model="loginForm.username" placeholder="用户" name="username"