zhengjinyi 2 rokov pred
rodič
commit
e6aa361be5

+ 8 - 11
src/layout/components/AppMain.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
+      <keep-alive>
         <router-view :key="key" />
       </keep-alive>
     </transition>
@@ -28,20 +28,17 @@ export default {
   min-height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  // overflow: hidden;
+  overflow: hidden;
 }
-
-.fixed-header + .app-main {
+.fixed-header+.app-main {
   padding-top: 50px;
 }
-
 .hasTagsView {
-  // .app-main {
-  //   /* 84 = navbar + tags-view = 50 + 34 */
-  //   // min-height: calc(100vh - 84px);
-  // }
-
-  .fixed-header + .app-main {
+  .app-main {
+    /* 84 = navbar + tags-view = 50 + 34 */
+    min-height: calc(100vh - 84px);
+  }
+  .fixed-header+.app-main {
     padding-top: 84px;
   }
 }

+ 27 - 33
src/router/index.js

@@ -19,31 +19,33 @@ import memberRouter from './modules/member'
 // import nestedRouter from './modules/nested'
 
 /**
- * Note: sub-menu only appear when route children.length >= 1
- * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
- *
- * hidden: true                   if set true, item will not show in the sidebar(default is false)
- * alwaysShow: true               if set true, will always show the root menu
- *                                if not set alwaysShow, when item has more than one children route,
- *                                it will becomes nested mode, otherwise not show the root menu
- * redirect: noRedirect           if set noRedirect will no redirect in the breadcrumb
- * name:'router-name'             the name is used by <keep-alive> (must set!!!)
- * meta : {
-    roles: ['admin','editor']    control the page roles (you can set multiple roles)
-    title: 'title'               the name show in sidebar and breadcrumb (recommend set)
-    icon: 'svg-name'/'el-icon-x' the icon show in the sidebar
-    noCache: true                if set true, the page will no be cached(default is false)
-    affix: true                  if set true, the tag will affix in the tags-view
-    breadcrumb: false            if set false, the item will hidden in breadcrumb(default is true)
-    activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
+  // 当设置 true 的时候该路由不会在侧边栏出现 如401,login等页面,或者如一些编辑页面/edit/1
+  hidden: true // (默认 false)
+  //当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+  redirect: 'noRedirect'
+  // 当你一个路由下面的 children 声明的路由大于1个时,自动会变成嵌套的模式--如组件页面
+  // 只有一个时,会将那个子路由当做根路由显示在侧边栏--如引导页面
+  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
+  // 你可以设置 alwaysShow: true,这样它就会忽略之前定义的规则,一直显示根路由
+  alwaysShow: true
+
+  name: 'router-name' // 设定路由的名字,一定要填写不然使用<keep-alive>时会出现各种问题
+  meta: {
+    roles: ['admin', 'editor'] // 设置该路由进入的权限,支持多个权限叠加
+    title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
+    icon: 'svg-name' // 设置该路由的图标,支持 svg-class,也支持 el-icon-x element-ui 的 icon
+    noCache: true // 如果设置为true,则不会被 <keep-alive> 缓存(默认 false)
+    breadcrumb: false //  如果设置为false,则不会在breadcrumb面包屑中显示(默认 true)
+    affix: true // 如果设置为true,它则会固定在tags-view中(默认 false)
+
+    // 当路由设置了该属性,则会高亮相对应的侧边栏。
+    // 这在某些场景非常有用,比如:一个文章的列表页路由为:/article/list
+    // 点击文章进入文章详情页,这时候路由为/article/1,但你想在侧边栏高亮文章列表的路由,就可以进行如下设置
+    activeMenu: '/article/list'
   }
  */
 
-/**
- * constantRoutes
- * a base page that does not have permission requirements
- * all roles can be accessed
- */
+// 基础路由
 export const constantRoutes = [
   {
     path: '/',
@@ -90,10 +92,7 @@ export const constantRoutes = [
   }
 ]
 
-/**
- * asyncRoutes
- * the routes that need to be dynamically loaded based on user roles
- */
+// 默认路由列表
 export const asyncRoutes = [
   sysRouter,
   userRouter,
@@ -103,11 +102,6 @@ export const asyncRoutes = [
   wechatRouter,
   memberRouter,
   keywordLibraryRouter
-  /** when your routing map is too long, you can split it into small modules **/
-  // componentsRouter,
-  // chartsRouter,
-  // nestedRouter,
-  // tableRouter,
 ]
 
 /**
@@ -139,7 +133,7 @@ export const afterRoutes = [
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 ]
-
+// 创建路由对象
 const createRouter = () =>
   new Router({
     // mode: 'history', // require service support
@@ -149,7 +143,7 @@ const createRouter = () =>
 
 const router = createRouter()
 
-// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
+// 重置路由
 export function resetRouter() {
   const newRouter = createRouter()
   router.matcher = newRouter.matcher // reset router

+ 1 - 9
src/views/index.vue

@@ -1,11 +1,3 @@
 <template>
-  <div id="app">
-    <router-view />
-  </div>
+  <router-view />
 </template>
-
-<script>
-export default {
-  name: 'App'
-}
-</script>

+ 1 - 0
src/views/user/record/detail-list.vue

@@ -78,6 +78,7 @@
 import { fetchBehaviorList } from '@/api/user/record/record'
 
 export default {
+  name: 'RecordDtails',
   filters: {
     accessSourceFilters(value) {
       // 公司类型

+ 1 - 2
src/views/user/record/list.vue

@@ -183,7 +183,7 @@
               trigger="hover"
             >
               <span>{{ row.label ? row.label : '---' }}</span>
-              <span slot="reference">{{ row.label.substr(0,9) + '...' }}</span>
+              <span slot="reference">{{ row.label ? row.label.substr(0,9) + '...' : '--' }}</span>
             </el-popover>
             <!-- {{ row.label ? row.label : '---' }} -->
           </template>
@@ -438,7 +438,6 @@ export default {
     },
     // 机构跳转
     handleClubHrefLink(row) {
-      console.log('VUE_APP_ADMIN_URL', process.env.VUE_APP_ADMIN_URL)
       return process.env.VUE_APP_ADMIN_URL + `/a/user/jumpLink/toOldAdmin?type=1&clubId=${row.clubId}&clubName=${row.corporateName}`
     },
     // 查看详情