diff --git a/src/api/modules.js b/src/api/modules.js index c8edab1..201094f 100644 --- a/src/api/modules.js +++ b/src/api/modules.js @@ -7,6 +7,13 @@ export function getModulesList() { }); } +export function getTenantList() { + return request({ + url: '/admin/modules/getTenantList', + method: 'get', + }); +} + export function getModuleDetail(id) { return request({ url: `/admin/modules/${id}`, diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue index 8fae0a3..32983af 100644 --- a/src/components/CommonHeader.vue +++ b/src/components/CommonHeader.vue @@ -224,7 +224,7 @@ const handleCommand = async (command) => { // 遍历 localStorage for (let i = 0; i < localStorage.length; i++) { const key = localStorage.key(i); - if (key && key.startsWith('menu_cache_')) { + if (key && key.startsWith('menu_')) { menuCacheKeys.push(key); } } @@ -237,7 +237,7 @@ const handleCommand = async (command) => { const sessionMenuCacheKeys: string[] = []; for (let i = 0; i < sessionStorage.length; i++) { const key = sessionStorage.key(i); - if (key && key.startsWith('menu_cache_')) { + if (key && key.startsWith('menu_')) { sessionMenuCacheKeys.push(key); } } diff --git a/src/stores/menu.js b/src/stores/menu.js index 2f2f32f..412d915 100644 --- a/src/stores/menu.js +++ b/src/stores/menu.js @@ -21,7 +21,7 @@ export const useMenuStore = defineStore('menu', () => { try { const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}'); const loginType = userInfo.type || 'user'; - const roleId = userInfo.role || 0; + const roleId = userInfo.group_id || 0; return `menu_cache_${loginType}_${roleId}`; } catch (e) { return 'menu_cache_default'; @@ -113,7 +113,7 @@ export const useMenuStore = defineStore('menu', () => { try { const userInfo = getUserInfo(); const loginType = userInfo.type || 'user'; - const roleId = userInfo.role || 0; + const roleId = userInfo.group_id || 0; let res; diff --git a/src/views/apps/cms/articles/category.vue b/src/views/apps/cms/articles/category.vue index 93f0777..0c94e82 100644 --- a/src/views/apps/cms/articles/category.vue +++ b/src/views/apps/cms/articles/category.vue @@ -1,7 +1,9 @@ + + \ No newline at end of file diff --git a/src/views/basicSettings/tenants/index.vue b/src/views/basicSettings/tenants/index.vue index fb98c53..451dd5f 100644 --- a/src/views/basicSettings/tenants/index.vue +++ b/src/views/basicSettings/tenants/index.vue @@ -62,9 +62,10 @@ @@ -72,6 +73,7 @@ +
@@ -88,6 +90,7 @@ import { useRouter } from 'vue-router'; import EditModal from './components/edit.vue'; import DetailDrawer from './components/detail.vue'; import Qualification from './components/qualification.vue'; +import AddUser from './components/adduser.vue'; const total = ref(0); const page = ref(1); @@ -98,6 +101,7 @@ const tenants = ref([]); const editRef = ref(); const detailRef = ref(); +const addUserRef = ref(); const qualificationRef = ref(); // 删除 @@ -119,6 +123,11 @@ const handlePreview = (row: any) => { detailRef.value.open(row.id); }; +//增加用户 +const handleAddUser = (row: any) => { + addUserRef.value.open(row.id); +}; + // 资质 const handleQualification = (row: any) => { qualificationRef.value.open(row.id); diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ebfd8f0..618f982 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -146,7 +146,7 @@ import { Moon, } from "@element-plus/icons-vue"; -import { getModulesList } from "@/api/modules"; +import { getTenantList } from "@/api/modules"; import { useAuthStore } from "@/stores/auth"; import { useMenuStore } from "@/stores/menu"; @@ -271,7 +271,7 @@ async function handleLogout() { // 加载模块列表 async function loadModules() { try { - const res = await getModulesList(); + const res = await getTenantList(); if (res.code === 200) { const list = res.data?.list || []; const filteredList = list diff --git a/src/views/system/menus/manager.vue b/src/views/system/menus/manager.vue index b56c36c..0d0c8b4 100644 --- a/src/views/system/menus/manager.vue +++ b/src/views/system/menus/manager.vue @@ -33,32 +33,48 @@ - + > + + - + - +