From 76710e453ed67f18e69e394e748ee4fac3fd956f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 13:46:11 +0800
Subject: [PATCH] update 分页合理化
---
ruoyi-ui/src/views/monitor/job/index.vue | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index dfd962c..f73cfc8 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -97,7 +97,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="浠诲姟缂栧彿" align="center" prop="jobId" />
<el-table-column label="浠诲姟鍚嶇О" align="center" prop="jobName" :show-overflow-tooltip="true" />
- <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup" :formatter="jobGroupFormat" />
+ <el-table-column label="浠诲姟缁勫悕" align="center" prop="jobGroup">
+ <template slot-scope="scope">
+ <dict-tag :options="jobGroupOptions" :value="scope.row.jobGroup"/>
+ </template>
+ </el-table-column>
<el-table-column label="璋冪敤鐩爣瀛楃涓�" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="cron鎵ц琛ㄨ揪寮�" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
<el-table-column label="鐘舵��" align="center">
@@ -126,7 +130,7 @@
@click="handleDelete(scope.row)"
v-hasPermi="['monitor:job:remove']"
>鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
<span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
</span>
@@ -280,7 +284,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";
export default {
name: "Job",
@@ -316,6 +320,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ reasonable: true,
jobName: undefined,
jobGroup: undefined,
status: undefined
@@ -358,10 +363,6 @@
// 浠诲姟缁勫悕瀛楀吀缈昏瘧
jobGroupFormat(row, column) {
return this.selectDictLabel(this.jobGroupOptions, row.jobGroup);
- },
- // 鐘舵�佸瓧鍏哥炕璇�
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -451,7 +452,7 @@
/** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
handleJobLog(row) {
const jobId = row.jobId || 0;
- this.$router.push({ path: '/job/log', query: { jobId: jobId } })
+ this.$router.push({ path: '/monitor/job-log/index', query: { jobId: jobId } })
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -505,18 +506,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
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.downLoadExcel('/monitor/job/export', this.queryParams);
}
}
};
--
Gitblit v1.9.3