From 61034d4ddecd0b3056a7fb38a737b0e0cfc33b9c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 27 三月 2022 14:36:31 +0800
Subject: [PATCH] 优化导出excel单元格验证,包含变更为开头.防止正常内容被替换
---
ruoyi-ui/src/views/monitor/job/index.vue | 85 +++++++++++++++---------------------------
1 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index a8928b6..a927756 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -1,17 +1,16 @@
<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="jobName">
<el-input
v-model="queryParams.jobName"
placeholder="请输入任务名称"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务组名" prop="jobGroup">
- <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable size="small">
+ <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
@@ -21,7 +20,7 @@
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status">
- <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
+ <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
@@ -75,7 +74,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>导出</el-button>
@@ -166,7 +164,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="任务分组" prop="jobGroup">
- <el-select v-model="form.jobGroup" placeholder="请选择">
+ <el-select v-model="form.jobGroup" placeholder="请选择任务分组">
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
@@ -205,7 +203,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="错误策略" prop="misfirePolicy">
+ <el-form-item label="执行策略" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small">
<el-radio-button label="1">立即执行</el-radio-button>
<el-radio-button label="2">执行一次</el-radio-button>
@@ -240,7 +238,7 @@
</div>
</el-dialog>
- <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar">
+ <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
<crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog>
@@ -295,7 +293,7 @@
</template>
<script>
-import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
+import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
import Crontab from '@/components/Crontab'
export default {
@@ -306,8 +304,6 @@
return {
// 遮罩层
loading: true,
- // 导出遮罩层
- exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -425,29 +421,21 @@
// 任务状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
- this.$confirm('确认要"' + text + '""' + row.jobName + '"任务吗?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return changeJobStatus(row.jobId, row.status);
- }).then(() => {
- this.msgSuccess(text + "成功");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
+ this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
+ return changeJobStatus(row.jobId, row.status);
+ }).then(() => {
+ this.$modal.msgSuccess(text + "成功");
+ }).catch(function() {
+ row.status = row.status === "0" ? "1" : "0";
+ });
},
/* 立即执行一次 */
handleRun(row) {
- this.$confirm('确认要立即执行一次"' + row.jobName + '"任务吗?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return runJob(row.jobId, row.jobGroup);
- }).then(() => {
- this.msgSuccess("执行成功");
- }).catch(() => {});
+ this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
+ return runJob(row.jobId, row.jobGroup);
+ }).then(() => {
+ this.$modal.msgSuccess("执行成功");
+ }).catch(() => {});
},
/** 任务详细信息 */
handleView(row) {
@@ -492,13 +480,13 @@
if (valid) {
if (this.form.jobId != undefined) {
updateJob(this.form).then(response => {
- this.msgSuccess("修改成功");
+ this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addJob(this.form).then(response => {
- this.msgSuccess("新增成功");
+ this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -509,31 +497,18 @@
/** 删除按钮操作 */
handleDelete(row) {
const jobIds = row.jobId || this.ids;
- this.$confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delJob(jobIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(() => {});
+ this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
+ return delJob(jobIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
- const queryParams = this.queryParams;
- this.$confirm("是否确认导出所有定时任务数据项?", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- this.exportLoading = true;
- return exportJob(queryParams);
- }).then(response => {
- this.download(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('monitor/job/export', {
+ ...this.queryParams
+ }, `job_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.2