Merge branch '02_07search' into 03/12permission

src/App.vue

@@ -355,6 +355,15 @@ input[type="number"] {
   color: #333;
   opacity: 1;
 }
+
+.horizontal-scrollbar {
+    .el-scrollbar__wrap {
+        overflow-x: hidden;
+        .el-scrollbar__view{
+            white-space: nowrap;
+         }
+    }
+}
 </style>
 <style lang="less">
 .main-dot {
@@ -368,7 +377,7 @@ input[type="number"] {
     background-color: #F56C6C;
     border-radius: 50%;
     right: -10px;
-    top: 15px;
+    top: -4px;
   }
 }
 </style>

src/layout/components/Navbar.vue

@@ -3,12 +3,21 @@
     <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
 
     <!-- <breadcrumb class="breadcrumb-container" /> -->
-    <div class="left-menu">
+    <div class="indexlayout-top-menu">
+      <!-- :class="{'active': getTopMenuActive === route.path}" -->
+      <el-scrollbar class="horizontal-scrollbar">
+          <template v-for="route in permission_routes">
+            <app-link v-if="!route.hidden" :to="route.path" :key="route.path" class="indexlayout-top-menu-li" :class="{'active': getTopMenuActive === route.path}">
+                <span>{{ route.meta.title }}</span>
+            </app-link>
+          </template>
+      </el-scrollbar>
+    </div>
+    <!-- <div class="left-menu">
       <i class="el-icon-location-information topIcon"></i>
 
       <el-popover placement="top-start" width="300" trigger="hover">
         <div class="popover-container">
-          <!-- <p style="color: red">{{ organName }}</p> -->
           <el-tag
             class="navbar_tag"
             type="info"
@@ -21,9 +30,9 @@
           organName.length > 10 ? organName.substr(0, 10) + "..." : organName
         }}</span>
       </el-popover>
-    </div>
+    </div> -->
     <div class="right-menu">
-      <div class="msginfo" v-permission="'/journals'" @click="gotoRecode">
+      <div class="msginfo" v-permission="'/journal'" @click="gotoRecode">
         <img src="@/assets/images/base/base-bell.svg" />
         <!-- <div class="active"></div> -->
       </div>
@@ -53,6 +62,25 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
+
+      <div class="left-menu">
+        <i class="el-icon-location-information topIcon"></i>
+
+        <el-popover placement="top-start" width="300" trigger="hover">
+          <div class="popover-container">
+            <el-tag
+              class="navbar_tag"
+              type="info"
+              v-for="item in organNameList"
+              :key="item"
+              >{{ item }}</el-tag
+            >
+          </div>
+          <span slot="reference">{{
+            organName.length > 10 ? organName.substr(0, 10) + "..." : organName
+          }}</span>
+        </el-popover>
+      </div>
     </div>
     <el-dialog
       title="修改密码"
@@ -140,6 +168,8 @@ import { mapGetters } from "vuex";
 // import Breadcrumb from '@/components/Breadcrumb'
 // import Hamburger from '@/components/Hamburger'
 import { resetPassword } from "@/api/buildTeam";
