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/monitor/operlog/index.vue | 56 ++++++++++++++++++--------------------------------------
1 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index 7fb42de..9b8b785 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -6,8 +6,8 @@
v-model="queryParams.title"
placeholder="请输入系统模块"
clearable
- style="width: 240px;"
size="small"
+ style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -16,8 +16,8 @@
v-model="queryParams.operName"
placeholder="请输入操作人员"
clearable
- style="width: 240px;"
size="small"
+ style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -99,7 +99,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['monitor:operlog:export']"
>导出</el-button>
@@ -196,7 +195,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 +204,6 @@
return {
// 遮罩层
loading: true,
- // 导出遮罩层
- exportLoading: false,
// 选中数组
ids: [],
// 非多个禁用
@@ -285,44 +282,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