Compare commits

..

No commits in common. "ca08b46f77be065561c6ba79d96ead0e2490a48a" and "7eb4fdb790cf18643a91f90af41fb1c9d1240596" have entirely different histories.

14 changed files with 969 additions and 1389 deletions

View File

@ -218,7 +218,7 @@ export default {
float: left; float: left;
height: 84px !important; height: 84px !important;
line-height: 84px !important; line-height: 84px !important;
color: transparent !important; color: #999093 !important;
padding: 0 5px !important; padding: 0 5px !important;
font-size: 18px; font-size: 18px;
} }

View File

@ -224,10 +224,6 @@ input, textarea{
left:20px; left:20px;
font-size:21px !important font-size:21px !important
} }
.el-message-box__input {
padding-left: 57px;
padding-right: 15px;
}
} }
.el-message-box__btns { .el-message-box__btns {
padding-right: 32px; padding-right: 32px;

View File

@ -1,38 +0,0 @@
<template>
<div>
<span class="dot" :class="injectData.status === 1 ? 'red' : 'green'"></span>
<span>{{ state }}</span>
</div>
</template>
<script>
export default {
name: "StatusBtn",
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
computed: {
state() {
return this.injectData.status === 1 ? "停用" : "启用";
},
},
};
</script>
<style scoped>
.dot {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 3px;
vertical-align: middle;
margin-right: 8px;
}
.green {
background: #10dc76;
}
.red {
background: #ff5656;
}
</style>

View File

@ -1,38 +0,0 @@
<template>
<div>
<span class="dot" :class="injectData.status === 1 ? 'red' : 'green'"></span>
<span>{{ state }}</span>
</div>
</template>
<script>
export default {
name: "StatusBtn2",
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
computed: {
state() {
return this.injectData.status === 1 ? "关闭" : "开启";
},
},
};
</script>
<style scoped>
.dot {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 3px;
vertical-align: middle;
margin-right: 8px;
}
.green {
background: #10dc76;
}
.red {
background: #ff5656;
}
</style>

View File

@ -1,41 +0,0 @@
<template>
<div>
<span
class="dot"
:class="injectData.resultCode === 0 ? 'green' : 'red'"
></span>
<span>{{ state }}</span>
</div>
</template>
<script>
export default {
name: "StatusBtn3",
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
computed: {
state() {
return this.injectData.resultCode === 0 ? "成功" : "失败";
},
},
};
</script>
<style scoped>
.dot {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 3px;
vertical-align: middle;
margin-right: 8px;
}
.green {
background: #10dc76;
}
.red {
background: #ff5656;
}
</style>

View File

@ -1,38 +0,0 @@
<template>
<div>
<span class="dot" :class="injectData.result === 0 ? 'green' : 'red'"></span>
<span>{{ state }}</span>
</div>
</template>
<script>
export default {
name: "StatusBtn3",
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
computed: {
state() {
return this.injectData.result === 0 ? "成功" : "失败";
},
},
};
</script>
<style scoped>
.dot {
display: inline-block;
width: 6px;
height: 6px;
border-radius: 3px;
vertical-align: middle;
margin-right: 8px;
}
.green {
background: #10dc76;
}
.red {
background: #ff5656;
}
</style>

View File

@ -1,39 +0,0 @@
<template>
<el-switch
v-model="status"
type="text"
size="small"
@change="changeHandler"
/>
</template>
<script>
export default {
props: {
injectData: {
type: Object,
default: () => ({}),
},
},
data() {
return {
status: false,
};
},
mounted() {
this.mapToState();
},
methods: {
mapToState() {
this.status = this.injectData.status === 0 ? true : false;
},
changeHandler() {
let params = {};
params.id = this.injectData.id;
params.status = this.status ? "0" : "1";
params.username = this.injectData.username;
this.$emit("emitData", params);
},
},
};
</script>

View File

@ -1,162 +0,0 @@
<template>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.name" :disabled="true" />
</el-form-item>
<el-form-item label="角色标识">
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope" style="width: 100%">
<el-option
v-for="item in dataScopeDictDatas"
:key="parseInt(item.value)"
:label="item.label"
:value="parseInt(item.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="数据权限"
v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM"
>
<el-checkbox
:checked="!form.deptCheckStrictly"
@change="handleCheckedTreeConnect($event, 'dept')"
>父子联动(选中父节点自动选择子节点)</el-checkbox
>
<el-checkbox
v-model="deptExpand"
@change="handleCheckedTreeExpand($event, 'dept')"
>展开/折叠</el-checkbox
>
<el-checkbox
v-model="deptNodeAll"
@change="handleCheckedTreeNodeAll($event, 'dept')"
>全选/全不选</el-checkbox
>
<el-tree
class="tree-border"
:data="deptOptions"
show-checkbox
default-expand-all
ref="dept"
node-key="id"
:check-strictly="form.deptCheckStrictly"
empty-text="加载中,请稍后"
:props="defaultProps"
></el-tree>
</el-form-item>
</el-form>
</template>
<script>
import { SystemDataScopeEnum } from "@/utils/constants";
import { getRole } from "@/api/system/role";
import { listSimpleDepts } from "@/api/system/dept";
import { DICT_TYPE, getDictDatas } from "@/utils/dict";
import { assignRoleDataScope } from "@/api/system/permission";
export default {
name: "DataAuth",
data() {
return {
form: {
id: undefined,
name: undefined,
code: undefined,
deptIds: [],
dataScope: undefined,
deptCheckStrictly: false,
},
deptExpand: true,
deptNodeAll: false,
//
deptOptions: [], //
depts: [], //
defaultProps: {
label: "name",
children: "children",
},
//
SysDataScopeEnum: SystemDataScopeEnum,
//
dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
};
},
methods: {
init(id) {
this.form.id = id;
getRole(id).then((res) => {
this.form.name = res.data.name;
this.form.code = res.data.code;
this.form.dataScope = res.data.dataScope;
//
listSimpleDepts().then((response) => {
// deptOptions
this.deptOptions = [];
this.deptOptions.push(...this.handleTree(response.data, "id"));
this.depts = response.data;
this.$refs.dept.setCheckedKeys(res.data.dataScopeDeptIds, false);
});
});
},
submitForm() {
if (this.form.id !== undefined) {
assignRoleDataScope({
roleId: this.form.id,
dataScope: this.form.dataScope,
dataScopeDeptIds:
this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM
? []
: this.$refs.dept.getCheckedKeys(),
}).then((response) => {
this.$modal.msgSuccess("修改成功");
this.$emit("successSubmitd");
});
}
},
formClear() {
this.deptExpand = true;
this.deptNodeAll = false;
this.form = {
id: undefined,
name: undefined,
code: undefined,
deptIds: [],
dataScope: undefined,
deptCheckStrictly: false,
};
},
//
handleCheckedTreeConnect(value, type) {
if (type === "menu") {
this.form.menuCheckStrictly = value;
} else if (type === "dept") {
this.form.deptCheckStrictly = !value;
}
},
// /
handleCheckedTreeExpand(value, type) {
if (type === "menu") {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
} else if (type === "dept") {
let treeList = this.deptOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
}
}
},
// /
handleCheckedTreeNodeAll(value, type) {
if (type === "menu") {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
} else if (type === "dept") {
// this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
this.$refs.dept.setCheckedNodes(value ? this.depts : []);
}
},
},
};
</script>

View File

@ -1,146 +0,0 @@
<template>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.name" :disabled="true" />
</el-form-item>
<el-form-item label="角色标识">
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="菜单权限">
<el-checkbox
v-model="menuExpand"
@change="handleCheckedTreeExpand($event, 'menu')"
>展开/折叠</el-checkbox
>
<el-checkbox
v-model="menuNodeAll"
@change="handleCheckedTreeNodeAll($event, 'menu')"
>全选/全不选</el-checkbox
>
<el-tree
class="tree-border"
:data="menuOptions"
show-checkbox
ref="menu"
node-key="id"
:check-strictly="form.menuCheckStrictly"
empty-text="加载中,请稍后"
:props="defaultProps"
></el-tree>
</el-form-item>
</el-form>
</template>
<script>
import { getRole } from "@/api/system/role";
import { SystemDataScopeEnum } from "@/utils/constants";
import { assignRoleMenu, listRoleMenus } from "@/api/system/permission";
import { DICT_TYPE, getDictDatas } from "@/utils/dict";
import { listSimpleMenus } from "@/api/system/menu";
export default {
name: "MenuAuth",
data() {
return {
form: {
id: undefined,
name: undefined,
code: undefined,
menuIds: [],
menuCheckStrictly: true,
},
//
menuOptions: [],
menuExpand: false,
menuNodeAll: false,
SysDataScopeEnum: SystemDataScopeEnum,
//
dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
defaultProps: {
label: "name",
children: "children",
},
};
},
methods: {
init(id) {
this.form.id = id;
getRole(id).then((res) => {
this.form.name = res.data.name;
this.form.code = res.data.code;
listSimpleMenus().then((response) => {
// menuOptions
this.menuOptions = [];
this.menuOptions.push(...this.handleTree(response.data, "id"));
//
listRoleMenus(id).then((response) => {
//
this.form.menuCheckStrictly = true;
//
this.$refs.menu.setCheckedKeys(response.data);
// 使
this.form.menuCheckStrictly = false;
});
});
});
},
submitForm() {
if (this.form.id !== undefined) {
assignRoleMenu({
roleId: this.form.id,
menuIds: [
...this.$refs.menu.getCheckedKeys(),
...this.$refs.menu.getHalfCheckedKeys(),
],
}).then((response) => {
this.$modal.msgSuccess("修改成功");
this.$emit("successSubmitm");
});
}
},
formClear() {
if (this.$refs.menu !== undefined) {
this.$refs.menu.setCheckedKeys([]);
}
this.menuExpand = false;
this.menuNodeAll = false;
this.form = {
id: undefined,
name: undefined,
code: undefined,
menuIds: [],
menuCheckStrictly: true,
};
},
//
handleCheckedTreeConnect(value, type) {
if (type === "menu") {
this.form.menuCheckStrictly = value;
} else if (type === "dept") {
this.form.deptCheckStrictly = !value;
}
},
// /
handleCheckedTreeExpand(value, type) {
if (type === "menu") {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
} else if (type === "dept") {
let treeList = this.deptOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
}
}
},
// /
handleCheckedTreeNodeAll(value, type) {
if (type === "menu") {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
} else if (type === "dept") {
// this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
this.$refs.dept.setCheckedNodes(value ? this.depts : []);
}
},
},
};
</script>

