Merge branch '03/12permission' into dev

src/permission.js

@@ -102,6 +102,7 @@ router.beforeEach(async (to, from, next) => {
           await store.dispatch('user/getInfo')
           // 请求接口 生成可访问路由
           const accessRoutes = await store.dispatch('permission/generateRoutes')
+          accessRoutes.push({ path: '*', redirect: '/404', hidden: true })
           // 动态添加可访问的路由
           router.addRoutes(accessRoutes)
           // 确保addroutes完整的hack方法
@@ -115,10 +116,11 @@ router.beforeEach(async (to, from, next) => {
             next({ ...to, replace: true })
           }
         } catch (error) {
-          console.log(error)
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
-          Message.error(error.msg || 'Has Error')
+          if(error.msg) {
+            Message.error(error.msg)
+          }
           next(`/login`)
           NProgress.done()
         }

src/views/repairManager/repairList.vue

@@ -117,6 +117,8 @@
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+           <!-- v-permission="'studentRepair/export'" -->
+          <el-button @click="onExport" type="primary" v-permission="'studentRepair/export'">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -426,6 +428,9 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSoundTree } from "@/api/buildTeam";
+import { Export } from '@/utils/downLoadFile'
+import qs from 'qs'
+import { getTimes } from "@/utils";
 import {
   findAllTechnician,
   studentRepairList,
@@ -573,6 +578,15 @@ export default {
         }
       });
     },
+    onExport() {
+      const {timer, ...rest} = this.searchForm
+      Export(this, {
+        url: '/api-web/studentRepair/export',
+        fileName: '维修单.xlsx',
+        method: 'post',
+        params: qs.stringify({ ...rest, ...getTimes(timer, ["startTime", "endTime"]) })
+      }, '您确定导出维修单列表?')
+    }
   },
   watch: {
     repairVisible(val) {

src/views/teamDetail/components/resetClass.vue

@@ -819,6 +819,7 @@ export default {
       bigin: this.beginDate(),
       options: this.processDate(),
       team_status: "",
+      activeList:[]
     };
   },
   created() {