|
@@ -58,6 +58,43 @@
|
|
|
end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="是否完成" prop="whetherComplete">
|
|
|
+ <el-select v-model="queryParams.whetherComplete" placeholder="请选择任务是否完成" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_job_complete"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="任务员工" prop="empno">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.empno"
|
|
|
+ placeholder="请输入员工工号"
|
|
|
+ clearable
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="任务大类" prop="jobType">
|
|
|
+ <el-select v-model="queryParams.jobType" placeholder="请选择任务大类" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_oa"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="任务小类" prop="jobTypeS">
|
|
|
+ <el-select v-model="queryParams.jobTypeS" placeholder="请选择任务小类" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_oa_s"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
@@ -131,6 +168,31 @@
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="编号" width="80" align="center" prop="jobLogId" />
|
|
|
+ <el-table-column label="任务执行状态" align="center" prop="status">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag
|
|
|
+ :options="dict.type.sys_common_status"
|
|
|
+ :value="scope.row.status"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column label="执行时间" align="center" prop="createTime" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>-->
|
|
|
+ <el-table-column
|
|
|
+ label="完成时长"
|
|
|
+ width="180"
|
|
|
+ align="center"
|
|
|
+ prop="tqaaaa"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="超时时长"
|
|
|
+ width="180"
|
|
|
+ align="center"
|
|
|
+ prop="tqbbbb"
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
label="任务名称"
|
|
|
width="180"
|
|
@@ -180,28 +242,17 @@
|
|
|
align="center"
|
|
|
prop="executionTime"
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
- label="完成时长"
|
|
|
- width="180"
|
|
|
- align="center"
|
|
|
- prop="tqaaaa"
|
|
|
- />
|
|
|
+
|
|
|
<el-table-column
|
|
|
label="预计时长"
|
|
|
width="80"
|
|
|
align="center"
|
|
|
prop="durations"
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
- label="超时时长"
|
|
|
- width="180"
|
|
|
- align="center"
|
|
|
- prop="tqbbbb"
|
|
|
- />
|
|
|
|
|
|
<el-table-column
|
|
|
label="oa执行状态"
|
|
|
- width="80"
|
|
|
+ width="90"
|
|
|
align="center"
|
|
|
prop="completionStatus"
|
|
|
>
|
|
@@ -233,19 +284,6 @@
|
|
|
prop="jobMessage"
|
|
|
:show-overflow-tooltip="true"
|
|
|
/>
|
|
|
- <el-table-column label="任务执行状态" align="center" prop="status">
|
|
|
- <template slot-scope="scope">
|
|
|
- <dict-tag
|
|
|
- :options="dict.type.sys_common_status"
|
|
|
- :value="scope.row.status"
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- <el-table-column label="执行时间" align="center" prop="createTime" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>-->
|
|
|
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
@@ -329,7 +367,7 @@ import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
|
|
|
|
|
|
export default {
|
|
|
name: "JobLog",
|
|
|
- dicts: ["sys_common_status", "sys_job_group","sys_oa_back_state"],
|
|
|
+ dicts: ["sys_job_complete", "sys_oa", "sys_oa_s", "sys_common_status", "sys_job_group","sys_oa_back_state"],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
@@ -357,6 +395,10 @@ export default {
|
|
|
jobName: undefined,
|
|
|
jobGroup: undefined,
|
|
|
status: undefined,
|
|
|
+ jobType: undefined,
|
|
|
+ jobTypeS: undefined,
|
|
|
+ empno:undefined,
|
|
|
+ whetherComplete:undefined
|
|
|
},
|
|
|
};
|
|
|
},
|
|
@@ -385,6 +427,7 @@ export default {
|
|
|
this.loading = true;
|
|
|
listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
(response) => {
|
|
|
+ // console.log(response, 'response')
|
|
|
this.jobLogList = response.rows.map((item) => {
|
|
|
const { executionTime, createTime, duration } = item;
|
|
|
|