From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-ui/src/views/system/role/authUser.vue | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue
index a65ccbf..e18ea8b 100644
--- a/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/ruoyi-ui/src/views/system/role/authUser.vue
@@ -69,7 +69,7 @@
<el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="鐘舵��" align="center" prop="status">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
@@ -107,6 +107,7 @@
export default {
name: "AuthUser",
+ dicts: ['sys_normal_disable'],
components: { selectUser },
data() {
return {
@@ -122,8 +123,6 @@
total: 0,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: [],
- // 鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -139,9 +138,6 @@
if (roleId) {
this.queryParams.roleId = roleId;
this.getList();
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
}
},
methods: {
@@ -182,30 +178,22 @@
/** 鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
cancelAuthUser(row) {
const roleId = this.queryParams.roleId;
- this.$confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
+ this.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵').then(function() {
return authUserCancel({ userId: row.userId, roleId: roleId });
}).then(() => {
this.getList();
- this.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
+ this.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
}).catch(() => {});
},
/** 鎵归噺鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
cancelAuthUserAll(row) {
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
- this.$confirm('鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- return authUserCancelAll({ roleId: roleId, userIds: userIds });
+ this.$modal.confirm('鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤癸紵').then(function() {
+ return authUserCancelAll({ roleId: roleId, userIds: userIds });
}).then(() => {
this.getList();
- this.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
+ this.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
}).catch(() => {});
}
}
--
Gitblit v1.9.3