Merge branch 'dev-nav-20200319' into 'release'

Dev nav 20200319 导航权限设置代码合并

codereviewer:ping.zhang

See merge request !3

src/utils/env-config.js

@@ -6,11 +6,11 @@ export const envConfig = {
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // // baseUrl: 'http://10.177.15.180:10202/',
     // // baseUrl: 'http://192.168.140.14:10201/',
-    
-    // baseUrl: 'https://test1-sc.yunqueyi.com/', 
+
+    // baseUrl: 'https://test1-sc.yunqueyi.com/',
     //baseUrl: 'https://uat-sc.yunqueyi.com/',
-    baseUrl:   'https://dev-sc.yunqueyi.com',
-		
+    baseUrl:   'https://uat-sc.yunqueyi.com',
+
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
@@ -48,7 +48,7 @@ export const envConfig = {
     innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html'
   },
-  pro: {  
+  pro: {
     baseUrl: 'https://sc.yunqueyi.com',
     qiniuFileUrl: "https://sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://video.yunqueyi.com",

src/views/layout/header.vue

@@ -54,7 +54,7 @@ export default {
     },
     watch: {
         authList(newVal, oldVal){
-            
+
         }
     },
     created() {
@@ -67,6 +67,7 @@ export default {
                     token: localStorage.getItem('storageToken')
                 }
                 vm.POST('/contents/login/log_out',req).then((res) => {
+                    sessionStorage.removeItem('DISCUSS_CENTER_NAVS')
                     localStorage.removeItem('storageToken')
                     window.location.href = getInnerLoginUrl()
                    //logout()

src/views/layout/slidebar.vue

@@ -2,7 +2,7 @@
     <div id="slidebar-container" class="slidebar-container">
         <el-menu :default-active="onRoutes" class="el-menu-vertical-demo" theme="dark" unique-opened router>
             <template v-for="(item,_index) in items">
-                <template v-if="item.subs">
+                <template v-if="item.subs && item.subs.length">
                     <el-submenu :index=" 'index_' + _index" :key="item.index">
                         <template slot="title"><i :class="item.icon"></i>{{item.title}}</template>
                         <el-menu-item v-for="(subItem,i) in item.subs" :key="i" :index="subItem.index">
@@ -33,31 +33,8 @@ export default {
     },
     data() {
         return {
-            items: [
-                {
-                    title: '组件',
-                    icon: 'el-icon-menu',
-                    index: 'item',
-                    subs: [
-                        {
-                            title: '讨论组件',
-                            icon: 'el-icon-setting',
-                            index: 'discuss-list'
-                        },
-                        {
-                            title: '问卷管理',
-                            icon: 'el-icon-setting',
-                            index: 'question-naire'
-                        },
-						{
-						    title: '举报管理',
-						    icon: 'el-icon-setting',
-						    index: 'report-set'
-						}
-                    ]
-                },
-                
-            ]
+            items: [],
+            // items:[{title:'组件',icon:'el-icon-menu',index:'item',subs:[{title:'讨论组件',icon:'el-icon-setting',index:'discuss-list'},{title:"问卷管理",icon:"el-icon-setting",index:"question-naire"},{title:"举报管理",icon:"el-icon-setting",index:"report-set"}]},]
         }
     },
     computed: {
@@ -67,9 +44,45 @@ export default {
     },
     created() {
         vm = this
+        const navs = sessionStorage.getItem('DISCUSS_CENTER_NAVS')
+
+        vm.getNav()
     },
     methods: {
-    
+      getNav() {
+        this.POST('/basic-data/menu/list', { systemType: 26 }).then(res => {
+          if (res.code == '000000') {
+            const { vueMenuDtos } = res.data;
+
+            this.items = vueMenuDtos;
+            sessionStorage.setItem('DISCUSS_CENTER_NAVS', JSON.stringify(vueMenuDtos));
+            // 做当前路由无权限时处理
+            this.checkAuth(this.$route.path.split('/')[1], vueMenuDtos);
+          }
+        });
+      },
+      checkAuth(path, navs) {
+        let navList = getNavs(navs);
+
+        function getNavs(arr) {
+          let nvs = [];
+          for (let i = 0; i < arr.length; i++) {
+            const nav = arr[i];
+            const subs = nav.subs;
+
+            if (subs.length) {
+              nvs = nvs.concat(getNavs(subs));
+            } else {
+              nvs.push(nav.index);
+            }
+          }
+          return nvs;
+        }
+        debugger
+        if (navList.indexOf(path) == -1) {
+          this.$router.push(`/${navList[0]}`);
+        }
+      }
     }
 }
 </script>
@@ -95,15 +108,15 @@ export default {
             color: #fff;
             background: #509284 !important
         }
-        .el-menu-item:hover, 
-        .el-submenu__title:hover, 
-        .slidebar-container .el-menu .el-menu-item:hover, 
+        .el-menu-item:hover,
+        .el-submenu__title:hover,
+        .slidebar-container .el-menu .el-menu-item:hover,
         .slidebar-container .el-menu .el-submenu__title:hover {
             color: #fff;
             background: #06232C;
         }
         // .el-menu-item:focus, .el-menu-item:hover {
-        //     background: #06232C !important; 
+        //     background: #06232C !important;
         // }
     }
 }