diff --git a/src/api/initHome.ts b/src/api/initHome.ts index 3b339a74..92d304c9 100644 --- a/src/api/initHome.ts +++ b/src/api/initHome.ts @@ -4,7 +4,8 @@ import server from '@/utils/request'; export const updateMenus = (data: any) => server.patch(`/menu/iot/_all`, data) // 添加角色 export const addRole = (data: any) => server.post(`/role`, data) - +//添加角色分组 +export const addRoleGroup = (data:any) => server.post('/role/group',data) //更新权限菜单 export const getRoleMenu = (id: string) => server.get(`/menu/role/${id}/_grant/tree`) diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue index e3ef312b..a1701027 100644 --- a/src/views/init-home/Role/index.vue +++ b/src/views/init-home/Role/index.vue @@ -3,28 +3,29 @@
平台角色内置分组
-
-
- {{ item.name }} +
+
+ {{ item.name }} + +
- {{ item.selected ? '取消选中' : '选中' }} - 编辑 + {{ item.selected ? '取消选中' : '选中' }} + 编辑
- + 自定义分组 + + 自定义分组
-
+
设备接入岗
@@ -34,14 +35,10 @@ 该角色负责设备接入模块的维护管理
-
+
运维管理岗
@@ -51,14 +48,10 @@ 该角色负责系统运维模块的维护管理
-
+
综合管理岗
@@ -73,19 +66,16 @@
- + @@ -94,7 +84,8 @@ \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/init-home/data/RoleData.ts b/src/views/init-home/data/RoleData.ts index 098e5a41..ae6f81f8 100644 --- a/src/views/init-home/data/RoleData.ts +++ b/src/views/init-home/data/RoleData.ts @@ -13,15 +13,18 @@ export const RoleData = { [ROLEKEYS.device]: { name: '设备接入岗', description: '该角色负责设备接入模块的维护管理', + groupId:'default_group', state: { text: '正常', value: 'enabled' }, }, [ROLEKEYS.link]: { name: '运维管理岗', + groupId:'default_group', description: '该角色负责系统运维模块的维护管理', state: { text: '正常', value: 'enabled' }, }, [ROLEKEYS.complex]: { name: '综合管理岗', + groupId:'default_group', description: '该角色负责系统运维和设备接入模块的维护管理', state: { text: '正常', value: 'enabled' }, }, diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue index f8becc64..282dde71 100644 --- a/src/views/init-home/index.vue +++ b/src/views/init-home/index.vue @@ -112,6 +112,11 @@ const submitData = async () => { loading.value = false; return; } + const roleGroupRes = await roleRef.value.submitRole(); + if (!roleGroupRes) { + loading.value = false; + return; + } const initDataRes = await initDataRef.value.save(); if (!initDataRes) { loading.value = false; @@ -119,7 +124,7 @@ const submitData = async () => { } loading.value = false; // 当前数据是否成功提交 - if (basicRes && menuRes && roleRes && initDataRes) { + if (basicRes && menuRes && roleRes && roleGroupRes && initDataRes) { onlyMessage('保存成功'); // // 记录初始化数据,跳转首页 const res = await saveInit();