From dddbaeb5c0d77de8fb9b24efc09c0ed7bdd12cc3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 11 Dec 2020 18:01:44 +0800
Subject: [PATCH] 代码生成预览支持高亮显示
---
ruoyi-ui/src/views/monitor/job/log.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index cefb1de..842db03 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务名称" prop="jobName">
<el-input
v-model="queryParams.jobName"
@@ -56,7 +56,7 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+ <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -90,6 +90,7 @@
v-hasPermi="['monitor:job:export']"
>导出</el-button>
</el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
@@ -175,6 +176,8 @@
ids: [],
// 非多个禁用
multiple: true,
+ // 显示搜索条件
+ showSearch: true,
// 总条数
total: 0,
// 调度日志表格数据
@@ -196,9 +199,7 @@
jobName: undefined,
jobGroup: undefined,
status: undefined
- },
- // 表单参数
- form: {}
+ }
};
},
created() {
@@ -262,7 +263,7 @@
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
- }).catch(function() {});
+ })
},
/** 清空按钮操作 */
handleClean() {
@@ -275,7 +276,7 @@
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
- }).catch(function() {});
+ })
},
/** 导出按钮操作 */
handleExport() {
--
Gitblit v1.9.3