😎调整定时任务页面

This commit is contained in:
zuohuaijun 2024-07-01 15:23:53 +08:00
parent 074a128965
commit 261ef806cb
5 changed files with 392 additions and 295 deletions

View File

@ -1,4 +1,10 @@
export const JobScriptCode = `#region using
export const JobScriptCode = `// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
//
// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
#region using
using Furion;
using Furion.Logging;

View File

@ -1,6 +1,6 @@
<template>
<div class="sys-jobDetail-container">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="900px">
<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@ -10,7 +10,7 @@
<el-tabs v-model="state.selectedTabName">
<el-tab-pane label="作业信息">
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto" style="height: 500px">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="作业编号" prop="jobId" :rules="[{ required: true, message: '作业编号不能为空', trigger: 'blur' }]">
<el-input v-model="state.ruleForm.jobId" placeholder="作业编号" :disabled="isEdit" clearable />
@ -190,8 +190,8 @@ const openDialog = (row: any) => {
//
setTimeout(() => {
if (monacoEditor == null) initMonacoEditor();
monacoEditor.setValue(row.id == undefined ? JobScriptCode : state.ruleForm.scriptCode);
if (monacoEditor == null || monacoEditor == undefined) initMonacoEditor();
monacoEditor.setValue(row.id == undefined ? JobScriptCode : state.ruleForm.scriptCode ?? '');
}, 1);
};

View File

