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/monitor/logininfor/index.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue
index 98bd743..8fe2e8e 100644
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
<el-input
v-model="queryParams.ipaddr"
placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="鐧诲綍鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -40,13 +37,13 @@
<el-form-item label="鐧诲綍鏃堕棿">
<el-date-picker
v-model="dateRange"
- size="small"
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>
@@ -76,6 +73,17 @@
@click="handleClean"
v-hasPermi="['monitor:logininfor:remove']"
>娓呯┖</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-unlock"
+ size="mini"
+ :disabled="single"
+ @click="handleUnlock"
+ v-hasPermi="['monitor:logininfor:unlock']"
+ >瑙ｉ攣</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -122,7 +130,7 @@
</template>
<script>
-import { list, delLogininfor, cleanLogininfor } from "@/api/monitor/logininfor";
+import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/monitor/logininfor";
export default {
name: "Logininfor",
@@ -133,8 +141,12 @@
loading: true,
// 閫変腑鏁扮粍
ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
// 闈炲涓鐢�
multiple: true,
+ // 閫夋嫨鐢ㄦ埛鍚�
+ selectName: "",
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
// 鎬绘潯鏁�
@@ -178,13 +190,15 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
+ this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
- this.handleQuery();
},
/** 澶氶�夋閫変腑鏁版嵁 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.infoId)
+ this.single = selection.length!=1
this.multiple = !selection.length
+ this.selectName = selection.map(item => item.userName);
},
/** 鎺掑簭瑙﹀彂浜嬩欢 */
handleSortChange(column, prop, order) {
@@ -211,6 +225,15 @@
this.$modal.msgSuccess("娓呯┖鎴愬姛");
}).catch(() => {});
},
+ /** 瑙ｉ攣鎸夐挳鎿嶄綔 */
+ handleUnlock() {
+ const username = this.selectName;
+ this.$modal.confirm('鏄惁纭瑙ｉ攣鐢ㄦ埛"' + username + '"鏁版嵁椤�?').then(function() {
+ return unlockLogininfor(username);
+ }).then(() => {
+ this.$modal.msgSuccess("鐢ㄦ埛" + username + "瑙ｉ攣鎴愬姛");
+ }).catch(() => {});
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('monitor/logininfor/export', {
--
Gitblit v1.9.3