Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-admin

src/router/index.js

@@ -22,7 +22,9 @@ export const constantRoutes = [
     },
     {
         path: '/',
-        redirect: '/privilegeManagement1'
+        redirect: '/welcome/index'
+        // component: () => import('@/views/welcome/index'),
+        // hidden: true
     },
     require("./modules/privilegeManagement.js").default,
     require("./menus/index.js").default,
@@ -35,6 +37,7 @@ export const constantRoutes = [
     require("./menus/approval.js").default,
     require("./menus/system.js").default,
     require("./menus/department.js").default,
+    require("./menus/welcome.js").default,
     require("./menus/others.js").default,
     { path: '*', redirect: '/404', hidden: true },
     // {

src/router/menus/welcome.js

@@ -0,0 +1,19 @@
+import Layout from '@/views/layout/Layout'
+
+const welcome = {
+    path: '/welcome',
+    component: Layout,
+    code: 'XXXX',
+    meta: {title: '欢迎', icon: '', noCache: true, affix: false},
+    children: [
+        {
+            path: '/welcome/index',
+            component: () => import('@/views/welcome/index'),
+            name: '欢迎',
+            code: '0000',
+            meta: {title: '欢迎', noCache: false, affix: false}
+        },
+    ]
+};
+
+export default welcome

src/views/layout/Layout.vue

@@ -27,7 +27,7 @@ export default {
   watch: {
     '$route.path'() {
       setTimeout(() => {
-        this.showBtn()
+        this.getPerList()
       },500)
     }
   },
@@ -78,13 +78,12 @@ export default {
         relation: false,
         reset: false,
       }
+      console.log('list: ', list);
       for(var i = 0; i < perList.length; i++) {
         if(perList[i][1] === code) {
+          console.log('perList[i]: ', perList[i]);
           list[perList[i][2]] = true;
         }
-        // if(perList[i][2] === 'reset') {
-        //   console.log('perList[i]: ', perList[i]);
-        // }
       }
       this.setShowBtnList(list)
     },

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -13,7 +13,8 @@
 
     <el-submenu v-else-if="getShow(item.code)" ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <div  @click="storageCode(item.code ? item.code : '')">
+        <div>
+        <!-- <div  @click="storageCode(item.code ? item.code : '')"> -->
           <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
         </div>
       </template>
@@ -102,6 +103,7 @@ export default {
       return path.resolve(this.basePath, routePath)
     },
     storageCode(code){
+      console.log('code: ', code);
       localStorage.setItem('code', code)
     },
     // 判断当前菜单是否显示

src/views/welcome/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <div style="text-align:center;">
+    <img class="welcome-img" src="./welcome.png" alt="">
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'welcome',
+  data() {
+    return {
+
+    }
+  },
+}
+</script>
+
+<style scoped>
+.welcome-img {
+  /* height: calc(100vh - 80px); */
+  width: calc(200vw - 210px);
+}
+</style>