lex-xin 4 年之前
父节点
当前提交
9a79f351cf
共有 70 个文件被更改,包括 27 次插入5 次删除
  1. 0 0
      dist/index.html
  2. 1 0
      dist/static/css/chunk-070f0ff8.ac4093e3.css
  3. 0 0
      dist/static/css/chunk-1b5749db.8dc0b112.css
  4. 0 0
      dist/static/css/chunk-246dd31b.263f2d07.css
  5. 0 0
      dist/static/css/chunk-262179b2.a7d95138.css
  6. 0 0
      dist/static/css/chunk-2e582aba.473a4419.css
  7. 0 0
      dist/static/css/chunk-42f7c35e.98b2fc75.css
  8. 1 0
      dist/static/css/chunk-445594f7.5b4a2463.css
  9. 0 0
      dist/static/css/chunk-5c1f61e6.0d0de3a4.css
  10. 0 0
      dist/static/css/chunk-5db4513e.103cf19d.css
  11. 0 0
      dist/static/css/chunk-6ca44dac.7ae363d2.css
  12. 0 0
      dist/static/css/chunk-76dcf6a2.46dbc983.css
  13. 0 0
      dist/static/css/chunk-ba05f8b2.79fe704b.css
  14. 0 0
      dist/static/js/app.995ad6d9.js
  15. 0 0
      dist/static/js/chunk-0182cd82.de39bff8.js
  16. 0 0
      dist/static/js/chunk-070f0ff8.b486e5ea.js
  17. 0 0
      dist/static/js/chunk-091d9e8c.2e635e7f.js
  18. 0 0
      dist/static/js/chunk-0ca7302a.bec6fe90.js
  19. 0 0
      dist/static/js/chunk-126f9f72.4f53874a.js
  20. 0 0
      dist/static/js/chunk-12a33f1e.b2d87548.js
  21. 0 0
      dist/static/js/chunk-1341b691.21c56cde.js
  22. 0 0
      dist/static/js/chunk-159332fe.56054630.js
  23. 0 0
      dist/static/js/chunk-16ec54a1.d06a8a60.js
  24. 0 0
      dist/static/js/chunk-1b5749db.daf1fbbf.js
  25. 0 0
      dist/static/js/chunk-22000157.74a67b08.js
  26. 0 0
      dist/static/js/chunk-23ad114e.f5ddda71.js
  27. 0 0
      dist/static/js/chunk-246dd31b.2fe2ab0d.js
  28. 0 0
      dist/static/js/chunk-257eca28.db2d8d1a.js
  29. 0 0
      dist/static/js/chunk-262179b2.21a05f8e.js
  30. 0 0
      dist/static/js/chunk-29a09b8f.f73dfd6e.js
  31. 0 0
      dist/static/js/chunk-2e582aba.b58ce531.js
  32. 0 0
      dist/static/js/chunk-2ee59452.088d2703.js
  33. 0 0
      dist/static/js/chunk-2f5df327.5e63783b.js
  34. 0 0
      dist/static/js/chunk-31e5db7d.039dc127.js
  35. 0 0
      dist/static/js/chunk-352cfc19.0b82d63b.js
  36. 0 0
      dist/static/js/chunk-36601564.a95c83b3.js
  37. 0 0
      dist/static/js/chunk-367636d1.b26cc44c.js
  38. 0 0
      dist/static/js/chunk-3824cd12.76d73a84.js
  39. 0 0
      dist/static/js/chunk-3d44bd43.aff3b67c.js
  40. 0 0
      dist/static/js/chunk-4044fa84.cd079cc5.js
  41. 0 0
      dist/static/js/chunk-42f7c35e.ddb8c3a3.js
  42. 0 0
      dist/static/js/chunk-4346e3a1.0be0736f.js
  43. 0 0
      dist/static/js/chunk-445594f7.19a72ba5.js
  44. 0 0
      dist/static/js/chunk-495439dc.91b64afb.js
  45. 0 0
      dist/static/js/chunk-49fdaf2c.ece88241.js
  46. 0 0
      dist/static/js/chunk-4d2bb3b0.5c7f07a9.js
  47. 0 0
      dist/static/js/chunk-531b4d2d.21b91b9d.js
  48. 0 0
      dist/static/js/chunk-58deebac.72c1a0be.js
  49. 0 0
      dist/static/js/chunk-5c1f61e6.8a0400f2.js
  50. 0 0
      dist/static/js/chunk-5c22057c.d4271634.js
  51. 0 0
      dist/static/js/chunk-5db4513e.30953492.js
  52. 0 0
      dist/static/js/chunk-5e1ddbca.28f51c2c.js
  53. 0 0
      dist/static/js/chunk-5e5fa500.cec34355.js
  54. 0 0
      dist/static/js/chunk-5fb18b36.002dcd7f.js
  55. 0 0
      dist/static/js/chunk-663b1c07.34c8ff94.js
  56. 0 0
      dist/static/js/chunk-68259a14.b4d57a06.js
  57. 0 0
      dist/static/js/chunk-68b8622f.5745cb1a.js
  58. 0 0
      dist/static/js/chunk-6ca44dac.55bf13c9.js
  59. 0 0
      dist/static/js/chunk-76dcf6a2.a1e8e2b5.js
  60. 0 0
      dist/static/js/chunk-78d00d56.9fe06e00.js
  61. 0 0
      dist/static/js/chunk-a23e2ba4.77766c34.js
  62. 0 0
      dist/static/js/chunk-a297df6a.13536f8a.js
  63. 0 0
      dist/static/js/chunk-a4e62e66.aabc1e4f.js
  64. 0 0
      dist/static/js/chunk-b74fc93a.2b727a91.js
  65. 0 0
      dist/static/js/chunk-ba05f8b2.7962b600.js
  66. 0 0
      dist/static/js/chunk-commons.357404f9.js
  67. 0 0
      dist/static/js/chunk-d9d8b098.465d569e.js
  68. 0 0
      dist/static/js/chunk-f9f7cb00.733f327a.js
  69. 1 1
      src/components/tab-router/index.vue
  70. 24 4
      src/permission.js

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-070f0ff8.ac4093e3.css

