Ver código fonte

修改权限管理,导航栏bug

xsh 3 anos atrás
pai
commit
5611eacde5

+ 1 - 1
src/components/HeaderElement.vue

@@ -31,7 +31,7 @@
             </div>
           </div>
           <el-divider direction="vertical"></el-divider>
-          <div class="user" style="width: 150px;">
+          <div class="user">
             <div>
               <i class="el-icon-user-solid" style="font-size: 28px"></i>
             </div>

+ 12 - 9
src/components/SideMenu.vue

@@ -18,7 +18,7 @@
           </template>
         </el-menu-item>
       </el-menu>
-      <div v-show="isShow" class="subsidemenu">
+      <div v-show="isShow && activeName!== '首页'" class="subsidemenu">
         <div class="menu-header">{{selectItem.title}}</div>
         <ul class="menu-item-children">
           <li
@@ -39,7 +39,7 @@
           :default-active="routerName"
           :active-text-color="color">
           <template v-for="item in menuList">
-            <el-submenu :key="item.id" v-if="item.children.length > 0" :index="item.url">
+            <el-submenu :key="item.id" v-if="item.children.length > 0 && item.url !== 'dashboard'" :index="item.url">
               <span slot="title">{{item.title}}</span>
               <el-menu-item v-for="list in item.children" :key="list.id" :index="list.url">{{list.title}}</el-menu-item>
             </el-submenu>
@@ -99,20 +99,24 @@ export default {
       let parentName = this.$route.meta.parentName;
       if(newVal) {
         this.selectItem = this.getFilter(this.menuList, parentName)[0];
+        this.activeUrl = routerName;
+        this.activeName = parentName;
         if (this.selectItem.children.length > 0) {
           this.isShow = true;
         } else {
           this.isShow = false;
         }
-        this.activeUrl = routerName;
-        this.activeName = parentName;
       } else {
         this.routerName = routerName;
       }
     },
     isShow(newVal) {
       if(newVal) {
-        this.width = 100;
+        if(this.activeName === '首页') {
+          this.width = 249;
+        } else {
+          this.width = 100;
+        }
       } else {
         this.width = 249;
       }
@@ -137,13 +141,12 @@ export default {
       })
     },
     jump(item) {
+      console.log(item);
       this.activeName = item.title;
-      if(item.children.length > 0) {
-        // this.width = 100;
+      if(item.children.length > 0 && item.url !== "dashboard") {
         this.isShow = true;
         this.selectItem = item;
       } else {
-        // this.width = 249;
         this.isShow = false;
         this.$router.push({
           path: '/' + item.url
@@ -243,7 +246,7 @@ export default {
   width: 18px;
   height: 18px;
   top: 20px;
-  right: -10px;
+  left: 92px;
   transform: rotate(45deg);
   background-color: #EAEDF1;
 

+ 5 - 2
src/views/SystemAdmin/AuthAdmin.vue

@@ -166,7 +166,7 @@
 <script>
 import { Tree } from 'ant-design-vue';
 import TableFooter from "../../components/TableFooter";
-import { getMenu, getAuth, delAuth, addAuth, editAuth, getMenuByGroup, saveGroupMenu, getAcountByGroup, saveAccountGroup, getUserList } from '../../utils/api';
+import { getUserMenu, getAuth, delAuth, addAuth, editAuth, getMenuByGroup, saveGroupMenu, getAcountByGroup, saveAccountGroup, getUserList } from '../../utils/api';
 export default {
   name: "AuthAdmin",
   components: {
@@ -430,7 +430,10 @@ export default {
     },
     // 菜单列表
     authInit() {
-      getMenu().then(res => {
+      let params = {
+        userId: localStorage.getItem('UserId')
+      }
+      getUserMenu(params).then(res => {
             if(res.code === 10000) {
               this.menuTreeData = res.data;
               this.getLeastChilds(res.data)

+ 24 - 24
src/views/SystemAdmin/MenuAdmin.vue

@@ -90,7 +90,7 @@
 
 <script>
 import { TreeSelect } from 'ant-design-vue'
-import { getMenu, getMenuList , addMenu, editMenu, delMenu, getUserMenu } from '../../utils/api'
+import {  addMenu, editMenu, delMenu, getUserMenu } from '../../utils/api'
 export default {
   name: "MenuAdmin",
   components: {
@@ -225,13 +225,13 @@ export default {
       this.dialogFormVisible = false
     },
     init() {
-      getMenu()
-          .then(res => {
-            if(res.code === 10000) {
-              // this.tableData = res.data;
-              console.log(res.data)
-            }
-          })
+      // getMenu()
+      //     .then(res => {
+      //       if(res.code === 10000) {
+      //         // this.tableData = res.data;
+      //         // console.log(res.data)
+      //       }
+      //     })
       
       let params = {
         userId: localStorage.getItem('UserId')
@@ -252,22 +252,22 @@ export default {
           ]
         }
       })
-      getMenuList().then(res => {
-        if(res.code === 10000) {
-          // this.menuTreeData = [
-          //   {
-          //     id: -1,
-          //     parentId: 0,
-          //     title: '顶级',
-          //     value: 0,
-          //     pid: 0,
-          //     weight: 0,
-          //     children: res.data,
-          //   }
-          // ]
-          console.log(res)
-        }
-      })
+      // getMenuList().then(res => {
+      //   if(res.code === 10000) {
+      //     // this.menuTreeData = [
+      //     //   {
+      //     //     id: -1,
+      //     //     parentId: 0,
+      //     //     title: '顶级',
+      //     //     value: 0,
+      //     //     pid: 0,
+      //     //     weight: 0,
+      //     //     children: res.data,
+      //     //   }
+      //     // ]
+      //     // console.log(res)
+      //   }
+      // })
     }
   },
   mounted() {