From 8558954da733b59e374ece8f451b3f5ba2f5ed46 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期一, 27 六月 2022 08:10:17 +0800 Subject: [PATCH] !516 修复缓存列表页面变量名错误导致错误 Merge pull request !516 from zbk/N/A --- ruoyi-ui/src/views/monitor/operlog/index.vue | 59 +++++++++++++++++------------------------------------------ 1 files changed, 17 insertions(+), 42 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 7fb42de..aa8c3b0 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/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="title"> <el-input v-model="queryParams.title" 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.businessType" placeholder="操作类型" clearable - size="small" style="width: 240px" > <el-option @@ -42,7 +39,6 @@ v-model="queryParams.status" placeholder="操作状态" clearable - size="small" style="width: 240px" > <el-option @@ -56,7 +52,6 @@ <el-form-item label="操作时间"> <el-date-picker v-model="dateRange" - size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" @@ -99,7 +94,6 @@ plain icon="el-icon-download" size="mini" - :loading="exportLoading" @click="handleExport" v-hasPermi="['monitor:operlog:export']" >导出</el-button> @@ -196,7 +190,7 @@ </template> <script> -import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/monitor/operlog"; +import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog"; export default { name: "Operlog", @@ -205,8 +199,6 @@ return { // 遮罩层 loading: true, - // 导出遮罩层 - exportLoading: false, // 选中数组 ids: [], // 非多个禁用 @@ -285,44 +277,27 @@ /** 删除按钮操作 */ handleDelete(row) { const operIds = row.operId || this.ids; - this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(function() { - return delOperlog(operIds); - }).then(() => { - this.getList(); - this.msgSuccess("删除成功"); - }).catch(() => {}); + this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function() { + return delOperlog(operIds); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); }, /** 清空按钮操作 */ handleClean() { - this.$confirm('是否确认清空所有操作日志数据项?', "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(function() { - return cleanOperlog(); - }).then(() => { - this.getList(); - this.msgSuccess("清空成功"); - }).catch(() => {}); + this.$modal.confirm('是否确认清空所有操作日志数据项?').then(function() { + return cleanOperlog(); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("清空成功"); + }).catch(() => {}); }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$confirm('是否确认导出所有操作日志数据项?', "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.exportLoading = true; - return exportOperlog(queryParams); - }).then(response => { - this.download(response.msg); - this.exportLoading = false; - }).catch(() => {}); + this.download('monitor/operlog/export', { + ...this.queryParams + }, `operlog_${new Date().getTime()}.xlsx`) } } }; -- Gitblit v1.9.2