From 6666ce5526b1ed17f5c3906c94620cad586745a5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 六月 2024 17:01:39 +0800
Subject: [PATCH] 优化代码
---
src/views/system/role/index.vue | 98 ++++++++++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7bd432b..22a5fa4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
+ <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input
v-model="queryParams.roleName"
placeholder="璇疯緭鍏ヨ鑹插悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.roleKey"
placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="瑙掕壊鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -37,11 +34,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -50,8 +45,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -60,7 +55,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>鏂板</el-button>
@@ -70,7 +64,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
@@ -81,7 +74,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:role:remove']"
@@ -92,7 +84,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>瀵煎嚭</el-button>
@@ -117,42 +108,25 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- size="mini"
- v-if="scope.row.roleId !== 1"
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- v-if="scope.row.roleId !== 1"
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" v-if="scope.row.roleId !== 1" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['system:role:edit']">
- <el-icon><d-arrow-right /></el-icon>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleDataScope" icon="CircleCheck"
- v-hasPermi="['system:role:edit']">鏁版嵁鏉冮檺</el-dropdown-item>
- <el-dropdown-item command="handleAuthUser" icon="User"
- v-hasPermi="['system:role:edit']">鍒嗛厤鐢ㄦ埛</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ <el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鏁版嵁鏉冮檺" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒嗛厤鐢ㄦ埛" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -175,7 +149,7 @@
<template #label>
<span>
<el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
鏉冮檺瀛楃
</span>
@@ -268,9 +242,8 @@
</template>
<script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
const router = useRouter();
const { proxy } = getCurrentInstance();
@@ -332,17 +305,20 @@
loading.value = false;
});
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
dateRange.value = [];
proxy.resetForm("queryRef");
handleQuery();
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const roleIds = row.roleId || ids.value;
@@ -353,18 +329,21 @@
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
}
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
function handleExport() {
proxy.download("system/role/export", {
...queryParams.value,
}, `role_${new Date().getTime()}.xlsx`);
}
+
/** 澶氶�夋閫変腑鏁版嵁 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.roleId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
+
/** 瑙掕壊鐘舵�佷慨鏀� */
function handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
@@ -376,6 +355,7 @@
row.status = row.status === "0" ? "1" : "0";
});
}
+
/** 鏇村鎿嶄綔 */
function handleCommand(command, row) {
switch (command) {
@@ -389,16 +369,19 @@
break;
}
}
+
/** 鍒嗛厤鐢ㄦ埛 */
function handleAuthUser(row) {
router.push("/system/role-auth/user/" + row.roleId);
}
+
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
function getMenuTreeselect() {
menuTreeselect().then(response => {
menuOptions.value = response.data;
});
}
+
/** 鎵�鏈夐儴闂ㄨ妭鐐规暟鎹� */
function getDeptAllCheckedKeys() {
// 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
@@ -408,6 +391,7 @@
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
}
+
/** 閲嶇疆鏂板鐨勮〃鍗曚互鍙婂叾浠栨暟鎹� */
function reset() {
if (menuRef.value != undefined) {
@@ -431,6 +415,7 @@
};
proxy.resetForm("roleRef");
}
+
/** 娣诲姞瑙掕壊 */
function handleAdd() {
reset();
@@ -438,6 +423,7 @@
open.value = true;
title.value = "娣诲姞瑙掕壊";
}
+
/** 淇敼瑙掕壊 */
function handleUpdate(row) {
reset();
@@ -460,6 +446,7 @@
title.value = "淇敼瑙掕壊";
});
}
+
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
function getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
@@ -467,13 +454,15 @@
return response;
});
}
+
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
-function getRoleDeptTreeselect(roleId) {
- return roleDeptTreeselect(roleId).then(response => {
+function getDeptTree(roleId) {
+ return deptTreeSelect(roleId).then(response => {
deptOptions.value = response.depts;
return response;
});
}
+
/** 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�*/
function handleCheckedTreeExpand(value, type) {
if (type == "menu") {
@@ -488,6 +477,7 @@
}
}
}
+
/** 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級 */
function handleCheckedTreeNodeAll(value, type) {
if (type == "menu") {
@@ -496,6 +486,7 @@
deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
}
}
+
/** 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛� */
function handleCheckedTreeConnect(value, type) {
if (type == "menu") {
@@ -504,6 +495,7 @@
form.value.deptCheckStrictly = value ? true : false;
}
}
+
/** 鎵�鏈夎彍鍗曡妭鐐规暟鎹� */
function getMenuAllCheckedKeys() {
// 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
@@ -513,6 +505,7 @@
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
}
+
/** 鎻愪氦鎸夐挳 */
function submitForm() {
proxy.$refs["roleRef"].validate(valid => {
@@ -535,26 +528,29 @@
}
});
}
+
/** 鍙栨秷鎸夐挳 */
function cancel() {
open.value = false;
reset();
}
+
/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
function dataScopeSelectChange(value) {
if (value !== "2") {
deptRef.value.setCheckedKeys([]);
}
}
+
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
function handleDataScope(row) {
reset();
- const roleDeptTreeselect = getRoleDeptTreeselect(row.roleId);
+ const deptTreeSelect = getDeptTree(row.roleId);
getRole(row.roleId).then(response => {
form.value = response.data;
openDataScope.value = true;
nextTick(() => {
- roleDeptTreeselect.then(res => {
+ deptTreeSelect.then(res => {
nextTick(() => {
if (deptRef.value) {
deptRef.value.setCheckedKeys(res.checkedKeys);
@@ -565,6 +561,7 @@
title.value = "鍒嗛厤鏁版嵁鏉冮檺";
});
}
+
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
function submitDataScope() {
if (form.value.roleId != undefined) {
@@ -576,6 +573,7 @@
});
}
}
+
/** 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級*/
function cancelDataScope() {
openDataScope.value = false;
--
Gitblit v1.9.3