diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..c14d206 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog/list',
     },
     children: [
       {
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序