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/selectUser.vue | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 14ae0bb..a9e2ce0 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -34,7 +34,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">
@@ -61,10 +61,11 @@
<script>
import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
export default {
+ dicts: ['sys_normal_disable'],
props: {
// 瑙掕壊缂栧彿
roleId: {
- type: Number
+ type: [Number, String]
}
},
data() {
@@ -77,8 +78,6 @@
total: 0,
// 鏈巿鏉冪敤鎴锋暟鎹�
userList: [],
- // 鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -88,11 +87,6 @@
phonenumber: undefined
}
};
- },
- created() {
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
// 鏄剧ず寮规
@@ -130,7 +124,7 @@
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
- this.msgSuccess(res.msg);
+ this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.visible = false;
this.$emit("ok");
--
Gitblit v1.9.3