@ -8,7 +8,7 @@
</div>
</template>
<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
<el-row :gutter="35">
<el-row :gutter="10">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="触发器编号" prop="triggerId" :rules="[{ required: true, message: '触发器编号不能为空', trigger: 'blur' }]">
<el-input v-model="state.ruleForm.triggerId" placeholder="触发器编号" clearable />
@ -144,7 +144,6 @@
import { reactive, ref, computed } from 'vue';
import type { WritableComputedRef } from 'vue';
import { ElMessage } from 'element-plus';
import vcrontab from 'vcrontab-3';
import { getAPI } from '/@/utils/axios-utils';
@ -186,10 +185,8 @@ const periodValue: WritableComputedRef<number | undefined> = computed({
//
if (state.ruleForm.triggerType != 'Furion.Schedule.PeriodTrigger') return defaultValue;
if (!state.ruleForm.args) return defaultValue;
const value: number | undefined = Number(state.ruleForm.args);
if (Number.isNaN(value)) return defaultValue;
return value;
},
set(value: number | undefined) {
@ -290,7 +287,7 @@ defineExpose({ openDialog });
<style lang="scss" scoped>
#vcrontab {
:deep(.el-select) {
min-width: 300px;
min-width: 270px;
}
}
</style>
</style>

View File

@ -1,7 +1,7 @@
<template>
<div class="sys-jobCluster-container">
<el-drawer v-model="state.isVisible" title="作业集群" size="40%">
<el-table :data="state.jobClusterList" style="width: 100%; margin: 8px" v-loading="state.loading" border>
<el-drawer v-model="state.isVisible" title="作业集群" size="65%">
<el-table :data="state.jobClusterList" style="width: 100%" v-loading="state.loading" border>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="clusterId" label="集群编号" header-align="center" show-overflow-tooltip />
<el-table-column prop="status" label="状态" align="center" show-overflow-tooltip>
@ -31,6 +31,7 @@ const state = reactive({
jobClusterList: [] as Array<SysJobCluster>,
});
//
onMounted(async () => {
handleQuery();
});

View File

@ -1,23 +1,37 @@
<template>
<div class="sys-job-container">
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="state.queryParams" ref="queryForm" :inline="true">
<el-form-item label="作业编号">
<el-input v-model="state.queryParams.jobId" placeholder="作业编号" clearable />
</el-form-item>
<el-form-item label="描述信息">
<el-input v-model="state.queryParams.description" placeholder="描述信息" clearable />
</el-form-item>
<el-form-item>
<div class="sys-job-container" v-loading="options.loading">
<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" :label-width="'60px'" style="flex: 1 1 0%">
<el-row :gutter="10">
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="作业编号" prop="jobId">
<el-input v-model="state.queryParams.jobId" placeholder="作业编号" clearable @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
<el-form-item label="描述信息" prop="description">
<el-input v-model="state.queryParams.description" placeholder="描述信息" clearable @keyup.enter.native="handleQuery(true)" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
<el-row>
<el-col>
<el-button-group>
<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysJob:pageJobDetail'"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysJob:pageJobDetail'" :loading="options.loading"> 查询 </el-button>
<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
</el-button-group>
</el-form-item>
<el-form-item>
<el-button-group style="margin: 0px 12px">
</el-col>
</el-row>
</el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
<template #toolbar_buttons>
<el-button-group>
<el-tooltip content="增加作业">
<el-button icon="ele-CirclePlus" @click="openAddJobDetail" v-auth="'sysJob:addJobDetail'"> </el-button>
<el-button icon="ele-CirclePlus" @click="handleAdd" v-auth="'sysJob:addJobDetail'"> </el-button>
</el-tooltip>
<el-tooltip content="启动所有作业">
<el-button icon="ele-VideoPlay" @click="startAllJob" />
@ -26,7 +40,7 @@
<el-button icon="ele-VideoPause" @click="pauseAllJob" />
</el-tooltip>
</el-button-group>
<el-button-group style="margin: 0px 12px 0px 0px">
<el-button-group style="margin: 0 12px">
<el-tooltip content="强制唤醒作业调度器">
<el-button icon="ele-AlarmClock" @click="cancelSleep" />
</el-tooltip>
@ -36,225 +50,204 @@
</el-button-group>
<el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button>
<el-button icon="ele-Grid" @click="openJobDashboard" plain> 任务看板 </el-button>
</el-form-item>
</el-form>
<el-button-group style="padding-left: 12px">
<el-button type="primary" icon="ele-Expand" @click="handleExpand"> 全部展开 </el-button>
<el-button type="primary" icon="ele-Fold" @click="handleFold"> 全部折叠 </el-button>
</el-button-group>
</template>
<template #toolbar_tools> </template>
<template #empty>
<el-empty :image-size="200" />
</template>
<template #row_content="scope">
<vxe-table style="margin: 5px" align="center" :data="(scope.row as JobDetailOutput).jobTriggers">
<!-- <vxe-column type="checkbox" width="40" fixed="left"></vxe-column> -->
<vxe-column type="seq" width="40" fixed="left"></vxe-column>
<vxe-column field="triggerId" title="触发器编号" :minWidth="180" showOverflow="tooltip"></vxe-column>
<vxe-column field="triggerType" title="类型" :minWidth="120" showOverflow="tooltip"></vxe-column>
<!-- <vxe-column field="assemblyName" title="程序集" :minWidth="120" showOverflow="tooltip"></vxe-column> -->
<vxe-column field="args" title="参数" :minWidth="120" showOverflow="tooltip"></vxe-column>
<vxe-column field="description" title="描述" :minWidth="120" showOverflow="tooltip"></vxe-column>
<vxe-column field="status" title="状态" :minWidth="120" showOverflow="tooltip">
<template #default="{ row }">
<el-tag type="warning" effect="plain" v-if="(row as SysJobTrigger).status == 0"> 积压 </el-tag>
<el-tag type="info" effect="plain" v-if="(row as SysJobTrigger).status == 1"> 就绪 </el-tag>
<el-tag type="success" effect="plain" v-if="(row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 3"> 暂停 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
<el-tag type="info" effect="plain" v-if="(row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 6"> 归档 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 8"> 超限 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 9"> 无触发时间 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 10"> 未启动 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 11"> 未知作业触发器 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 12"> 未知作业处理程序 </el-tag>
</template>
</vxe-column>
<vxe-column field="startTime" title="起始时间" :minWidth="100" showOverflow="tooltip"></vxe-column>
<vxe-column field="endTime" title="结束时间" :minWidth="100" showOverflow="tooltip"></vxe-column>
<vxe-column field="lastRunTime" title="最近运行时间" :minWidth="130" showOverflow="tooltip"></vxe-column>
<vxe-column field="nextRunTime" title="下一次运行时间" :minWidth="130" showOverflow="tooltip"></vxe-column>
<vxe-column field="numberOfRuns" title="触发次数" :minWidth="70" showOverflow="tooltip"></vxe-column>
<vxe-column field="maxNumberOfRuns" title="最大触发次数" :minWidth="90" showOverflow="tooltip"></vxe-column>
<vxe-column field="numberOfErrors" title="出错次数" :minWidth="70" showOverflow="tooltip"></vxe-column>
<vxe-column field="maxNumberOfErrors" title="最大出错次数" :minWidth="90" showOverflow="tooltip"></vxe-column>
<vxe-column field="numRetries" title="重试次数" :minWidth="70" showOverflow="tooltip"></vxe-column>
<vxe-column field="retryTimeout" title="重试间隔ms" :minWidth="80" showOverflow="tooltip"></vxe-column>
<vxe-column field="startNow" title="是否立即启动" :minWidth="90" showOverflow="tooltip">
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).startNow == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</vxe-column>
<vxe-column field="runOnStart" title="是否启动时执行一次" :minWidth="120" showOverflow="tooltip">
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).runOnStart == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</vxe-column>
<vxe-column field="resetOnlyOnce" title="是否重置触发次数" :minWidth="110" showOverflow="tooltip">
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).resetOnlyOnce == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</vxe-column>
<vxe-column title="操作" :minWidth="130" fixed="right">
<template #default="scope">
<el-tooltip content="启动触发器">
<el-button size="small" type="primary" icon="ele-VideoPlay" text @click="startTrigger(scope.row)" />
</el-tooltip>
<el-tooltip content="暂停触发器">
<el-button size="small" type="primary" icon="ele-VideoPause" text @click="pauseTrigger(scope.row)" />
</el-tooltip>
<el-tooltip content="编辑触发器">
<el-button size="small" type="primary" icon="ele-Edit" text @click="openEditJobTrigger(scope.row)"> </el-button>
</el-tooltip>
<el-tooltip content="删除触发器">
<el-button size="small" type="danger" icon="ele-Delete" text @click="delJobTrigger(scope.row)"> </el-button>
</el-tooltip>
</template>
</vxe-column>
</vxe-table>
</template>
<template #row_jobId="{ row }">
<div style="display: flex; align-items: center">
<el-icon><timer /></el-icon>
<span style="margin-left: 5px">{{ (row as JobDetailOutput).jobDetail?.jobId }}</span>
</div>
</template>
<template #row_concurrent="{ row }">
<el-tag type="success" v-if="(row as JobDetailOutput).jobDetail?.concurrent == true"> 并行 </el-tag>
<el-tag type="warning" v-else> 串行 </el-tag>
</template>
<template #row_createType="{ row }">
<el-tag type="info" v-if="(row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_0"> 内置 </el-tag>
<el-tag type="warning" v-if="(row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_1"> 脚本 </el-tag>
<el-tag type="success" v-if="(row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_2"> HTTP请求 </el-tag>
</template>
<template #row_includeAnnotations="{ row }">
<el-tag v-if="(row as JobDetailOutput).jobDetail?.includeAnnotations == true"> </el-tag>
<el-tag v-else> </el-tag>
</template>
<template #row_properties="{ row }">
<span v-if="(row as JobDetailOutput).jobDetail?.createType != JobCreateTypeEnum.NUMBER_2"> {{ (row as JobDetailOutput).jobDetail?.properties }} </span>
<div v-else style="text-align: center">
<el-popover placement="left" :width="400" trigger="hover">
<template #reference>
<el-tag effect="plain" type="info"> 请求参数 </el-tag>
</template>
<el-descriptions title="Http 请求参数" :column="1" size="small" :border="true">
<el-descriptions-item label="请求地址" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpJobMessage((row as JobDetailOutput).jobDetail?.properties).requestUri }}
</el-descriptions-item>
<el-descriptions-item label="请求方法" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpMethodDesc(getHttpJobMessage((row as JobDetailOutput).jobDetail?.properties).httpMethod) }}
</el-descriptions-item>
<el-descriptions-item label="请求报文体" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpJobMessage((row as JobDetailOutput).jobDetail?.properties).body }}
</el-descriptions-item>
</el-descriptions>
</el-popover>
</div>
</template>
<template #row_buttons="{ row }">
<el-tooltip content="执行记录">
<el-button size="small" type="primary" icon="ele-Timer" text @click="openJobTriggerRecord(row)"> </el-button>
</el-tooltip>
<el-tooltip content="增加触发器">
<el-button size="small" type="primary" icon="ele-CirclePlus" text @click="openAddJobTrigger(row)"> </el-button>
</el-tooltip>
<el-tooltip content="执行作业">
<el-button size="small" type="primary" icon="ele-CircleCheck" text @click="runJob(row)" />
</el-tooltip>
<el-tooltip content="启动作业">
<el-button size="small" type="primary" icon="ele-VideoPlay" text @click="startJob(row)" />
</el-tooltip>
<el-tooltip content="暂停作业">
<el-button size="small" type="primary" icon="ele-VideoPause" text @click="pauseJob(row)" />
</el-tooltip>
<el-tooltip content="取消作业">
<el-button size="small" type="primary" icon="ele-CircleClose" text @click="cancelJob(row)" />
</el-tooltip>
<el-tooltip content="编辑作业">
<el-button size="small" type="primary" icon="ele-Edit" text @click="handleEdit(row)" v-auth="'sysJob:updateJobDetail'"> </el-button>
</el-tooltip>
<el-tooltip content="删除作业">
<el-button size="small" type="danger" icon="ele-Delete" text @click="handleDelete(row)" v-auth="'sysJob:deleteJobDetail'"> </el-button>
</el-tooltip>
</template>
<template #pager>
<vxe-pager
:loading="options.loading"
v-model:current-page="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
@page-change="pageChange"
/>
</template>
</vxe-grid>
</el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
<el-table :data="state.jobData" style="width: 100%" v-loading="state.loading" border>
<el-table-column type="expand" fixed>
<template #default="scope">
<el-table style="margin-left: 48px; width: calc(100% - 48px)" :data="(scope.row as JobDetailOutput).jobTriggers" border size="small">
<el-table-column type="index" label="序号" width="55" align="center" fixed />
<el-table-column prop="triggerId" label="触发器编号" width="180" header-align="center" fixed show-overflow-tooltip />
<el-table-column prop="triggerType" label="类型" width="200" header-align="center" show-overflow-tooltip />
<!-- <el-table-column prop="assemblyName" label="程序集" show-overflow-tooltip /> -->
<el-table-column prop="args" label="参数" header-align="center" show-overflow-tooltip />
<el-table-column prop="description" label="描述" width="120" header-align="center" show-overflow-tooltip />
<el-table-column prop="status" label="状态" width="120" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
<el-tag type="success" effect="plain" v-if="(scope.row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 3"> 暂停 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 6"> 归档 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 8"> 超限 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 9"> 无触发时间 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 10"> 未启动 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 11"> 未知作业触发器 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 12"> 未知作业处理程序 </el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="起始时间" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="endTime" label="结束时间" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="lastRunTime" label="最近运行时间" width="130" align="center" show-overflow-tooltip />
<el-table-column prop="nextRunTime" label="下一次运行时间" width="130" align="center" show-overflow-tooltip />
<el-table-column prop="numberOfRuns" label="触发次数" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="maxNumberOfRuns" label="最大触发次数" width="120" align="center" show-overflow-tooltip />
<el-table-column prop="numberOfErrors" label="出错次数" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="maxNumberOfErrors" label="最大出错次数" width="120" align="center" show-overflow-tooltip />
<el-table-column prop="numRetries" label="重试次数" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="retryTimeout" label="重试间隔ms" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="startNow" label="是否立即启动" width="100" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).startNow == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</el-table-column>
<el-table-column prop="runOnStart" label="是否启动时执行一次" width="150" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).runOnStart == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</el-table-column>
<el-table-column prop="resetOnlyOnce" label="是否重置触发次数" width="120" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="(scope.row as SysJobTrigger).resetOnlyOnce == true"> </el-tag>
<el-tag type="info" v-else> </el-tag>
</template>
</el-table-column>
<el-table-column prop="updatedTime" label="更新时间" width="130" align="center" show-overflow-tooltip />
<el-table-column label="操作" width="140" align="center" show-overflow-tooltip fixed="right">
<template #default="scope">
<el-tooltip content="启动触发器">
<el-button size="small" type="primary" icon="ele-VideoPlay" text @click="startTrigger(scope.row)" />
</el-tooltip>
<el-tooltip content="暂停触发器">
<el-button size="small" type="primary" icon="ele-VideoPause" text @click="pauseTrigger(scope.row)" />
</el-tooltip>
<el-tooltip content="编辑触发器">
<el-button size="small" type="primary" icon="ele-Edit" text @click="openEditJobTrigger(scope.row)"> </el-button>
</el-tooltip>
<el-tooltip content="删除触发器">
<el-button size="small" type="danger" icon="ele-Delete" text @click="delJobTrigger(scope.row)"> </el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-drawer v-model="state.isVisibleDrawer" size="60%">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Clock /> </el-icon>
<span> 作业触发器运行记录</span>
</div>
</template>
<el-card class="full-table" shadow="hover">
<vxe-grid ref="xRecordGrid" class="xGrid-style" v-bind="recordOptions" @sort-change="recordSortChange">
<template #toolbar_buttons></template>
<template #toolbar_tools> </template>
<template #empty>
<el-empty :image-size="200" />
</template>
</el-table-column>
<el-table-column type="index" label="序号" width="55" align="center" fixed />
<el-table-column prop="jobDetail.jobId" label="作业编号" width="180" header-align="center" fixed>
<template #default="scope">
<div style="display: flex; align-items: center">
<el-icon><timer /></el-icon>
<span style="margin-left: 5px">{{ (scope.row as JobDetailOutput).jobDetail?.jobId }}</span>
</div>
<template #row_status="{ row }">
<el-tag type="warning" effect="plain" v-if="(row as SysJobTrigger).status == 0"> 积压 </el-tag>
<el-tag type="info" effect="plain" v-if="(row as SysJobTrigger).status == 1"> 就绪 </el-tag>
<el-tag type="success" effect="plain" v-if="(row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 3"> 暂停 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
<el-tag type="info" effect="plain" v-if="(row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 6"> 归档 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 8"> 超限 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 9"> 无触发时间 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 10"> 未启动 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 11"> 未知作业触发器 </el-tag>
<el-tag type="danger" effect="plain" v-if="(row as SysJobTrigger).status == 12"> 未知作业处理程序 </el-tag>
</template>
</el-table-column>
<el-table-column prop="jobDetail.groupName" label="组名称" width="100" align="center" show-overflow-tooltip />
<el-table-column prop="jobDetail.jobType" label="类型" width="200" header-align="center" show-overflow-tooltip />
<!-- <el-table-column prop="jobDetail.assemblyName" label="程序集" show-overflow-tooltip /> -->
<el-table-column prop="jobDetail.description" label="描述" header-align="center" show-overflow-tooltip />
<el-table-column prop="jobDetail.concurrent" label="执行方式" width="90" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag type="success" v-if="(scope.row as JobDetailOutput).jobDetail?.concurrent == true"> 并行 </el-tag>
<el-tag type="warning" v-else> 串行 </el-tag>
<template #pager>
<vxe-pager
:loading="recordOptions.loading"
v-model:current-page="state.recordTableParams.page"
v-model:page-size="state.recordTableParams.pageSize"
:total="state.recordTableParams.total"
@page-change="recordPageChange"
/>
</template>
</el-table-column>
<el-table-column prop="jobDetail.createType" label="作业创建类型" width="110" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag type="info" v-if="(scope.row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_0"> 内置 </el-tag>
<el-tag type="warning" v-if="(scope.row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_1"> 脚本 </el-tag>
<el-tag type="success" v-if="(scope.row as JobDetailOutput).jobDetail?.createType == JobCreateTypeEnum.NUMBER_2"> HTTP请求 </el-tag>
</template>
</el-table-column>
<!-- <el-table-column prop="jobDetail.includeAnnotations" label="扫描特性触发器" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag v-if="(scope.row as JobDetailOutput).jobDetail?.includeAnnotations == true"> </el-tag>
<el-tag v-else> </el-tag>
</template>
</el-table-column> -->
<el-table-column prop="jobDetail.updatedTime" label="更新时间" width="130" align="center" show-overflow-tooltip />
<el-table-column prop="jobDetail.properties" label="额外数据" header-align="center" show-overflow-tooltip>
<template #default="scope">
<span v-if="(scope.row as JobDetailOutput).jobDetail?.createType != JobCreateTypeEnum.NUMBER_2"> {{ (scope.row as JobDetailOutput).jobDetail?.properties }} </span>
<div v-else style="text-align: center">
<el-popover placement="left" :width="400" trigger="hover">
<template #reference>
<el-tag effect="plain" type="info"> 请求参数 </el-tag>
</template>
<el-descriptions title="Http 请求参数" :column="1" size="small" :border="true">
<el-descriptions-item label="请求地址" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpJobMessage((scope.row as JobDetailOutput).jobDetail?.properties).requestUri }}
</el-descriptions-item>
<el-descriptions-item label="请求方法" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpMethodDesc(getHttpJobMessage((scope.row as JobDetailOutput).jobDetail?.properties).httpMethod) }}
</el-descriptions-item>
<el-descriptions-item label="请求报文体" label-align="right" label-class-name="job-index-descriptions-label-style">
{{ getHttpJobMessage((scope.row as JobDetailOutput).jobDetail?.properties).body }}
</el-descriptions-item>
</el-descriptions>
</el-popover>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="270" fixed="right" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tooltip content="执行记录">
<el-button size="small" type="primary" icon="ele-Timer" text @click="openJobTriggerRecord(scope.row)"> </el-button>
</el-tooltip>
<el-tooltip content="增加触发器">
<el-button size="small" type="primary" icon="ele-CirclePlus" text @click="openAddJobTrigger(scope.row)"> </el-button>
</el-tooltip>
<el-tooltip content="执行作业">
<el-button size="small" type="primary" icon="ele-CircleCheck" text @click="runJob(scope.row)" />
</el-tooltip>
<el-tooltip content="启动作业">
<el-button size="small" type="primary" icon="ele-VideoPlay" text @click="startJob(scope.row)" />
</el-tooltip>
<el-tooltip content="暂停作业">
<el-button size="small" type="primary" icon="ele-VideoPause" text @click="pauseJob(scope.row)" />
</el-tooltip>
<el-tooltip content="取消作业">
<el-button size="small" type="primary" icon="ele-CircleClose" text @click="cancelJob(scope.row)" />
</el-tooltip>
<el-tooltip content="编辑作业">
<el-button size="small" type="primary" icon="ele-Edit" text @click="openEditJobDetail(scope.row)" v-auth="'sysJob:updateJobDetail'"> </el-button>
</el-tooltip>
<el-tooltip content="删除作业">
<el-button size="small" type="danger" icon="ele-Delete" text @click="delJobDetail(scope.row)" v-auth="'sysJob:deleteJobDetail'"> </el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination
v-model:currentPage="state.tableParams.page"
v-model:page-size="state.tableParams.pageSize"
:total="state.tableParams.total"
:page-sizes="[10, 20, 50, 100]"
small
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
layout="total, sizes, prev, pager, next, jumper"
/>
</el-card>
<el-drawer v-model="state.isVisibleDrawer" title="作业触发器运行记录" size="45%">
<el-card shadow="hover" style="margin: 8px; padding-bottom: 15px">
<el-table :data="state.triggerRecordData" style="width: 100%" v-loading="state.loading2" border>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="jobId" label="作业编号" min-width="120" header-align="center" show-overflow-tooltip />
<el-table-column prop="triggerId" label="触发器编号" min-width="120" header-align="center" show-overflow-tooltip />
<el-table-column prop="numberOfRuns" label="当前运行次数" min-width="100" align="center" show-overflow-tooltip />
<el-table-column prop="lastRunTime" label="最近运行时间" min-width="130" header-align="center" show-overflow-tooltip />
<el-table-column prop="nextRunTime" label="下一次运行时间" min-width="130" header-align="center" show-overflow-tooltip />
<el-table-column prop="status" label="触发器状态" align="center" show-overflow-tooltip>
<template #default="scope">
<el-tag type="warning" effect="plain" v-if="(scope.row as SysJobTrigger).status == 0"> 积压 </el-tag>
<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 1"> 就绪 </el-tag>
<el-tag type="success" effect="plain" v-if="(scope.row as SysJobTrigger).status == 2"> 正在运行 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 3"> 暂停 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 4"> 阻塞 </el-tag>
<el-tag type="" effect="plain" v-if="(scope.row as SysJobTrigger).status == 5"> 由失败进入就绪 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 6"> 归档 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 7"> 崩溃 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 8"> 超限 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 9"> 无触发时间 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 10"> 未启动 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 11"> 未知作业触发器 </el-tag>
<el-tag type="danger" effect="plain" v-if="(scope.row as SysJobTrigger).status == 12"> 未知作业处理程序 </el-tag>
</template>
</el-table-column>
<el-table-column prop="result" label="执行结果" header-align="center" show-overflow-tooltip />
<el-table-column prop="elapsedTime" label="耗时" min-width="80" align="center" show-overflow-tooltip />
<el-table-column prop="createdTime" label="创建时间" min-width="130" align="center" show-overflow-tooltip />
</el-table>
<el-pagination
v-model:currentPage="state.tableParams2.page"
v-model:page-size="state.tableParams2.pageSize"
:total="state.tableParams2.total"
:page-sizes="[10, 20, 50, 100]"
small
background
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"
layout="total, sizes, prev, pager, next, jumper"
/>
</vxe-grid>
</el-card>
</el-drawer>
@ -267,35 +260,45 @@
<script lang="ts" setup name="sysJob">
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { auth } from '/@/utils/authFunction';
import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
import { useRouter } from 'vue-router';
import { Timer } from '@element-plus/icons-vue';
import EditJobDetail from '/@/views/system/job/component/editJobDetail.vue';
import EditJobTrigger from '/@/views/system/job/component/editJobTrigger.vue';
import JobCluster from '/@/views/system/job/component/jobCluster.vue';
import { getAPI } from '/@/utils/axios-utils';
import { SysJobApi } from '/@/api-services/api';
import { JobCreateTypeEnum, JobDetailOutput, SysJobTrigger } from '/@/api-services/models';
import { JobCreateTypeEnum, JobDetailOutput, SysJobTrigger, SysJobTriggerRecord } from '/@/api-services/models';
const xGrid = ref<VxeGridInstance>();
const xRecordGrid = ref<VxeGridInstance>();
const router = useRouter();
const editJobDetailRef = ref<InstanceType<typeof EditJobDetail>>();
const editJobTriggerRef = ref<InstanceType<typeof EditJobTrigger>>();
const editJobClusterRef = ref<InstanceType<typeof JobCluster>>();
const state = reactive({
loading: false,
jobData: [] as Array<JobDetailOutput>,
queryParams: {
jobId: undefined,
description: undefined,
},
tableParams: {
page: 1,
pageSize: 20,
pageSize: 50,
field: 'id', //
order: 'aes', //
descStr: 'desc', //
total: 0 as any,
},
tableParams2: {
recordTableParams: {
page: 1,
pageSize: 20,
pageSize: 50,
field: 'id', //
order: 'desc', //
descStr: 'desc', //
total: 0 as any,
},
editJobDetailTitle: '',
@ -304,43 +307,91 @@ const state = reactive({
isVisibleDrawer: false,
triggerRecordData: [] as any,
currentJob: {} as any,
visible: false,
title: '',
});
//
const options = useVxeTable<JobDetailOutput>({
id: 'sysJob',
name: '作业信息',
columns: [
// { type: 'checkbox', width: 40 },
{ type: 'seq', title: '序号', width: 50, fixed: 'left' },
{ type: 'expand', width: 40, slots: { content: 'row_content' } },
{ field: 'jobDetail.jobId', title: '作业编号', minWidth: 180, showOverflow: 'tooltip', slots: { default: 'row_jobId' } },
{ field: 'jobDetail.groupName', title: '组名称', minWidth: 80, showOverflow: 'tooltip' },
{ field: 'jobDetail.jobType', title: '类型', minWidth: 180, showOverflow: 'tooltip' },
// { field: 'jobDetail.assemblyName', title: '', minWidth: 100, showOverflow: 'tooltip', sortable: true },
{ field: 'jobDetail.description', title: '描述', minWidth: 150, showOverflow: 'tooltip' },
{ field: 'jobDetail.concurrent', title: '执行方式', minWidth: 80, showOverflow: 'tooltip', slots: { default: 'row_concurrent' } },
{ field: 'jobDetail.createType', title: '作业创建类型', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_createType' } },
{ field: 'jobDetail.includeAnnotations', title: '扫描特性触发器', minWidth: 120, showOverflow: 'tooltip', slots: { default: 'row_includeAnnotations' } },
{ field: 'jobDetail.updatedTime', title: '更新时间', minWidth: 130, showOverflow: 'tooltip' },
{ field: 'jobDetail.properties', title: '额外数据', minWidth: 140, showOverflow: 'tooltip', slots: { default: 'row_properties' } },
{ title: '操作', minWidth: 200, showOverflow: true, slots: { default: 'row_buttons' } },
],
enableExport: auth('sysJob:export'),
searchCallback: () => handleQuery(),
queryAllCallback: () => fetchData({ pageSize: 99999 }),
});
//
onMounted(async () => {
handleQuery();
await handleQuery();
});
//
const handleQuery = async () => {
state.loading = true;
let params = Object.assign(state.queryParams, state.tableParams);
var res = await getAPI(SysJobApi).apiSysJobPageJobDetailPost(params);
state.jobData = res.data.result?.items ?? [];
const handleQuery = async (reset = false) => {
options.loading = true;
if (reset) state.tableParams.page = 1;
var res = await fetchData(null);
await xGrid.value?.loadData(res.data.result?.items ?? []);
state.tableParams.total = res.data.result?.total;
state.loading = false;
options.loading = false;
};
//
const fetchData = async (tableParams: any) => {
let params = Object.assign(state.queryParams, state.tableParams, tableParams);
return getAPI(SysJobApi).apiSysJobPageJobDetailPost(params);
};
//
const resetQuery = () => {
const resetQuery = async () => {
state.queryParams.jobId = undefined;
state.queryParams.description = undefined;
handleQuery();
await handleQuery(true);
};
//
const pageChange: VxePagerEvents.PageChange = async ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
state.tableParams.page = currentPage;
state.tableParams.pageSize = pageSize;
await handleQuery();
};
//
const sortChange = async (options: any) => {
state.tableParams.field = options.field;
state.tableParams.order = options.order;
await handleQuery();
};
//
const openAddJobDetail = () => {
const handleAdd = () => {
state.editJobDetailTitle = '添加作业';
editJobDetailRef.value?.openDialog({ concurrent: true, includeAnnotations: true, groupName: 'default', createType: JobCreateTypeEnum.NUMBER_2 });
};
//
const openEditJobDetail = (row: JobDetailOutput) => {
const handleEdit = (row: JobDetailOutput) => {
state.editJobDetailTitle = '编辑作业';
editJobDetailRef.value?.openDialog(row.jobDetail);
};
//
const delJobDetail = (row: JobDetailOutput) => {
const handleDelete = (row: JobDetailOutput) => {
ElMessageBox.confirm(`确定删除作业:【${row.jobDetail?.jobId}】?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -388,18 +439,6 @@ const delJobTrigger = (row: SysJobTrigger) => {
.catch(() => {});
};
//
const handleSizeChange = (val: number) => {
state.tableParams.pageSize = val;
handleQuery();
};
//
const handleCurrentChange = (val: number) => {
state.tableParams.page = val;
handleQuery();
};
//
const startAllJob = async () => {
await getAPI(SysJobApi).apiSysJobStartAllJobPost();
@ -475,10 +514,8 @@ const openJobDashboard = () => {
// HttpJobMessage
const getHttpJobMessage = (properties: string | undefined | null): HttpJobMessage => {
if (properties === undefined || properties === null || properties === '') return {};
const propData = JSON.parse(properties);
const httpJobMessageNet = JSON.parse(propData['HttpJob']); // HttpJobMessage
return {
requestUri: httpJobMessageNet.RequestUri,
httpMethod: JSON.stringify(httpJobMessageNet.HttpMethod),
@ -489,40 +526,78 @@ const getHttpJobMessage = (properties: string | undefined | null): HttpJobMessag
//
const getHttpMethodDesc = (httpMethodStr: string | undefined | null): string => {
if (httpMethodStr === undefined || httpMethodStr === null || httpMethodStr === '') return '';
for (const key in editJobDetailRef.value?.httpMethodDef) {
if (editJobDetailRef.value?.httpMethodDef[key] === httpMethodStr) return key;
}
return '';
};
//
const handleExpand = () => {
xGrid.value?.setAllRowExpand(true);
};
//
const handleFold = () => {
xGrid.value?.clearRowExpand();
};
//
const openJobTriggerRecord = (row: any) => {
const openJobTriggerRecord = async (row: any) => {
state.currentJob = row;
state.isVisibleDrawer = true;
handleQuery2();
await handleQueryRecord();
};
//
const handleQuery2 = async () => {
state.loading2 = true;
let params = Object.assign({ jobId: state.currentJob.jobDetail.jobId }, state.tableParams2); //state.currentJob.jobTriggers[0].triggerId
var res = await getAPI(SysJobApi).apiSysJobPageJobTriggerRecordPost(params);
state.triggerRecordData = res.data.result?.items ?? [];
state.tableParams2.total = res.data.result?.total;
state.loading2 = false;
// -
const recordOptions = useVxeTable<SysJobTriggerRecord>({
id: 'sysJobRecord',
name: '执行记录',
columns: [
// { type: 'checkbox', width: 40, fixed: 'left' },
{ type: 'seq', title: '序号', width: 50, fixed: 'left' },
{ field: 'jobId', title: '作业编号', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'triggerId', title: '触发器编号', minWidth: 200, showOverflow: 'tooltip' },
{ field: 'numberOfRuns', title: '当前运行次数', minWidth: 100, showOverflow: 'tooltip' },
{ field: 'lastRunTime', title: '最近运行时间', minWidth: 130, showOverflow: 'tooltip' },
{ field: 'nextRunTime', title: '下一次运行时间', minWidth: 130, showOverflow: 'tooltip' },
{ field: 'status', title: '触发器状态', minWidth: 110, showOverflow: 'tooltip', slots: { default: 'row_status' } },
{ field: 'result', title: '执行结果', minWidth: 200, showOverflow: 'title' },
{ field: 'elapsedTime', title: '耗时(ms)', minWidth: 80, showOverflow: 'tooltip' },
{ field: 'createdTime', title: '创建时间', minWidth: 130, showOverflow: 'tooltip' },
],
searchCallback: () => handleQueryRecord(),
queryAllCallback: () => fetchRecordData({ pageSize: 99999 }),
});
//
const handleQueryRecord = async (reset = false) => {
recordOptions.loading = true;
if (reset) state.recordTableParams.page = 1;
var res = await fetchRecordData(null);
await xRecordGrid.value?.loadData(res.data.result?.items ?? []);
state.recordTableParams.total = res.data.result?.total;
recordOptions.loading = false;
};
// -
const handleSizeChange2 = (val: number) => {
state.tableParams2.pageSize = val;
handleQuery2();
//
const fetchRecordData = async (tableParams: any) => {
let params = Object.assign({ jobId: state.currentJob.jobDetail.jobId }, state.recordTableParams, tableParams);
return getAPI(SysJobApi).apiSysJobPageJobTriggerRecordPost(params);
};
// -
const handleCurrentChange2 = (val: number) => {
state.tableParams2.page = val;
handleQuery2();
//
const recordPageChange: VxePagerEvents.PageChange = async ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
state.recordTableParams.page = currentPage;
state.recordTableParams.pageSize = pageSize;
await handleQueryRecord();
};
//
const recordSortChange = async (options: any) => {
state.recordTableParams.field = options.field;
state.recordTableParams.order = options.order;
await handleQueryRecord();
};
</script>
@ -532,3 +607,21 @@ const handleCurrentChange2 = (val: number) => {
width: 80px;
}
</style>
<style lang="scss" scoped>
:deep(.el-drawer__body) {
padding: 5px;
display: flex;
flex-direction: column;
height: 100%;
}
.full-table {
flex: 1;
:deep(.el-card__body) {
height: 100%;
display: flex;
flex-direction: column;
}
}
</style>