From 07bde5f88a037f49ee4cda16acf9ede9cffe9f12 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期日, 30 十月 2022 09:57:27 +0800 Subject: [PATCH] !610 pagehelper-boot更新1.4.5 Merge pull request !610 from abbfun/N/A --- ruoyi-ui/src/views/monitor/logininfor/index.vue | 50 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index b4a498e..8a9b17a 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -1,13 +1,12 @@ <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 style="width: 240px;" - size="small" @keyup.enter.native="handleQuery" /> </el-form-item> @@ -17,7 +16,6 @@ placeholder="请输入用户名称" clearable style="width: 240px;" - size="small" @keyup.enter.native="handleQuery" /> </el-form-item> @@ -26,7 +24,6 @@ v-model="queryParams.status" placeholder="登录状态" clearable - size="small" style="width: 240px" > <el-option @@ -40,7 +37,6 @@ <el-form-item label="登录时间"> <el-date-picker v-model="dateRange" - size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" @@ -79,11 +75,21 @@ </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 type="warning" plain icon="el-icon-download" size="mini" - :loading="exportLoading" @click="handleExport" v-hasPermi="['monitor:logininfor:export']" >导出</el-button> @@ -123,7 +129,7 @@ </template> <script> -import { list, delLogininfor, cleanLogininfor, exportLogininfor } from "@/api/monitor/logininfor"; +import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/monitor/logininfor"; export default { name: "Logininfor", @@ -132,12 +138,14 @@ return { // 遮罩层 loading: true, - // 导出遮罩层 - exportLoading: false, // 选中数组 ids: [], + // 非单个禁用 + single: true, // 非多个禁用 multiple: true, + // 选择用户名 + selectName: "", // 显示搜索条件 showSearch: true, // 总条数 @@ -181,13 +189,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) { @@ -214,16 +224,20 @@ 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() { - const queryParams = this.queryParams; - this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => { - this.exportLoading = true; - return exportLogininfor(queryParams); - }).then(response => { - this.download(response.msg); - this.exportLoading = false; - }).catch(() => {}); + this.download('monitor/logininfor/export', { + ...this.queryParams + }, `logininfor_${new Date().getTime()}.xlsx`) } } }; -- Gitblit v1.9.2