From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-ui/src/views/system/user/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 72bb942..5ed7427 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -20,6 +20,7 @@
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
+ node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
@@ -66,11 +67,12 @@
<el-date-picker
v-model="dateRange"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -179,9 +181,7 @@
v-hasPermi="['system:user:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
- <span class="el-dropdown-link">
- <i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
- </span>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
@@ -415,7 +415,7 @@
},
// 鍒椾俊鎭�
columns: [
- { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: true },
+ { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false },
{ key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
{ key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
{ key: 3, label: `閮ㄩ棬`, visible: true },
@@ -536,6 +536,8 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
+ this.queryParams.deptId = undefined;
+ this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -576,8 +578,8 @@
this.form = response.data.user;
this.postOptions = response.data.posts;
this.roleOptions = response.data.roles;
- this.form.postIds = response.data.postIds;
- this.form.roleIds = response.data.roleIds;
+ this.$set(this.form, "postIds", response.data.postIds);
+ this.$set(this.form, "roleIds", response.data.roleIds);
this.open = true;
this.title = "淇敼鐢ㄦ埛";
this.form.password = "";
--
Gitblit v1.9.3