Merge branch '03/12permission' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/12permission

src/permission.js

@@ -41,7 +41,7 @@ router.onError((error) => {
 function getFirstMenu(routes) {
   let firstMenu = null
   routes.forEach(item => {
-    if(!firstMenu && item.children.length > 0) {
+    if(!firstMenu && item.children?.length > 0) {
       item.children.forEach(child => {
         if(!firstMenu && !child.hidden) {
           firstMenu = item.path + '/' + child.path
@@ -95,9 +95,10 @@ 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 || 'Has Error')
+          Message.error(error.msg || 'Has Error')
           next(`/login`)
           NProgress.done()
         }

src/router/notKeepAliveList.js

@@ -100,5 +100,6 @@ export default [
   '/business/ArrearageStudents',
   '/operateManager/serverDetail', // 服务指标明细
   '/business/remedy', //
+  '/setSilder/setSilder'
   // '/business/feeAudit',
 ]

src/views/setSilder/addSilder.vue

@@ -55,7 +55,7 @@
                        label="是否缓存">
         <template slot-scope="scope">
           <div>
-            {{ parseInt(scope.row.keepAlive)  == 0 ? '缓存' : '不缓存' }}
+            {{ parseInt(scope.row.keepAlive)  == '0' ? '缓存' : '不缓存' }}
           </div>
         </template>
       </el-table-column>
@@ -133,9 +133,9 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.keepAlive">
             <el-option label="是"
-                       :value="0"></el-option>
+                       value="0"></el-option>
             <el-option label="否"
-                      :value="1"></el-option>
+                      value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="菜单类型"
@@ -186,7 +186,7 @@ export default {
         hid: 1,
         type: 1,
         parentPermission: null,
-        keepAlive: 1
+        keepAlive: '1'
       },
       rules: {
         name: [{ required: true, message: "请输入菜单名", trigger: "blur" }],
@@ -324,7 +324,7 @@ export default {
           sort: res.sort,
           hid: res.hid,
           type: res.type,
-          keepAlive: res.keepAlive*1,
+          keepAlive: res.keepAlive,
           parentPermission: res.parentPermission,
           memo: res.memo
         }
@@ -355,7 +355,7 @@ export default {
         hid: 1,
         type: 1,
         parentPermission: null,
-        keepAlive: 1
+        keepAlive: '1'
       }
       this.$refs[formName].resetFields()
     }