@@ -0,0 +1 @@
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-05a1935c] .description-title{margin:0!important}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-1b5749db.8dc0b112.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-246dd31b.263f2d07.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-262179b2.a7d95138.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-2e582aba.473a4419.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-42f7c35e.98b2fc75.css


+ 1 - 0
dist/static/css/chunk-445594f7.5b4a2463.css

@@ -0,0 +1 @@
+.schoolCell[data-v-4a29fc2f]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4a29fc2f] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-59b9bbad]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-59b9bbad] .el-textarea.is-disabled .el-textarea__inner{color:#333}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-5c1f61e6.0d0de3a4.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-5db4513e.103cf19d.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-6ca44dac.7ae363d2.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-76dcf6a2.46dbc983.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/chunk-ba05f8b2.79fe704b.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.995ad6d9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-0182cd82.de39bff8.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-070f0ff8.b486e5ea.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-091d9e8c.2e635e7f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-0ca7302a.bec6fe90.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-126f9f72.4f53874a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-12a33f1e.b2d87548.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-1341b691.21c56cde.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-159332fe.56054630.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-16ec54a1.d06a8a60.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-1b5749db.daf1fbbf.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-22000157.74a67b08.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-23ad114e.f5ddda71.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-246dd31b.2fe2ab0d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-257eca28.db2d8d1a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-262179b2.21a05f8e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-29a09b8f.f73dfd6e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2e582aba.b58ce531.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2ee59452.088d2703.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-2f5df327.5e63783b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-31e5db7d.039dc127.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-352cfc19.0b82d63b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-36601564.a95c83b3.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-367636d1.b26cc44c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-3824cd12.76d73a84.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-3d44bd43.aff3b67c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4044fa84.cd079cc5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-42f7c35e.ddb8c3a3.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4346e3a1.0be0736f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-445594f7.19a72ba5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-495439dc.91b64afb.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-49fdaf2c.ece88241.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-4d2bb3b0.5c7f07a9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-531b4d2d.21b91b9d.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-58deebac.72c1a0be.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5c1f61e6.8a0400f2.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5c22057c.d4271634.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5db4513e.30953492.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5e1ddbca.28f51c2c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5e5fa500.cec34355.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-5fb18b36.002dcd7f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-663b1c07.34c8ff94.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-68259a14.b4d57a06.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-68b8622f.5745cb1a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-6ca44dac.55bf13c9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-76dcf6a2.a1e8e2b5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-78d00d56.9fe06e00.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-a23e2ba4.77766c34.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-a297df6a.13536f8a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-a4e62e66.aabc1e4f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-b74fc93a.2b727a91.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-ba05f8b2.7962b600.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-commons.357404f9.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d9d8b098.465d569e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-f9f7cb00.733f327a.js


+ 1 - 1
src/components/tab-router/index.vue

@@ -42,7 +42,7 @@ export default {
     getAllPanel() {
       const data = {};
       const routes = [];
-      this.panels = this.$slots.default.filter((item) => {
+      this.panels = (this.$slots.default || []).filter((item) => {
         const isPanel = item.tag && item.tag.indexOf("ElTabPane") > -1;
         if (isPanel && item.child) {
           data[item.child.name] = item.child;

+ 24 - 4
src/permission.js

@@ -38,6 +38,21 @@ router.onError((error) => {
   }
 });
 
+function getFirstMenu(routes) {
+  let firstMenu = null
+  routes.forEach(item => {
+    if(!firstMenu && item.children.length > 0) {
+      item.children.forEach(child => {
+        if(!firstMenu && !child.hidden) {
+          firstMenu = item.path + '/' + child.path
+        }
+      })
+    }
+  })
+  return firstMenu
+}
+
+
 router.beforeEach(async (to, from, next) => {
   // from.query = to.query
   // start progress bar
@@ -45,13 +60,13 @@ router.beforeEach(async (to, from, next) => {
   // set page title
   // document.title = getPageTitle(to.meta.title)
   document.title = getPageTitle()
-
   // determine whether the user has logged in
   const hasToken = getToken()
   if (hasToken) {
     if (to.path === '/login') {
       // 如果有tonken直接跳转到首页
-      next({ path: '/' })
+        next({ path: '/' })
+
       NProgress.done()
     } else {
       const hasGetUserInfo = store.getters.name
@@ -61,7 +76,7 @@ router.beforeEach(async (to, from, next) => {
 
         // 动态添加可访问的路由
         // router.addRoutes(accessRoutes)
-        next()
+          next()
       } else {
         try {
           // 异步获取用户信息
@@ -72,7 +87,12 @@ router.beforeEach(async (to, from, next) => {
           router.addRoutes(accessRoutes)
           // 确保addroutes完整的hack方法
           // 设置replace:true,这样导航就不会留下历史记录。
-          next({ ...to, replace: true })
+          let firstMenu = getFirstMenu(accessRoutes)
+          if(to.path == '/main/main') {
+            next({ path: firstMenu, replace: true })
+          } else {
+            next({ ...to, replace: true })
+          }
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')

部分文件因为文件数量过多而无法显示