View File

@ -1,129 +0,0 @@
<template>
<el-form ref="form" :rules="rules" label-width="100px" :model="form">
<el-row>
<el-col :span="24">
<el-form-item label="角色编码" prop="code">
<el-input v-model="form.code"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="角色名称" prop="name">
<el-input v-model="form.name"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="角色顺序" prop="sort">
<el-input-number
v-model="form.sort"
controls-position="right"
:min="1"
:max="999999999"
style="width: 100%"
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status" v-if="isEdit">
<el-switch v-model="form.status"> </el-switch>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
import { addRole, getRole, updateRole } from "@/api/system/role";
export default {
name: "RoleAdd",
data() {
return {
form: {
id: "",
code: "",
name: "",
sort: 1,
status: 0,
remark: "",
},
isEdit: false, //
rules: {
code: [
{ required: true, message: "角色编码不能为空", trigger: "blur" },
],
name: [
{ required: true, message: "角色名称不能为空", trigger: "blur" },
],
sort: [{ required: true }],
},
};
},
methods: {
init(id) {
if (id) {
this.isEdit = true;
this.form.id = id;
getRole(id).then((res) => {
if (res.code === 0) {
this.form.id = res.data.id;
this.form.code = res.data.code;
this.form.name = res.data.name;
this.form.sort = res.data.sort;
this.form.remark = res.data.remark;
this.form.status = res.data.status ? false : true;
}
});
} else {
this.isEdit = false;
this.form.id = "";
}
},
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.isEdit) {
//
updateRole({
id: this.form.id,
code: this.form.code,
name: this.form.name,
sort: this.form.sort,
remark: this.form.remark,
status: this.form.status ? 0 : 1,
}).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess("操作成功");
this.$emit("successSubmit");
}
});
} else {
addRole({
code: this.form.code,
name: this.form.name,
sort: this.form.sort,
remark: this.form.remark,
status: 0,
}).then((res) => {
if (res.code === 0) {
this.$modal.msgSuccess("操作成功");
this.$emit("successSubmit");
}
});
}
} else {
return false;
}
});
},
formClear() {
this.$refs.form.resetFields();
this.isEdit = false;
},
},
};
</script>

