新增导航

src/layout/components/Header/index.vue

@@ -33,7 +33,7 @@
                   v-for="pitem in item.children" 
                   :key="pitem.pathId" 
                   :index="pitem.pathId"
-                  @click="handleMenu(item.menuId,pitem.pathId)"
+                  @click="handleMenu(item.menuId,pitem)"
                   >{{pitem.label}}</el-menu-item>
               </el-submenu>
             </template>
@@ -220,7 +220,6 @@ export default {
     handleSys(event) {
       const currentRouter = this.$route.path
       const jumpRouter = '/dashboard'
-      // if(this.defaultActiveIndex === event) return;
       if (
         jumpRouter != null &&
         jumpRouter !== '' &&
@@ -238,13 +237,19 @@ export default {
         wigetid: event
       })
     },
-    handleMenu(menuId,pathId){
-      this.$router.push('/' + pathId);
+
+    handleMenu(menuId,fun){
+      this.$router.push('/' + fun.pathId);
       this.defaultActiveIndex = menuId
+      const func = {
+        code:fun.pathId,
+        name:fun.label
+      }
       this.$store.dispatch('permission/changeSys', menuId)
       this.$store.dispatch('common/setCurWidget', {
         wigetid: menuId
       })
+      this.$store.dispatch('permission/changeFun', func)
     },
 
     scrollPrev() {

src/layout/components/Sidebar/SidebarItem.vue

@@ -8,6 +8,7 @@
           <el-menu-item
             :index="resolvePath(onlyOneChild.path)"
             :class="{'submenu-title-noDropdown':!isNest}"
+            @click="FunClick(onlyOneChild)"
           >
             <item
               :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"
@@ -131,6 +132,14 @@ export default {
       }
       this.$store.dispatch('map/changeMethod', info);
 
+    },
+
+    FunClick(menu){
+      const func = {
+        code:menu.path,
+        name:menu.label
+      }
+      this.$store.dispatch('permission/changeFun', func)
     }
   }
 };

src/layout/index.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="app-mian-wrapper">
-    <!-- <div v-if="!isFullPanal" :class="classObj" class="app-wrapper"> -->
     <div :class="classObj" class="app-wrapper">
       <Header v-if="showHeader" :class="{'fixed-header-tow': showHeader}" />
-      <!-- <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> -->
       <div v-if="!showMainPage" class="tf-main-container">
         <sidebar class="sidebar-container" :style="{'top': showHeader ? '30px' : ''}" />
         <div id="main-container" class="main-container">
@@ -11,10 +9,13 @@
             <navbar v-if="showNavBar" />
             <tags-view v-if="showTagsView" />
           </div> -->
-          <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>公司动态</el-breadcrumb-item>
-      </el-breadcrumb>
+          <div class="tf-separator-class">
+            <el-breadcrumb separator-class="el-icon-arrow-right">
+              <el-breadcrumb-item :to="{}" @click.native="gotoPage('dashboard')">首页</el-breadcrumb-item>
+              <el-breadcrumb-item :to="{}" @click.native="gotoPage('')">{{sysName}}</el-breadcrumb-item>
+              <el-breadcrumb-item>{{funName}}</el-breadcrumb-item>
+            </el-breadcrumb>
+          </div>
           <app-main />
         </div>
       </div>
@@ -50,7 +51,9 @@ export default {
   data() {
     return {
       isFullPanal: localStorage.getItem('isFullPanal') === '',
-      showMainPage:true
+      showMainPage:true,
+      sysName:'',
+      funName:'',
     }
   },
   computed: {
@@ -59,15 +62,15 @@ export default {
     },
     currSys(){
       if(this.$store.state.permission.currSys == null){
-        this.$router.push('/dashboard')
-        this.$store.dispatch('permission/changeSys', 'dashboard')
-        this.$store.dispatch('common/setCurWidget', {
-          wigetid: 'dashboard'
-        })
+        this.gotoPage('dashboard');
       }
       return this.$store.state.permission.currSys;
     },
 
+    currFun(){
+      return this.$store.state.permission.currFun;
+    },
+
     device() {
       return this.$store.state.app.device
     },
@@ -94,12 +97,15 @@ export default {
   },
   watch: {
     isFullPanal: function(val, oldval) {
-      console.log(localStorage.getItem('isFullPanal'))
       this.isFullPanal = localStorage.getItem('isFullPanal') === ''
     },
     currSys(nVal,oVal){
       this.showMainPage = nVal.hasOwnProperty('code') ? (nVal.code == "dashboard" ? true : false) : false
+      this.sysName = nVal.hasOwnProperty('name') ? nVal.name : '无'
     },
+    currFun(nVal,oVal){
+      this.funName = nVal.hasOwnProperty('name') ? nVal.name : '无'
+    }
   },
   created: function() {
     localStorage.setItem('isFullPanal', '')
@@ -108,10 +114,15 @@ export default {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     },
-
-    handleFullPanal() {
-      localStorage.setItem('isFullPanal', '1')
-      this.isFullPanal = false
+    gotoPage(route){
+      if(route == ''){
+        route = this.$store.state.permission.currSys.code;
+      }
+      this.$router.push('/'+route)
+      this.$store.dispatch('permission/changeSys', route)
+      this.$store.dispatch('common/setCurWidget', {
+        wigetid: route
+      })
     }
   }
 }
@@ -142,6 +153,13 @@ export default {
       position: fixed;
       top: 124px;
       left: calc(50% - 600px);
+      .tf-separator-class{
+        top: 30px;
+        position: relative;
+        height: 40px;
+        line-height: 30px;
+        padding: 10px 30px;
+      }
     }
     .tf-main{
       width: 100%;

src/store/modules/permission.js

@@ -8,6 +8,7 @@ const state = {
   routes: constantRoutes,
   addRoutes: [],
   currSys: null,
+  currFun: null,
 }
 
 const mutations = {
@@ -19,16 +20,22 @@ const mutations = {
     state.addRoutes = []
   },
   CHANGESYS: (state, data) => {
-    // if (data === 'kpi') {
-    //   state.routes = kpi
-    // }
     const currMenu = sysMenu.find(item => item.menuId === data)
-    let currSys = { code: data,name:''}
+    let currSys = { code: data, name: '' }
+    let currFun = { code: '', name: '' }
     if (currMenu) { 
       state.routes = currMenu.children
-      currSys = { code: data,name:currMenu.menuName}
+      currSys = { code: data, name: currMenu.menuName }
+      if (currMenu.children.length > 0) { 
+        currFun.code = currMenu.children[0].pathId
+        currFun.name =  currMenu.children[0].label
+      }
     }
-    state.currSys = Object.assign({}, currSys);
+    state.currSys = Object.assign({}, currSys)
+    state.currFun = Object.assign({}, currFun)
+  },
+  CHANGEFUN: (state, data) => { 
+    state.currFun = Object.assign({}, data)
   }
 }
 
@@ -51,7 +58,11 @@ const actions = {
 
   changeSys({ commit }, data) {
     commit('CHANGESYS', data)
-  }
+  },
+
+  changeFun({ commit }, data) {
+    commit('CHANGEFUN', data)
+  },
 
 }