Commit 6f8fda1f authored by 张俊's avatar 张俊

[feat]修改菜单分组

parent 865102e6
<template> <template>
<div class="bg-pagination"> <div class="bg-pagination">
<el-pagination <el-pagination
v-model:currentPage="page" :small="small"
v-model:page-size="size" :currentPage="page"
:page-size="size"
:page-sizes="pageSizes" :page-sizes="pageSizes"
:layout="layout" :layout="layout"
:total="total" :total="total"
...@@ -18,6 +19,10 @@ ...@@ -18,6 +19,10 @@
export default { export default {
name: "pagination", name: "pagination",
props: { props: {
small: {
type: Boolean,
default: () => false
},
page: { page: {
type: Number, type: Number,
default: 1 default: 1
...@@ -60,4 +65,4 @@ export default { ...@@ -60,4 +65,4 @@ export default {
} }
}, },
} }
</script> </script>
\ No newline at end of file
This diff is collapsed.
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
return this.$axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`); return this.$axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`);
}, },
getUser() { getUser() {
Promise.all([this.getUserInfo(), this.getMenu('6cf51374-f85d-4b6b-b3ed-6c0849135972')]).then((res) => { Promise.all([this.getUserInfo(), this.getMenu('dadb2d3f-e263-48d1-9389-42acb9ea49f8')]).then((res) => {
if (res[0].data.code == 200 && res[1].data.code == 200) { if (res[0].data.code == 200 && res[1].data.code == 200) {
let data = res[1].data.data&&res[1].data.data[0].children || []; let data = res[1].data.data&&res[1].data.data[0].children || [];
this.$store.commit("setUserInfo", res[0].data.data); this.$store.commit("setUserInfo", res[0].data.data);
......
...@@ -78,7 +78,7 @@ function getMenuObj(menu,parentRowPath,menuObj){ ...@@ -78,7 +78,7 @@ function getMenuObj(menu,parentRowPath,menuObj){
} }
Promise.all([getUser(),getMenu('6cf51374-f85d-4b6b-b3ed-6c0849135972')]).then(res => { Promise.all([getUser(),getMenu('dadb2d3f-e263-48d1-9389-42acb9ea49f8')]).then(res => {
console.log(res); console.log(res);
if (res[0].data.code == 200&&res[1].data.code == 200) { if (res[0].data.code == 200&&res[1].data.code == 200) {
//已登录则记录菜单和用户信息 //已登录则记录菜单和用户信息
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment