From 1cc8bc172bbf129519a2d0fd9eb8fe67d4b54937 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 19 八月 2020 17:03:21 +0800
Subject: [PATCH] 修改代码生成 删除主键type注解配置 使用全局配置
---
ruoyi-ui/src/views/monitor/job/index.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 01b90c5..5ed6ed9 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.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"
@@ -31,7 +31,7 @@
</el-select>
</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>
@@ -84,6 +84,7 @@
v-hasPermi="['monitor:job:query']"
>鏃ュ織</el-button>
</el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
@@ -132,8 +133,8 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="700px">
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="浠诲姟鍚嶇О" prop="jobName">
@@ -210,7 +211,7 @@
</el-dialog>
<!-- 浠诲姟鏃ュ織璇︾粏 -->
- <el-dialog title="浠诲姟璇︾粏" :visible.sync="openView" width="700px">
+ <el-dialog title="浠诲姟璇︾粏" :visible.sync="openView" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-row>
<el-col :span="12">
@@ -238,8 +239,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏄惁骞跺彂锛�">
- <div v-if="form.status == 0">鍏佽</div>
- <div v-else-if="form.status == 1">绂佹</div>
+ <div v-if="form.concurrent == 0">鍏佽</div>
+ <div v-else-if="form.concurrent == 1">绂佹</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -259,7 +260,6 @@
</div>
</template>
-
<script>
import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
@@ -275,6 +275,8 @@
single: true,
// 闈炲涓鐢�
multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
// 鎬绘潯鏁�
total: 0,
// 瀹氭椂浠诲姟琛ㄦ牸鏁版嵁
@@ -398,7 +400,7 @@
type: "warning"
}).then(function() {
return runJob(row.jobId, row.jobGroup);
- }).then(function() {
+ }).then(() => {
this.msgSuccess("鎵ц鎴愬姛");
}).catch(function() {});
},
@@ -439,8 +441,6 @@
this.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
} else {
@@ -449,8 +449,6 @@
this.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
- } else {
- this.msgError(response.msg);
}
});
}
@@ -486,4 +484,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3