From 74f991b8c5c0e51ceccf4a0efb8cac0925dd6168 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 18 一月 2022 11:20:23 +0800
Subject: [PATCH] !414 优化任务队列满时任务拒绝策略 Merge pull request !414 from root/master
---
ruoyi-ui/src/views/system/user/index.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2b7283f..4b00e03 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -206,7 +206,7 @@
</el-col>
</el-row>
- <!-- 添加或修改参数配置对话框 -->
+ <!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
@@ -495,7 +495,7 @@
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
- this.getList();
+ this.handleQuery();
},
// 用户状态修改
handleStatusChange(row) {
@@ -596,7 +596,7 @@
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+ inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
@@ -652,7 +652,6 @@
/** 下载模板操作 */
importTemplate() {
this.download('system/user/importTemplate', {
- ...this.queryParams
}, `user_template_${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
@@ -664,7 +663,7 @@
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
- this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
--
Gitblit v1.9.2