View File

@ -1,292 +1,495 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <doc-alert <!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
title="功能权限"
url="https://doc.iocoder.cn/resource-permission"
/>
<doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" /> --> <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" /> -->
<!-- 搜索工作栏 --> <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
<search-bar <el-form-item label="角色名称" prop="name">
:formConfigs="formConfig" <el-input v-model="queryParams.name" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
ref="searchBarForm" @keyup.enter.native="handleQuery"/>
@headBtnClick="buttonClick" /> </el-form-item>
<!-- 列表 --> <el-form-item label="角色标识" prop="code">
<base-table <el-input v-model="queryParams.code" placeholder="请输入角色标识" clearable size="small" style="width: 240px"
:page="queryParams.pageNo" @keyup.enter.native="handleQuery"/>
:limit="queryParams.pageSize" </el-form-item>
:table-props="tableProps" <el-form-item label="状态" prop="status">
:table-data="list" <el-select v-model="queryParams.status" placeholder="角色状态" clearable size="small" style="width: 240px">
:max-height="tableH"> <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
<method-btn </el-select>
v-if="tableBtn.length" </el-form-item>
slot="handleBtn" <el-form-item label="创建时间" prop="createTime">
:width="230" <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
label="操作" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
:method-list="tableBtn" </el-form-item>
@clickBtn="handleClick" /> <el-form-item>
</base-table> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<pagination <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
:page.sync="queryParams.pageNo" </el-form-item>
:limit.sync="queryParams.pageSize" </el-form>
:total="total"
@pagination="getList" />
<!-- 新增&编辑 --> <el-row :gutter="10" class="mb8">
<base-dialog <el-col :span="1.5">
:dialogTitle="addOrEditTitle" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
:dialogVisible="centervisible" v-hasPermi="['system:role:create']">新增</el-button>
@cancel="handleCancel" </el-col>
@confirm="handleConfirm" <el-col :span="1.5">
:before-close="handleCancel" <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
width="50%"> v-hasPermi="['system:role:export']">导出</el-button>
<role-add ref="roleAdd" @successSubmit="successSubmit" /> </el-col>
</base-dialog> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<!-- 菜单权限 --> </el-row>
<base-dialog
dialogTitle="分配菜单权限" <el-table v-loading="loading" :data="roleList">
:dialogVisible="menuVisible" <el-table-column label="角色编号" prop="id" width="120" />
@cancel="handleCancelm" <el-table-column label="角色名称" prop="name" :show-overflow-tooltip="true" width="150" />
@confirm="handleConfirmm" <el-table-column label="角色标识" prop="code" :show-overflow-tooltip="true" width="150" />
:before-close="handleCancelm" <el-table-column label="角色类型" prop="type" width="80">
width="50%"> <template v-slot="scope">
<menu-auth ref="menuAuth" @successSubmitm="successSubmitm" /> <dict-tag :type="DICT_TYPE.SYSTEM_ROLE_TYPE" :value="scope.row.type"/>
</base-dialog> </template>
<!-- 数据权限 --> </el-table-column>
<base-dialog <el-table-column label="显示顺序" prop="sort" width="100" />
dialogTitle="分配数据权限" <el-table-column label="状态" align="center" width="100">
:dialogVisible="dataVisible" <template v-slot="scope">
@cancel="handleCanceld" <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"/>
@confirm="handleConfirmd" </template>
:before-close="handleCanceld" </el-table-column>
width="50%"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<data-auth ref="dataAuth" @successSubmitd="successSubmitd" /> <template v-slot="scope">
</base-dialog> <span>{{ parseTime(scope.row.createTime) }}</span>
</div> </template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:role:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleMenu(scope.row)"
v-hasPermi="['system:permission:assign-role-menu']">菜单权限</el-button>
<el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleDataScope(scope.row)"
v-hasPermi="['system:permission:assign-role-data-scope']">数据权限</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:role:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="角色名称" prop="name">
<el-input v-model="form.name" placeholder="请输入角色名称" />
</el-form-item>
<el-form-item label="角色标识" prop="code">
<el-input v-model="form.code" placeholder="请输入角色标识" />
</el-form-item>
<el-form-item label="角色顺序" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 分配角色的数据权限对话框 -->
<el-dialog title="分配数据权限" :visible.sync="openDataScope" width="500px" append-to-body>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.name" :disabled="true" />
</el-form-item>
<el-form-item label="角色标识">
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope">
<el-option
v-for="item in dataScopeDictDatas"
:key="parseInt(item.value)"
:label="item.label"
:value="parseInt(item.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数据权限" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM">
<el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点自动选择子节点)</el-checkbox>
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-tree
class="tree-border"
:data="deptOptions"
show-checkbox
default-expand-all
ref="dept"
node-key="id"
:check-strictly="form.deptCheckStrictly"
empty-text="加载中,请稍后"
:props="defaultProps"
></el-tree>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope"> </el-button>
<el-button @click="cancelDataScope"> </el-button>
</div>
</el-dialog>
<!-- 分配角色的菜单权限对话框 -->
<el-dialog :title="title" :visible.sync="openMenu" width="500px" append-to-body>
<el-form :model="form" label-width="80px">
<el-form-item label="角色名称">
<el-input v-model="form.name" :disabled="true" />
</el-form-item>
<el-form-item label="角色标识">
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id"
:check-strictly="form.menuCheckStrictly" empty-text="加载中,请稍后" :props="defaultProps"></el-tree>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMenu"> </el-button>
<el-button @click="cancelMenu"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { delRole, listRole } from '@/api/system/role'; import {
import tableHeightMixin from '@/mixins/tableHeightMixin'; addRole,
import RoleAdd from './components/roleAdd'; changeRoleStatus,
import MenuAuth from './components/menuAuth'; delRole,
import DataAuth from './components/dataAuth'; exportRole,
import statusBtn from './../components/statusBtn.vue'; getRole,
const tableProps = [ listRole,
{ updateRole
prop: 'code', } from "@/api/system/role";
label: '角色编码', import {listSimpleMenus} from "@/api/system/menu";
minWidth: 140, import {assignRoleMenu, listRoleMenus, assignRoleDataScope} from "@/api/system/permission";
showOverflowtooltip: true, import {listSimpleDepts} from "@/api/system/dept";
}, import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
{ import {DICT_TYPE, getDictDatas} from "@/utils/dict";
prop: 'name',
label: '角色名称',
minWidth: 140,
showOverflowtooltip: true,
},
{
prop: 'sort',
label: '角色顺序',
minWidth: 90,
showOverflowtooltip: true,
},
{
prop: 'status',
label: '状态',
minWidth: 100,
subcomponent: statusBtn,
},
{
prop: 'remark',
label: '角色描述',
minWidth: 140,
showOverflowtooltip: true,
},
];
export default { export default {
name: 'SystemRole', name: "SystemRole",
mixins: [tableHeightMixin], data() {
components: { RoleAdd, MenuAuth, DataAuth }, return {
data() { //
return { loading: true,
formConfig: [ //
{ exportLoading: false,
type: 'input', //
label: '角色名称', showSearch: true,
placeholder: '角色名称', //
param: 'name', total: 0,
}, //
{ roleList: [],
type: 'button', //
btnName: '查询', title: "",
name: 'search', //
color: 'primary', open: false,
}, //
{ openDataScope: false,
type: this.$auth.hasPermi('system:role:create') ? 'separate' : '', //
}, openMenu: false,
{ menuExpand: false,
type: this.$auth.hasPermi('system:role:create') ? 'button' : '', menuNodeAll: false,
btnName: '新增', deptExpand: true,
name: 'add', deptNodeAll: false,
color: 'success', //
plain: true, menuOptions: [],
}, //
], deptOptions: [], //
queryParams: { depts: [], //
pageNo: 1, //
pageSize: 20, queryParams: {
name: '', pageNo: 1,
}, pageSize: 10,
tableProps, name: undefined,
list: [], code: undefined,
tableBtn: [ status: undefined,
this.$auth.hasPermi('system:permission:assign-role-menu') createTime: []
? { },
type: 'menuAuth', //
btnName: '菜单权限', form: {},
} defaultProps: {
: undefined, label: "name",
this.$auth.hasPermi('system:permission:assign-role-data-scope') children: "children"
? { },
type: 'dataAuth', //
btnName: '数据权限', rules: {
// showTip: "", name: [
} { required: true, message: "角色名称不能为空", trigger: "blur" }
: undefined, ],
this.$auth.hasPermi('system:role:update') code: [
? { { required: true, message: "角色标识不能为空", trigger: "blur" }
type: 'edit', ],
btnName: '编辑', sort: [
} { required: true, message: "角色顺序不能为空", trigger: "blur" }
: undefined, ]
this.$auth.hasPermi('system:role:delete') },
? {
type: 'delete', //
btnName: '删除', SysCommonStatusEnum: CommonStatusEnum,
} SysDataScopeEnum: SystemDataScopeEnum,
: undefined, //
].filter((v) => v), roleTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_ROLE_TYPE),
addOrEditTitle: '', statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
centervisible: false, dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE)
// };
menuVisible: false, },
// created() {
dataVisible: false, this.getList();
// },
total: 0, methods: {
}; /** 查询角色列表 */
}, getList() {
created() { this.loading = true;
this.getList(); listRole(this.queryParams).then(
}, response => {
methods: { this.roleList = response.data.list;
/** 查询角色列表 */ this.total = response.data.total;
getList() { this.loading = false;
listRole(this.queryParams).then((response) => { }
this.list = response.data.list; );
this.total = response.data.total; },
}); //
}, handleStatusChange(row) {
buttonClick(val) { // row
console.log(val); let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
if (val.btnName === 'search') { this.$modal.confirm('确认要"' + text + '""' + row.name + '"角色吗?').then(function() {
this.queryParams.pageNo = 1; return changeRoleStatus(row.id, row.status);
this.queryParams.name = val.name; }).then(() => {
this.getList(); this.$modal.msgSuccess(text + "成功");
} else { }).catch(function() {
this.addOrEditTitle = '新增'; // row.status
this.centervisible = true; row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
this.$nextTick(() => { : CommonStatusEnum.ENABLE;
this.$refs.roleAdd.init(); });
}); },
} //
}, cancel() {
handleClick(val) { this.open = false;
switch (val.type) { this.reset();
case 'edit': },
this.addOrEditTitle = '编辑'; //
this.centervisible = true; cancelDataScope() {
this.$nextTick(() => { this.openDataScope = false;
this.$refs.roleAdd.init(val.data.id); this.reset();
}); },
break; //
case 'delete': cancelMenu() {
this.handleDelete(val.data); this.openMenu = false;
break; this.reset();
case 'menuAuth': },
this.menuVisible = true; //
this.$nextTick(() => { reset() {
this.$refs.menuAuth.init(val.data.id); if (this.$refs.menu !== undefined) {
}); this.$refs.menu.setCheckedKeys([]);
break; }
default: this.menuExpand = false;
this.dataVisible = true; this.menuNodeAll = false;
this.$nextTick(() => { this.deptExpand = true;
this.$refs.dataAuth.init(val.data.id); this.deptNodeAll = false;
}); this.form = {
} id: undefined,
}, name: undefined,
/** 删除按钮操作 */ code: undefined,
handleDelete(row) { sort: 0,
this.$modal deptIds: [],
.delConfirm(row.name) menuIds: [],
.then(function () { dataScope: undefined,
return delRole(row.id); deptCheckStrictly: false,
}) menuCheckStrictly: true,
.then(() => { remark: undefined
this.queryParams.pageNo = 1; };
this.getList(); this.resetForm("form");
this.$modal.msgSuccess('删除成功'); },
}) /** 搜索按钮操作 */
.catch(() => {}); handleQuery() {
}, this.queryParams.pageNo = 1;
// this.getList();
handleCancel() { },
this.$refs.roleAdd.formClear(); /** 重置按钮操作 */
this.centervisible = false; resetQuery() {
this.addOrEditTitle = ''; this.resetForm("queryForm");
}, this.handleQuery();
handleConfirm() { },
this.$refs.roleAdd.submitForm(); // /
}, handleCheckedTreeExpand(value, type) {
successSubmit() { if (type === 'menu') {
this.handleCancel(); let treeList = this.menuOptions;
this.getList(); for (let i = 0; i < treeList.length; i++) {
}, this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
// }
handleCancelm() { } else if (type === 'dept') {
this.$refs.menuAuth.formClear(); let treeList = this.deptOptions;
this.menuVisible = false; for (let i = 0; i < treeList.length; i++) {
}, this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
handleConfirmm() { }
this.$refs.menuAuth.submitForm(); }
}, },
successSubmitm() { // /
this.handleCancelm(); handleCheckedTreeNodeAll(value, type) {
this.getList(); if (type === 'menu') {
}, this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
// } else if (type === 'dept') {
handleCanceld() { // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
this.$refs.dataAuth.formClear(); this.$refs.dept.setCheckedNodes(value ? this.depts: []);
this.dataVisible = false; }
}, },
handleConfirmd() { //
this.$refs.dataAuth.submitForm(); handleCheckedTreeConnect(value, type) {
}, if (type === 'menu') {
successSubmitd() { this.form.menuCheckStrictly = value;
this.handleCanceld(); } else if (type === 'dept') {
this.getList(); this.form.deptCheckStrictly = !value;
}, }
}, },
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加角色";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id
getRole(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改角色";
});
},
/** 分配菜单权限操作 */
handleMenu(row) {
this.reset();
const id = row.id
// form name code
this.form.id = id;
this.form.name = row.name;
this.form.code = row.code;
//
this.openMenu = true;
//
listSimpleMenus().then(response => {
// menuOptions
this.menuOptions = [];
this.menuOptions.push(...this.handleTree(response.data, "id"));
//
listRoleMenus(id).then(response => {
//
this.form.menuCheckStrictly = true
//
this.$refs.menu.setCheckedKeys(response.data);
// 使
this.form.menuCheckStrictly = false
})
});
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
// form name code
this.form.id = row.id;
this.form.name = row.name;
this.form.code = row.code;
//
this.openDataScope = true;
//
listSimpleDepts().then(response => {
// deptOptions
this.deptOptions = [];
this.deptOptions.push(...this.handleTree(response.data, "id"));
this.depts = response.data;
// this.deptIds = response.data.map(x => x.id);
//
getRole(row.id).then(response => {
this.form.dataScope = response.data.dataScope;
this.$refs.dept.setCheckedKeys(response.data.dataScopeDeptIds, false);
});
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id !== undefined) {
updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRole(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 提交按钮(数据权限) */
submitDataScope: function() {
if (this.form.id !== undefined) {
assignRoleDataScope({
roleId: this.form.id,
dataScope: this.form.dataScope,
dataScopeDeptIds: this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM ? [] :
this.$refs.dept.getCheckedKeys()
}).then(response => {
this.$modal.msgSuccess("修改成功");
this.openDataScope = false;
this.getList();
});
}
},
/** 提交按钮(菜单权限) */
submitMenu: function() {
if (this.form.id !== undefined) {
assignRoleMenu({
roleId: this.form.id,
menuIds: [...this.$refs.menu.getCheckedKeys(), ...this.$refs.menu.getHalfCheckedKeys()]
}).then(response => {
this.$modal.msgSuccess("修改成功");
this.openMenu = false;
this.getList();
});
}
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除角色编号为"' + ids + '"的数据项?').then(function() {
return delRole(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
this.exportLoading = true;
return exportRole(queryParams);
}).then(response => {
this.$download.excel(response, '角色数据.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
}; };
</script> </script>
<style lang="scss" scoped>
.app-container {
width: 100%;
height: calc(100vh - 164px);
background-color: #fff;
border-radius: 8px;
padding: 8px;
}
</style>

File diff suppressed because it is too large Load Diff

View File

@ -7,9 +7,9 @@
<span>个人信息</span> <span>个人信息</span>
</div> </div>
<div> <div>
<div class="text-center"> <!-- <div class="text-center">
<userAvatar :user="user" /> <userAvatar :user="user" />
</div> </div> -->
<ul class="list-group list-group-striped"> <ul class="list-group list-group-striped">
<li class="list-group-item"> <li class="list-group-item">
<svg-icon icon-class="user" />用户名称 <svg-icon icon-class="user" />用户名称
@ -66,7 +66,7 @@
</template> </template>
<script> <script>
import userAvatar from "./userAvatar"; // import userAvatar from "./userAvatar";
import userInfo from "./userInfo"; import userInfo from "./userInfo";
import resetPwd from "./resetPwd"; import resetPwd from "./resetPwd";
import userSocial from "./userSocial"; import userSocial from "./userSocial";
@ -74,7 +74,7 @@ import { getUserProfile } from "@/api/system/user";
export default { export default {
name: "Profile", name: "Profile",
components: { userAvatar, userInfo, resetPwd, userSocial }, components: { /** userAvatar , **/ userInfo, resetPwd, userSocial },
data() { data() {
return { return {
user: {}, user: {},

View File

@ -189,7 +189,7 @@
resolved "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz" resolved "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"
integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
dependencies: dependencies:
"@babel/types" "^7.22.5" "@babel/types" "^7.22.15"
"@babel/helper-module-transforms@^7.24.7": "@babel/helper-module-transforms@^7.24.7":
version "7.24.7" version "7.24.7"
@ -1000,8 +1000,6 @@
integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA== integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
"@babel/plugin-transform-dotall-regex" "^7.4.4"
"@babel/types" "^7.4.4" "@babel/types" "^7.4.4"
esutils "^2.0.2" esutils "^2.0.2"
@ -1168,8 +1166,8 @@
resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz" resolved "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"
integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
dependencies: dependencies:
"@jridgewell/resolve-uri" "3.1.0" "@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14" "@jridgewell/sourcemap-codec" "^1.4.14"
"@mrmlnc/readdir-enhanced@^2.2.1": "@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1" version "2.2.1"