|
@@ -53,19 +53,20 @@ const rolesList = reactive<any>({
|
|
|
// 角色列表
|
|
|
let pageSize = reactive({
|
|
|
pageNumber: 1,
|
|
|
- pageSize: 5
|
|
|
+ pageSize: 10
|
|
|
});
|
|
|
let pageSizeRoles = reactive({
|
|
|
pageNumber: 1,
|
|
|
- pageSize: 5
|
|
|
+ pageSize: 10
|
|
|
});
|
|
|
const load = () => {
|
|
|
+ console.log("load");
|
|
|
pageSizeRoles.pageSize += 5;
|
|
|
postPageRoleApi();
|
|
|
};
|
|
|
const loadSystem = async () => {
|
|
|
pageSize.pageSize += 5;
|
|
|
- postPageRoleApi();
|
|
|
+ await postPageRoleApi();
|
|
|
};
|
|
|
|
|
|
// 系统角色
|
|
@@ -114,8 +115,6 @@ onMounted(async () => {
|
|
|
if (rolesList.data.length > 0) {
|
|
|
const firstRole = rolesList.data[0];
|
|
|
formLink.targetCodes = [];
|
|
|
- console.log("123测试的撒大", firstRole);
|
|
|
-
|
|
|
formLink.targetCodes.push(firstRole.roleCode);
|
|
|
bgColor.value = firstRole.roleCode;
|
|
|
paramsPageUser.roleName = firstRole.roleName;
|
|
@@ -167,7 +166,6 @@ const editRoleName = item => {
|
|
|
};
|
|
|
// 删除角色
|
|
|
const postDelRoleApi = async item => {
|
|
|
- console.log("item", item);
|
|
|
const { code } = await postDelRole(item);
|
|
|
if (code === 200) {
|
|
|
ElMessage({
|
|
@@ -260,7 +258,6 @@ const paramsPageUser = reactive({
|
|
|
const total = ref(0);
|
|
|
const postPageUserByRoleApi = async () => {
|
|
|
const { code, data } = await postPageUserByRole(paramsPageUser);
|
|
|
- console.log(data);
|
|
|
if (code === 200) {
|
|
|
tableData.value = data.records;
|
|
|
total.value = data?.totalRow;
|
|
@@ -337,11 +334,8 @@ const getMenuListApi = async () => {
|
|
|
});
|
|
|
// 忘记干嘛的了,递归错数据了
|
|
|
function checkMenuCodes(menuItems) {
|
|
|
- console.log("menuListRole-1111", menuListRole);
|
|
|
menuListRole.value.forEach(item => {
|
|
|
- console.log("item", item);
|
|
|
const hasRole = menuListRole.value.includes(item.menuCode);
|
|
|
- console.log("hasRole", hasRole);
|
|
|
item.show = hasRole;
|
|
|
|
|
|
// Recursively check children
|
|
@@ -423,7 +417,6 @@ function collectMenuShow(data, allShow) {
|
|
|
roleParams.menuCodes.push(item.menuCode);
|
|
|
} else {
|
|
|
item.show = false;
|
|
|
- console.log("data", data);
|
|
|
data.map(itCode => {
|
|
|
data.map(itCode => {
|
|
|
// 使用 filter 来过滤掉与 itCode.menuCode 相同的元素
|
|
@@ -447,8 +440,6 @@ const roleShowClick = (item, type: any) => {
|
|
|
// 不是全选
|
|
|
if (item.show) {
|
|
|
item.show = false;
|
|
|
- console.log("menuListRoleList", menuListRoleList);
|
|
|
- console.log("menuListRoleList", item);
|
|
|
menuListRoleList.value.map = row => {
|
|
|
if (row.menuCode == it.parentCode) {
|
|
|
row.allShow = !row.allShow;
|
|
@@ -462,7 +453,6 @@ const roleShowClick = (item, type: any) => {
|
|
|
postUpdateRoleApi();
|
|
|
}
|
|
|
} else {
|
|
|
- console.log("allShow", item);
|
|
|
if (!item.allShow) {
|
|
|
collectMenuShow([item], item.allShow);
|
|
|
postUpdateRoleApi();
|
|
@@ -493,10 +483,9 @@ const roleShowClick = (item, type: any) => {
|
|
|
<div class="w-[100%]">
|
|
|
<div><el-text type="info">系统角色</el-text></div>
|
|
|
</div>
|
|
|
- <!-- v-infinite-scroll="loadSystem" -->
|
|
|
<div
|
|
|
v-infinite-scroll="loadSystem"
|
|
|
- infinite-scroll-immediate="false"
|
|
|
+ :infinite-scroll-immediate="false"
|
|
|
class="h-1/4 w-[100%] overflow-auto infinite-list"
|
|
|
>
|
|
|
<div
|
|
@@ -547,6 +536,7 @@ const roleShowClick = (item, type: any) => {
|
|
|
</div>
|
|
|
<div
|
|
|
v-infinite-scroll="load"
|
|
|
+ :infinite-scroll-immediate="false"
|
|
|
class="h-2/5 w-[100%] overflow-auto infinite-list"
|
|
|
>
|
|
|
<div
|