|
@@ -1,6 +1,13 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryForm"
|
|
|
+ size="small"
|
|
|
+ :inline="true"
|
|
|
+ v-show="showSearch"
|
|
|
+ label-width="68px"
|
|
|
+ >
|
|
|
<el-form-item label="任务名称" prop="jobName">
|
|
|
<el-input
|
|
|
v-model="queryParams.jobName"
|
|
@@ -52,8 +59,16 @@
|
|
|
></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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ 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>
|
|
|
|
|
@@ -67,7 +82,8 @@
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['monitor:job:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -77,7 +93,8 @@
|
|
|
size="mini"
|
|
|
@click="handleClean"
|
|
|
v-hasPermi="['monitor:job:remove']"
|
|
|
- >清空</el-button>
|
|
|
+ >清空</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -87,7 +104,8 @@
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['monitor:job:export']"
|
|
|
- >导出</el-button>
|
|
|
+ >导出</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -96,48 +114,144 @@
|
|
|
icon="el-icon-close"
|
|
|
size="mini"
|
|
|
@click="handleClose"
|
|
|
- >关闭</el-button>
|
|
|
+ >关闭</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="jobLogList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ @row-dblclick="dblclick"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
|
|
|
+ <el-table-column label="编号" width="80" align="center" prop="jobLogId" />
|
|
|
+ <el-table-column
|
|
|
+ label="任务名称"
|
|
|
+ width="180"
|
|
|
+ align="center"
|
|
|
+ prop="jobName"
|
|
|
+ :show-overflow-tooltip="false"
|
|
|
+ />
|
|
|
|
|
|
+ <el-table-column
|
|
|
+ label="任务员工"
|
|
|
+ width="80"
|
|
|
+ align="center"
|
|
|
+ prop="nickName"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="任务大类"
|
|
|
+ width="80"
|
|
|
+ align="center"
|
|
|
+ prop="jobType"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="任务小类"
|
|
|
+ width="80"
|
|
|
+ align="center"
|
|
|
+ prop="jobTypeS"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="任务内容"
|
|
|
+ width="200"
|
|
|
+ align="center"
|
|
|
+ prop="cont"
|
|
|
+ />
|
|
|
|
|
|
- <el-table-column label="员工工号" width="80" align="center" prop="enpno" />
|
|
|
- <el-table-column label="任务大类" width="80" align="center" prop="jobType" />
|
|
|
- <el-table-column label="任务小类" width="80" align="center" prop="jobTypeS" />
|
|
|
- <el-table-column label="任务内容" width="80" align="center" prop="cont" />
|
|
|
- <el-table-column label="超时时间" width="80" align="center" prop="timeout" />
|
|
|
- <el-table-column label="预计时长" width="80" align="center" prop="duration" />
|
|
|
+ <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="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="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
|
|
|
+ <el-table-column
|
|
|
+ label="oa执行状态"
|
|
|
+ width="80"
|
|
|
+ align="center"
|
|
|
+ prop="completionStatus"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
|
|
|
+ <dict-tag
|
|
|
+ :options="dict.type.sys_oa_back_state"
|
|
|
+ :value="scope.row.completionStatus"
|
|
|
+ />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
|
|
|
- <el-table-column label="执行状态" align="center" prop="status">
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ label="任务组名"
|
|
|
+ align="center"
|
|
|
+ prop="jobGroup"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
|
|
|
+ <dict-tag
|
|
|
+ :options="dict.type.sys_job_group"
|
|
|
+ :value="scope.row.jobGroup"
|
|
|
+ />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="执行时间" align="center" prop="createTime" width="180">
|
|
|
+ <!-- <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />-->
|
|
|
+ <el-table-column
|
|
|
+ label="日志信息"
|
|
|
+ align="center"
|
|
|
+ prop="jobMessage"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ />
|
|
|
+ <el-table-column label="任务执行状态" align="center" prop="status">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.createTime) }}</span>
|
|
|
+ <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="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
@@ -145,13 +259,14 @@
|
|
|
icon="el-icon-view"
|
|
|
@click="handleView(scope.row)"
|
|
|
v-hasPermi="['monitor:job:query']"
|
|
|
- >详细</el-button>
|
|
|
+ >详细</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
@@ -159,7 +274,12 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 调度日志详细 -->
|
|
|
- <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
|
|
|
+ <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">
|
|
@@ -169,13 +289,19 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="任务分组:">{{ form.jobGroup }}</el-form-item>
|
|
|
- <el-form-item label="执行时间:">{{ form.createTime }}</el-form-item>
|
|
|
+ <el-form-item label="执行时间:">{{
|
|
|
+ form.createTime
|
|
|
+ }}</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="调用方法:">{{ form.invokeTarget }}</el-form-item>
|
|
|
+ <el-form-item label="调用方法:">{{
|
|
|
+ form.invokeTarget
|
|
|
+ }}</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="日志信息:">{{ form.jobMessage }}</el-form-item>
|
|
|
+ <el-form-item label="日志信息:">{{
|
|
|
+ form.jobMessage
|
|
|
+ }}</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="执行状态:">
|
|
@@ -184,7 +310,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="异常信息:" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
|
|
|
+ <el-form-item label="异常信息:" v-if="form.status == 1">{{
|
|
|
+ form.exceptionInfo
|
|
|
+ }}</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
@@ -196,12 +324,12 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getJob} from "@/api/monitor/job";
|
|
|
+import { getJob } from "@/api/monitor/job";
|
|
|
import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
|
|
|
|
|
|
export default {
|
|
|
name: "JobLog",
|
|
|
- dicts: ['sys_common_status', 'sys_job_group'],
|
|
|
+ dicts: ["sys_common_status", "sys_job_group","sys_oa_back_state"],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
@@ -228,14 +356,14 @@ export default {
|
|
|
pageSize: 10,
|
|
|
jobName: undefined,
|
|
|
jobGroup: undefined,
|
|
|
- status: undefined
|
|
|
- }
|
|
|
+ status: undefined,
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
const jobId = this.$route.params && this.$route.params.jobId;
|
|
|
if (jobId !== undefined && jobId != 0) {
|
|
|
- getJob(jobId).then(response => {
|
|
|
+ getJob(jobId).then((response) => {
|
|
|
this.queryParams.jobName = response.data.jobName;
|
|
|
this.queryParams.jobGroup = response.data.jobGroup;
|
|
|
this.getList();
|
|
@@ -245,16 +373,48 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ dblclick({ executionTime, createTime }, column) {
|
|
|
+ console.log(
|
|
|
+ (new Date(executionTime).getTime() - new Date(createTime).getTime()) /
|
|
|
+ 1000 +
|
|
|
+ "s"
|
|
|
+ );
|
|
|
+ },
|
|
|
/** 查询调度日志列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
|
|
- this.jobLogList = response.rows;
|
|
|
+ listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(
|
|
|
+ (response) => {
|
|
|
+ this.jobLogList = response.rows.map((item) => {
|
|
|
+ const { executionTime, createTime, duration } = item;
|
|
|
+
|
|
|
+ const durations=`${duration}h`;
|
|
|
+
|
|
|
+ const tqaaaa = (
|
|
|
+ parseInt (
|
|
|
+ new Date(executionTime).getTime() - new Date(createTime).getTime()
|
|
|
+ ) /
|
|
|
+ 1000 /
|
|
|
+ 60 /
|
|
|
+ 60
|
|
|
+ ).toFixed(2)+'h';
|
|
|
+ const tqbbbb =
|
|
|
+ tqaaaa - duration > 0 ? `超时${tqaaaa - duration}h` : `未超时`;
|
|
|
+
|
|
|
+ return {
|
|
|
+ ...item,
|
|
|
+ tqaaaa,
|
|
|
+ tqbbbb,
|
|
|
+ durations,
|
|
|
+ };
|
|
|
+ });
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
}
|
|
|
);
|
|
|
},
|
|
|
+
|
|
|
+ // new Date(scope.row.executionTime).getTime()-new Date(scope.row.createTime).getTime())/1000+'s'
|
|
|
// 返回按钮
|
|
|
handleClose() {
|
|
|
const obj = { path: "/monitor/job" };
|
|
@@ -273,7 +433,7 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.jobLogId);
|
|
|
+ this.ids = selection.map((item) => item.jobLogId);
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 详细按钮操作 */
|
|
@@ -284,28 +444,40 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const jobLogIds = this.ids;
|
|
|
- this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?').then(function() {
|
|
|
- return delJobLog(jobLogIds);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$modal
|
|
|
+ .confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项?')
|
|
|
+ .then(function () {
|
|
|
+ return delJobLog(jobLogIds);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 清空按钮操作 */
|
|
|
handleClean() {
|
|
|
- this.$modal.confirm('是否确认清空所有调度日志数据项?').then(function() {
|
|
|
- return cleanJobLog();
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("清空成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$modal
|
|
|
+ .confirm("是否确认清空所有调度日志数据项?")
|
|
|
+ .then(function () {
|
|
|
+ return cleanJobLog();
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("清空成功");
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- this.download('/monitor/jobLog/export', {
|
|
|
- ...this.queryParams
|
|
|
- }, `log_${new Date().getTime()}.xlsx`)
|
|
|
- }
|
|
|
- }
|
|
|
+ this.download(
|
|
|
+ "/monitor/jobLog/export",
|
|
|
+ {
|
|
|
+ ...this.queryParams,
|
|
|
+ },
|
|
|
+ `log_${new Date().getTime()}.xlsx`
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|