+import AppLink from './Sidebar/Link';
+import { getBelongTopMenuPath } from '@/utils/permission';
 export default {
   data() {
     return {
@@ -159,11 +189,17 @@ export default {
     };
   },
   components: {
+    AppLink
     // Breadcrumb,
     // Hamburger
   },
   computed: {
-    ...mapGetters(["sidebar", "avatar"]),
+    ...mapGetters(["sidebar", "avatar", "permission_routes"]),
+    getTopMenuActive() {
+      let route = this.$route;
+      // console.log(route, getBelongTopMenuPath(route))
+      return getBelongTopMenuPath(route);
+    }
   },
   mounted() {
     // 手动加入
@@ -262,6 +298,48 @@ export default {
 .navbar_tag {
   margin: 0 5px 8px;
 }
+
+.indexlayout-top-menu{
+  padding-left: 20px;
+  height: 60px;
+  line-height: 60px;
+  flex: 1;
+  display: flex;
+  overflow: hidden;
+  /* overflow-x: auto; */
+  .indexlayout-top-menu-li{
+    display: inline-block;
+    padding: 0 15px;
+    height: 57px;
+    text-decoration: none;
+    color: #fff;
+    font-size: 15px;
+    transition: all .3s ease;
+    span {
+      border-bottom: solid 3px transparent;
+      height: 57px;
+      line-height: 57px;
+      display: block;
+    }
+    &:hover,
+    &.active{
+      span {
+        border-bottom-color: #209e91;
+      }
+    }
+    &.active {
+      background-color: #2C3246;
+    }
+  }
+  .breadcrumb{
+    line-height: 60px;
+    margin-left: 10px;
+    .el-breadcrumb__item{
+      display: inline-block;
+      float: none;
+    }
+  }
+}
 .popover-container {
   max-height: 350px;
   overflow-y: scroll;
@@ -273,7 +351,7 @@ export default {
   height: 60px;
   overflow: hidden;
   position: relative;
-  background: #fff;
+  background: #363d55;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
@@ -299,16 +377,16 @@ export default {
   }
   .left-menu {
     line-height: 60px;
-    padding-left: 22px;
+    padding-right: 42px;
     font-size: 16px;
-    color: #444;
+    color: #fff;
     .topIcon {
       width: 20px;
       height: 25px;
     }
   }
   .right-menu {
-    min-width: 204px;
+    min-width: 154px;
     float: right;
     height: 100%;
     line-height: 60px;
@@ -323,7 +401,7 @@ export default {
       flex-direction: row;
       justify-content: flex-start;
       align-items: center;
-      margin-right: 34px;
+      margin-right: 20px;
       position: relative;
       cursor: pointer;
       img {
@@ -360,7 +438,7 @@ export default {
 
     .avatar-container {
       height: 60px;
-      margin-right: 42px;
+      margin-right: 12px;
       cursor: pointer;
 
       .avatar-wrapper {
@@ -370,10 +448,11 @@ export default {
         justify-content: flex-start;
         align-items: center;
         span {
-          margin-left: 15px;
+          margin-left: 8px;
           font-size: 14px;
           font-weight: 500;
-          color: rgba(68, 68, 68, 1);
+          // color: rgba(68, 68, 68, 1);
+          color: #fff;
         }
 
         .user-avatar {

src/layout/components/Sidebar/SidebarMenuItem.vue

@@ -0,0 +1,152 @@
+<template>
+      <div v-if="!routes.hidden" v-show="menuIsShow(routes)">
+        <template v-if="!hasChild(routes.children)">
+            <app-link :to="getResolvePathUrlRoutes">
+                <el-menu-item :index="getResolvePathUrlRoutes">
+                    <menu-title :icon="routes.meta.icon||(routes.meta&&routes.meta.icon)" :title="routes.meta.title" />
+                </el-menu-item>
+            </app-link>
+        </template>
+
+        <el-submenu v-else :index="getResolvePathUrlRoutes" popper-append-to-body>
+            <template slot="title">
+                <menu-title v-if="routes.meta" :icon="routes.meta && routes.meta.icon" :title="routes.meta.title" />
+            </template>
+            <sidebar-menu-item
+                v-for="child in routes.children"
+                :key="getResolvePathUrlRoutes + '/' + child.path"
+                :routes="child"
+                :base-path="getBasePath"
+                :resolve-path="getResolvePathUrlRoutes"
+                :active-top-menu="getActiveTopMenu"
+                class="nest-menu"
+            />
+        </el-submenu>
+    </div>
+</template>
+<script>
+import path from 'path';
+import { isExternal } from "@/utils/validate";
+import { getBelongTopMenuPath } from '@/utils/permission';
+import MenuTitle from './Item';
+import AppLink from './Link';
+export default {
+    name: 'SidebarMenuItem',
+    props: {
+        // route object
+        routes: {
+            type: Object,
+            required: true
+        },
+        // 根路径地址
+        basePath: {
+            type: String,
+            required: true
+        },
+        // 上级路径地址
+        resolvePath: {
+            type: String,
+            default: ''
+        },
+        activeTopMenu: {
+            type: String,
+            default: ''
+        }
+    },
+    components: {
+        MenuTitle,
+        AppLink
+    },
+    computed: {
+        getBasePath: function() {
+            return this.basePath;
+        },
+        getActiveTopMenu: function () {
+            if (this.activeTopMenu !== '') {
+                return this.activeTopMenu;
+            }
+            const route = this.$route;
+            /*
+            const { meta, path } = route;
+            if (meta.belongTopMenu) {
+                return meta.belongTopMenu;
+            }
+            return '/' + path.split('/')[1];
+            */
+            return getBelongTopMenuPath(route);
+        },
+        getResolvePathUrlRoutes: function() {
+            return this.resolvePathUrl(this.routes.path);
+        }
+    },
+    mounted() {
+        this.onlyOneChild = null;
+    },
+    methods: {
+        hasOneShowingChild(children = [], parent) {
+            const showingChildren = children.filter((item) => {
+                if (item.hidden) {
+                return false;
+                } else  {
+                // Temp set(will be used if only has one showing child)
+                this.onlyOneChild = item;
+                return true;
+                }
+            });
+
+            // When there is only one child router, the child router is displayed by default
+
+            if (showingChildren.length === 1) {
+                // console.log(showingChildren[0].meta.title)
+                return true;
+            }
+
+            // Show parent if there are no child router to display
+            if (showingChildren.length === 0) {
+                this.onlyOneChild = { ...parent, path: "", noShowingChildren: true };
+                return true;
+            }
+
+            return false;
+        },
+        menuIsShow(route) {
+            let activeTopMenu = this.getBasePath;
+            const { meta } = route;
+            if (meta.belongTopMenu) {
+                activeTopMenu = meta.belongTopMenu;
+            }
+            return activeTopMenu === this.getActiveTopMenu;
+        },
+        hasChild(children = []) {
+            const showChildren = children.filter(item => {
+                if (item.hidden) {
+                    return false;
+                } else {
+                    return true;
+                }
+            });
+            // console.log(showChildren)
+            if (showChildren.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        // resolvePath(routePath) {
+        //     if (isExternal(routePath)) {
+        //         return routePath;
+        //     }
+        //     if (isExternal(this.basePath)) {
+        //         return this.basePath;
+        //     }
+        //     return path.resolve(this.basePath, routePath);
+        // },
+        resolvePathUrl(routePath) {
+            if (isExternal(routePath)) {
+                return routePath;
+            }
+            // console.log(this.resolvePath, routePath)
+            return path.resolve(this.resolvePath, routePath);
+        }
+    }
+};
+</script>

src/layout/components/Sidebar/index.vue

@@ -12,10 +12,16 @@
                :active-text-color="variables.menuActiveText"
                :collapse-transition="true"
                mode="vertical">
-        <sidebar-item v-for="(route,index) in permission_routes"
+        <template v-for="route in permission_routes">
+          <template v-if="!route.hidden">
+            <!-- <sidebar-item  v-for="route2 in route.children" :key="route.path + '/' + route2.path" :item="route2" :base-path="route.path" :resolve-path="route.path" :active-top-menu="getTopMenuActive" /> -->
+            <sidebar-menu-item v-for="route2 in route.children" :key="route.path + '/' + route2.path" :routes="route2" :base-path="route.path" :resolve-path="route.path" :active-top-menu="getTopMenuActive"/>
+          </template>
+        </template>
+        <!-- <sidebar-item v-for="(route,index) in permission_routes"
                       :key="index"
                       :item="route"
-                      :base-path="route.path" />
+                      :base-path="route.path" /> -->
       </el-menu>
     </el-scrollbar>
   </div>
@@ -24,11 +30,12 @@
 <script>
 import { mapGetters } from 'vuex'
 import Logo from './Logo'
+import SidebarMenuItem from './SidebarMenuItem'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
-
+import { getBelongTopMenuPath, getActiveSidebarMenuPath } from '@/utils/permission';
 export default {
-  components: { SidebarItem, Logo },
+  components: { SidebarItem, Logo, SidebarMenuItem },
   // mounted () {
   // },
   computed: {
@@ -59,6 +66,15 @@ export default {
     isCollapse () {
       return false
 
+    },
+    getSidebarMenuActive: function() {
+      const route = this.$route;
+      return getActiveSidebarMenuPath(route);
+    },
+    getTopMenuActive() {
+      let route = this.$route;
+      // console.log(getBelongTopMenuPath(route))
+      return getBelongTopMenuPath(route);
     }
   }
 }
@@ -69,4 +85,8 @@ export default {
     padding-bottom: 20px;
   }
 }
+
+/deep/.el-menu-item.is-active {
+    background-color: #13817A !important;
+}
 </style>

src/router/index.js

@@ -96,7 +96,8 @@ export const constantRoutes = [
 
   {
     path: '/',
-    redirect: '/main/main'
+    redirect: '/main/main',
+    hidden: true
   },
   {
     path: '/404',
@@ -422,6 +423,7 @@ export const asyncRoutes = {
   afterSchoolManagerWrap:()=>import('@/views/courseListManager'),
   //
   serverIndexManager:()=>import('@/views/courseListManager'),
+  reportFormCenter:()=>import('@/views/courseListManager'),
   // 乐器维护
   musicalManager:()=>import('@/views/musicalManager'),
   // 服务指标明细

src/store/modules/app.js

@@ -51,7 +51,7 @@ const mutations = {
 const toggleDot = status => {
   const { indexErrData, remindMatterData } = status
   const dotStatus =  indexErrData || remindMatterData
-  const el = document.querySelector('.menu-wrapper a[href="#/main/main"] span')
+  const el = document.querySelector('.el-menu a[href="#/main/main"] span')
   if (el) {
     if (dotStatus) {
       el.classList.add('main-dot')

src/store/modules/permission.js

@@ -46,10 +46,43 @@ const mutations = {
     state.permission = permission
   }
 }
+
+function getFirstMenu(routes) {
+  let firstMenu = null
+  routes.forEach(item => {
+    if(item.children?.length > 0 && !item.hidden) {
+      firstMenu = pathErgodic(item)
+      item.redirect = firstMenu
+    }
+  })
+  return routes
+}
+
+function pathErgodic(item) {
+  let firstMenu = null
+  item.children.forEach(i => {
+    if(!firstMenu && i.children?.length > 0) {
+      firstMenu = pathErgodic(i)
+    } else {
+      if(!firstMenu && checkPathUrl(i.path)) {
+        firstMenu = i.path
+      } else {
+        if(!firstMenu && !i.hidden) {
+          firstMenu = item.path + '/' + i.path
+        }
+      }
+    }
+  })
+  return firstMenu
+}
+// 判断path有没有带/,并且是第一个位置
+function checkPathUrl(path) {
+  return path.indexOf('/') === 0 ? true : false
+}
 // 路由
+
 // 递归遍历数组
 function recursionRouter (arr) {
-
   if (arr.length > 0) {
     let newArr = [];
     for (let i = 0; i < arr.length; i++) {
@@ -66,9 +99,8 @@ function recursionRouter (arr) {
       // }
       arr[i].hid == 0 ? obj.hidden = false : obj.hidden = true
       // console.log('高亮标签'+arr[i].parentPermission,'普通路径'+arr[i].path)
-
       obj.path = arr[i].path;
-      obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon, 'noCache': arr[i].keepAlive, 'activeMenu': arr[i].parentPermission }
+      obj.meta = { 'title': arr[i].name, 'icon': arr[i].icon, 'noCache': arr[i].keepAlive, 'activeMenu': arr[i].parentPermission, 'belongTopMenu': arr[i].belongTopMenu }
       if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {
         obj.children = recursionRouter(arr[i].sysMenus);
       }
@@ -78,6 +110,42 @@ function recursionRouter (arr) {
     return newArr
   }
 }
+
+// 设置 belongTopMenu, 顶部菜单
+function addTopMenu(arr) {
+  if(arr.length > 0) {
+    let newArr = [];
+    for (let i = 0; i < arr.length; i++) {
+      if (arr[i].type == 1) {
+        continue
+      }
+      let obj = arr[i]
+      obj.belongTopMenu = obj.path
+
+      if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {
+        obj.sysMenus = setTopMenu(arr[i].sysMenus, obj);
+      }
+
+      newArr.push(obj)
+    }
+    return newArr
+  }
+}
+
+function setTopMenu(arr, topParentArr) {
+  let newArr = [];
+  for (let i = 0; i < arr.length; i++) {
+    let obj = arr[i]
+    obj.belongTopMenu = topParentArr.path
+    if (arr[i].sysMenus && arr[i].sysMenus.length > 0) {
+      obj.sysMenus = setTopMenu(arr[i].sysMenus, topParentArr);
+    }
+
+    newArr.push(obj)
+  }
+  return newArr
+}
+
 // 权限
 // 递归遍历数组
 let tempArr = []
@@ -95,7 +163,10 @@ const actions = {
       // 获取接口返回的权限菜单
       getSilder().then(res => {
         if (res.code == 200) {
-          let newData = recursionRouter(res.data);
+          let result = addTopMenu(res.data)
+          let newData = recursionRouter(result);
+          newData = getFirstMenu(newData)
+          // console.log((newData))
           recursionPermission(res.data)
           let accessedRoutes
 

src/styles/sidebar.scss

@@ -94,6 +94,11 @@
         background-color: $subMenuHover!important;
       }
     }
+    & .el-menu-item {
+      &:hover {
+        background-color: $subMenuHover!important;
+      }
+    }
   }
   .el-submenu .el-menu-item.is-active {
     background-color: $subMenuActiveBg!important;

src/utils/permission.js

@@ -0,0 +1,32 @@
+/** 
+ * 权限、显示工具
+ * @author LiQingSong
+ */
+
+/**
+ * 获取当前路由对应的顶部菜单path
+ * @param  route 当前路由
+ * @returns String
+ */
+export function getBelongTopMenuPath(route) {
+    // const route = this.$route;
+    const { meta, path } = route;
+    if (meta.belongTopMenu) {
+      return meta.belongTopMenu;
+    }
+    return '/' + path.split('/')[1];
+}
+
+/**
+ * 获取当前路由选中的侧边栏菜单path
+ * @param  route 当前路由
+ * @returns String
+ */
+export function getActiveSidebarMenuPath(route) {
+  // const route = this.$route;
+  const { meta, path } = route;
+  if (meta.activeMenu) {
+    return meta.activeMenu;
+  }
+  return path;
+}

src/utils/validate.js

@@ -1,8 +1,4 @@
 /**
- * Created by PanJiaChen on 16/11/18.
- */
-
-/**
  * @param {string} path
  * @returns {Boolean}
  */
@@ -10,6 +6,7 @@ export function isExternal(path) {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 
+
 /**
  * @param {string} str
  * @returns {Boolean}

src/views/main/index.vue

@@ -86,7 +86,7 @@ export default {
     };
   },
   mounted(){
-    console.log(permission('/main/main/allData/826'))
+    // console.log(permission('/main/main/allData/826'))
 
   },
   computed: {