diff --git a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html index 8b253e80..2f3b0f75 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html @@ -25,7 +25,7 @@ <div class="col-sm-8"> <select id="dataScope" name="dataScope" class="form-control m-b"> <option value="1" th:field="*{dataScope}">全部数据权限</option> - <option value="2" th:field="*{dataScope}">自定数据权限</option> + <option value="2" th:field="*{dataScope}">自定义数据权限</option> <option value="3" th:field="*{dataScope}">本部门数据权限</option> <option value="4" th:field="*{dataScope}">本部门及以下数据权限</option> <option value="5" th:field="*{dataScope}">仅本人数据权限</option> diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html index c16b7fd1..f464ea57 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/role.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html @@ -90,6 +90,27 @@ title: '权限字符', sortable: true }, + { + field: 'dataScope', + title: '数据权限', + formatter: function(value, item, index) { + if (item.dataScope == '1') { + return '<span class="badge badge-primary">全部数据权限</span>'; + } + else if (item.dataScope == '2') { + return '<span class="badge badge-success">自定义数据权限</span>'; + } + else if (item.dataScope == '3') { + return '<span class="badge badge-info">本部门数据权限</span>'; + } + else if (item.dataScope == '4') { + return '<span class="badge badge-warning">本部门及以下数据权限</span>'; + } + else if (item.dataScope == '5') { + return '<span class="badge badge-danger">仅本人数据权限</span>'; + } + } + }, { field: 'roleSort', title: '显示顺序',