From 4e56f30381f2775aa62f3cfbe16e5064ab0c0726 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 09 十二月 2020 16:49:24 +0800
Subject: [PATCH] 修改 生成器controller模板缺导包 与 index页面兼容性 Merge pull request !2 from dragonwzj/master
---
ruoyi-ui/src/views/monitor/job/log.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 7346801..4be2398 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>
@@ -87,9 +87,10 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['monitor:jobLog:export']"
+ 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">
@@ -127,7 +128,7 @@
/>
<!-- 璋冨害鏃ュ織璇︾粏 -->
- <el-dialog title="璋冨害鏃ュ織璇︾粏" :visible.sync="open" width="700px">
+ <el-dialog title="璋冨害鏃ュ織璇︾粏" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
@@ -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() {
@@ -288,7 +289,7 @@
return exportJobLog(queryParams);
}).then(response => {
this.download(response.msg);
- }).catch(function() {});
+ })
}
}
};
--
Gitblit v1.9.3