Skip to content

Commit 4677a5e

Browse files
committed
#409 作业总览页面支持按照“作业状态”进行过滤
1 parent 8fa209b commit 4677a5e

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

saturn-console-web/src/pages/job_list/job_overview.vue

+9-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
<el-option v-for="item in groupList" :label="item" :value="item" :key="item"></el-option>
2929
</el-select>
3030
</el-form-item>
31+
<el-form-item label="">
32+
<el-select v-model="filters.status" @change="scope.search">
33+
<el-option label="全部状态" value=""></el-option>
34+
<el-option v-for="item in $option.jobStatusTypes" :label="item.label" :value="item.value" :key="item.value"></el-option>
35+
</el-select>
36+
</el-form-item>
3137
<el-form-item label="">
3238
<el-input placeholder="搜索" v-model="filters.jobName" @keyup.enter.native="scope.search"></el-input>
3339
</el-form-item>
@@ -55,7 +61,7 @@
5561
</div>
5662
<el-table stripe border ref="multipleTable" @selection-change="handleSelectionChange" @sort-change="scope.onSortChange" :data="scope.pageData" style="width: 100%">
5763
<el-table-column type="selection" width="55"></el-table-column>
58-
<el-table-column prop="jobName" label="作业名" min-width="110" sortable>
64+
<el-table-column prop="jobName" label="作业名" sortable>
5965
<template slot-scope="scope">
6066
<router-link tag="a" :to="{ name: 'job_setting', params: { domain: domainName, jobName: scope.row.jobName } }">
6167
<el-button type="text">
@@ -84,7 +90,7 @@
8490
</el-tooltip>
8591
</template>
8692
</el-table-column>
87-
<el-table-column prop="description" label="描述">
93+
<el-table-column prop="description" show-overflow-tooltip label="描述" width="170px">
8894
<template slot-scope="scope">
8995
{{scope.row.description || '-'}}
9096
</template>
@@ -150,6 +156,7 @@ export default {
150156
filters: {
151157
jobName: '',
152158
groups: '',
159+
status: '',
153160
},
154161
orderBy: 'jobName',
155162
groupList: [],

saturn-console-web/src/utils/option.js

+13
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,17 @@ export default {
66
value: 'SHELL_JOB',
77
label: 'Shell定时作业',
88
}],
9+
jobStatusTypes: [{
10+
value: 'READY',
11+
label: '已就绪',
12+
}, {
13+
value: 'RUNNING',
14+
label: '运行中',
15+
}, {
16+
value: 'STOPPING',
17+
label: '停止中',
18+
}, {
19+
value: 'STOPPED',
20+
label: '已停止',
21+
}],
922
};

0 commit comments

Comments
 (0)