mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2026-02-08 18:54:25 +08:00
v3.12【新增】标签页Chome模式;【优化】优化很多细节
This commit is contained in:
zhuoda
@@ -100,7 +100,7 @@
|
||||
<a-tag v-show="!text" color="success">未删除</a-tag>
|
||||
</template>
|
||||
<template v-else-if="column.dataIndex === 'action'">
|
||||
<div class="smart-table-operate">
|
||||
<div class="smart-table-operate" v-if="!record.deletedFlag">
|
||||
<a-button type="link" @click="addOrUpdate(record.noticeId)" v-privilege="'oa:notice:update'">编辑</a-button>
|
||||
<a-button type="link" @click="onDelete(record.noticeId)" v-privilege="'oa:notice:delete'" danger>删除</a-button>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<!--
|
||||
* 代码生成 配置信息
|
||||
*
|
||||
* @Author: 1024创新实验室-主任：卓大
|
||||
* @Date: 2022-09-22 21:50:41
|
||||
* @Wechat: zhuda1024
|
||||
* @Email: lab1024@163.com
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
*
|
||||
* @Author: 1024创新实验室-主任：卓大
|
||||
* @Date: 2022-09-22 21:50:41
|
||||
* @Wechat: zhuda1024
|
||||
* @Email: lab1024@163.com
|
||||
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
|
||||
-->
|
||||
<template>
|
||||
<a-alert
|
||||
@@ -76,7 +76,7 @@
|
||||
<pre class="preview-block">
|
||||
<!--
|
||||
* {{ formData.description }}
|
||||
*
|
||||
*
|
||||
* @Author: {{ formData.frontAuthor }}
|
||||
* @Date: {{ formData.frontDate }}
|
||||
* @Copyright {{ formData.copyright }}
|
||||
@@ -182,7 +182,7 @@
|
||||
//命名
|
||||
let removePrefixTableName = tableInfo.tableName;
|
||||
if (_.startsWith(tableInfo.tableName, tablePrefix.value)) {
|
||||
removePrefixTableName = _.trim(removePrefixTableName, tablePrefix.value);
|
||||
removePrefixTableName = _.trimStart(removePrefixTableName, tablePrefix.value);
|
||||
}
|
||||
formData.moduleName = basic && basic.moduleName ? basic.moduleName : removePrefixTableName;
|
||||
formData.moduleName = convertUpperCamel(formData.moduleName);
|
||||
|
||||
@@ -0,0 +1,283 @@
|
||||
<!--
|
||||
* 已删除的 JOB 列表
|
||||
* @Author: zhuoda
|
||||
* @Date: 2025/01/05
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<a-form class="smart-query-form">
|
||||
<a-row class="smart-query-form-row">
|
||||
<a-form-item label="关键字" class="smart-query-form-item">
|
||||
<a-input style="width: 200px" v-model:value="queryForm.searchWord" placeholder="请输入关键字" :maxlength="30" />
|
||||
</a-form-item>
|
||||
<a-form-item label="触发类型" class="smart-query-form-item">
|
||||
<a-select style="width: 155px" v-model:value="queryForm.triggerType" placeholder="请选择触发类型" allowClear>
|
||||
<a-select-option v-for="item in $smartEnumPlugin.getValueDescList('TRIGGER_TYPE_ENUM')" :key="item.value" :value="item.value">
|
||||
{{ item.desc }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="状态" class="smart-query-form-item">
|
||||
<a-select style="width: 150px" v-model:value="queryForm.enabledFlag" placeholder="请选择状态" allowClear>
|
||||
<a-select-option :key="1"> 开启 </a-select-option>
|
||||
<a-select-option :key="0"> 停止 </a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item class="smart-query-form-item smart-margin-left10">
|
||||
<a-button-group>
|
||||
<a-button type="primary" @click="onSearch" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<ReloadOutlined />
|
||||
</template>
|
||||
查询
|
||||
</a-button>
|
||||
<a-button @click="resetQuery" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<SearchOutlined />
|
||||
</template>
|
||||
重置
|
||||
</a-button>
|
||||
</a-button-group>
|
||||
</a-form-item>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
||||
<a-flex align="end" vertical>
|
||||
<div class="smart-table-setting-block smart-margin-bottom10">
|
||||
<TableOperator
|
||||
class="smart-margin-bottom5 pull-right"
|
||||
v-model="columns"
|
||||
:tableId="TABLE_ID_CONST.SUPPORT.JOB"
|
||||
:refresh="queryJobList"
|
||||
/>
|
||||
</div>
|
||||
</a-flex>
|
||||
|
||||
<a-table
|
||||
:scroll="{ x: 1800 }"
|
||||
size="small"
|
||||
:loading="tableLoading"
|
||||
bordered
|
||||
:dataSource="tableData"
|
||||
:columns="columns"
|
||||
rowKey="jobId"
|
||||
:pagination="false"
|
||||
>
|
||||
<template #bodyCell="{ record, column }">
|
||||
<template v-if="column.dataIndex === 'jobClass'">
|
||||
<a-tooltip>
|
||||
<template #title>{{ record.jobClass }}</template>
|
||||
{{ handleJobClass(record.jobClass) }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'triggerType'">
|
||||
<a-tag v-if="record.triggerType === TRIGGER_TYPE_ENUM.CRON.value" color="success">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else-if="record.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value" color="processing">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else color="pink">{{ record.triggerTypeDesc }}</a-tag>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'lastJob'">
|
||||
<div v-if="record.lastJobLog">
|
||||
<a-tooltip>
|
||||
<template #title>{{ handleExecuteResult(record.lastJobLog.executeResult) }}</template>
|
||||
<CheckOutlined v-if="record.lastJobLog.successFlag" style="color: #39c710" />
|
||||
<WarningOutlined v-else style="color: #f50" />
|
||||
{{ record.lastJobLog.executeStartTime }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'nextJob'">
|
||||
<a-tooltip v-if="record.enabledFlag && record.nextJobExecuteTimeList">
|
||||
<template #title>
|
||||
<div>下次执行(预估时间)</div>
|
||||
<div v-for="item in record.nextJobExecuteTimeList" :key="item">{{ item }}</div>
|
||||
</template>
|
||||
{{ record.nextJobExecuteTimeList[0] }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'enabledFlag'">
|
||||
<a-switch checked-children="已启用" un-checked-children="已禁用" v-model:checked="record.enabledFlag" disabled :loading="record.enabledLoading" />
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'action'">
|
||||
<div class="smart-table-operate">
|
||||
<a-button v-privilege="'support:job:log:query'" @click="openJobLogModal(record.jobId, record.jobName)" type="link">记录</a-button>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
</a-table>
|
||||
|
||||
<div class="smart-query-table-page">
|
||||
<a-pagination
|
||||
showSizeChanger
|
||||
showQuickJumper
|
||||
show-less-items
|
||||
:pageSizeOptions="PAGE_SIZE_OPTIONS"
|
||||
:defaultPageSize="queryForm.pageSize"
|
||||
v-model:current="queryForm.pageNum"
|
||||
v-model:pageSize="queryForm.pageSize"
|
||||
:total="total"
|
||||
@change="queryJobList"
|
||||
@showSizeChange="queryJobList"
|
||||
:show-total="(total) => `共${total}条`"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 记录 -->
|
||||
<JobLogListModal ref="jobLogModal" />
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { onMounted, reactive, ref } from 'vue';
|
||||
import { jobApi } from '/@/api/support/job-api';
|
||||
import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
|
||||
import { smartSentry } from '/@/lib/smart-sentry';
|
||||
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
|
||||
import JobLogListModal from './job-log-list-modal.vue';
|
||||
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const.js";
|
||||
import TableOperator from "/@/components/support/table-operator/index.vue";
|
||||
|
||||
const columns = ref([
|
||||
{
|
||||
title: 'id',
|
||||
width: 50,
|
||||
dataIndex: 'jobId',
|
||||
},
|
||||
{
|
||||
title: '任务名称',
|
||||
dataIndex: 'jobName',
|
||||
minWidth: 150,
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '执行类',
|
||||
dataIndex: 'jobClass',
|
||||
minWidth: 180,
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '触发类型',
|
||||
dataIndex: 'triggerType',
|
||||
width: 110,
|
||||
},
|
||||
{
|
||||
title: '触发配置',
|
||||
dataIndex: 'triggerValue',
|
||||
width: 150,
|
||||
},
|
||||
{
|
||||
title: '上次执行',
|
||||
width: 180,
|
||||
dataIndex: 'lastJob',
|
||||
},
|
||||
{
|
||||
title: '下次执行',
|
||||
width: 150,
|
||||
dataIndex: 'nextJob',
|
||||
},
|
||||
{
|
||||
title: '启用状态',
|
||||
dataIndex: 'enabledFlag',
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '执行参数',
|
||||
dataIndex: 'param',
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '任务描述',
|
||||
dataIndex: 'remark',
|
||||
ellipsis: true,
|
||||
},
|
||||
{
|
||||
title: '排序',
|
||||
dataIndex: 'sort',
|
||||
width: 65,
|
||||
},
|
||||
{
|
||||
title: '更新人',
|
||||
dataIndex: 'updateName',
|
||||
width: 90,
|
||||
},
|
||||
{
|
||||
title: '更新时间',
|
||||
dataIndex: 'updateTime',
|
||||
width: 150,
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
fixed: 'right',
|
||||
width: 70,
|
||||
},
|
||||
]);
|
||||
|
||||
// ---------------- 查询数据 -----------------------
|
||||
|
||||
const queryFormState = {
|
||||
searchWord: '',
|
||||
enabledFlag: null,
|
||||
triggerType: null,
|
||||
deletedFlag: true,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
};
|
||||
const queryForm = reactive({ ...queryFormState });
|
||||
|
||||
const tableLoading = ref(false);
|
||||
const tableData = ref([]);
|
||||
const total = ref(0);
|
||||
|
||||
function resetQuery() {
|
||||
Object.assign(queryForm, queryFormState);
|
||||
queryJobList();
|
||||
}
|
||||
|
||||
function onSearch() {
|
||||
queryForm.pageNum = 1;
|
||||
queryJobList();
|
||||
}
|
||||
|
||||
// 处理执行类展示 默认返回类
|
||||
function handleJobClass(jobClass) {
|
||||
return jobClass.split('.').pop();
|
||||
}
|
||||
|
||||
// 上次处理结果展示
|
||||
function handleExecuteResult(result) {
|
||||
let num = 400;
|
||||
return result ? result.substring(0, num) + (result.length > num ? ' ...' : '') : '';
|
||||
}
|
||||
|
||||
async function queryJobList() {
|
||||
try {
|
||||
tableLoading.value = true;
|
||||
let responseModel = await jobApi.queryJob(queryForm);
|
||||
const list = responseModel.data.list;
|
||||
total.value = responseModel.data.total;
|
||||
tableData.value = list;
|
||||
} catch (e) {
|
||||
smartSentry.captureError(e);
|
||||
} finally {
|
||||
tableLoading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(queryJobList);
|
||||
|
||||
// 查询任务详情
|
||||
async function queryJobInfo(jobId) {
|
||||
try {
|
||||
let res = await jobApi.queryJobInfo(jobId);
|
||||
return res.data;
|
||||
} catch (e) {
|
||||
smartSentry.captureError(e);
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------ 执行记录 -------------------------------------
|
||||
const jobLogModal = ref();
|
||||
function openJobLogModal(jobId, name) {
|
||||
jobLogModal.value.show(jobId, name);
|
||||
}
|
||||
</script>
|
||||
@@ -6,47 +6,47 @@
|
||||
<template>
|
||||
<div>
|
||||
<!-- 编辑 -->
|
||||
<a-modal :open="updateModalShow" :width="650" title="编辑" ok-text="确认" cancel-text="取消" @cancel="closeUpdateModal" @ok="confirmUpdateJob">
|
||||
<a-modal :open="updateModalShow" :width="650" :title="isAdd ? '添加':'编辑'" ok-text="确认" cancel-text="取消" @cancel="closeUpdateModal" @ok="confirmUpdateJob">
|
||||
<a-form ref="updateFormRef" :model="updateForm" :rules="updateRules" :label-col="{ span: 4 }">
|
||||
<a-form-item label="任务名称" name="jobName">
|
||||
<a-input placeholder="请输入任务名称" v-model:value="updateForm.jobName" :maxlength="100" :showCount="true" />
|
||||
</a-form-item>
|
||||
<a-form-item label="任务描述" name="remark">
|
||||
<a-textarea
|
||||
:auto-size="{ minRows: 2, maxRows: 4 }"
|
||||
v-model:value="updateForm.remark"
|
||||
placeholder="(可选)请输入任务备注描述"
|
||||
:maxlength="250"
|
||||
:showCount="true"
|
||||
:auto-size="{ minRows: 2, maxRows: 4 }"
|
||||
v-model:value="updateForm.remark"
|
||||
placeholder="(可选)请输入任务备注描述"
|
||||
:maxlength="250"
|
||||
:showCount="true"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="排序" name="sort">
|
||||
<a-input-number
|
||||
v-model:value="updateForm.sort"
|
||||
:min="-99999999"
|
||||
:max="99999999"
|
||||
:precision="0"
|
||||
style="width: 100%"
|
||||
placeholder="值越小越靠前"
|
||||
v-model:value="updateForm.sort"
|
||||
:min="-99999999"
|
||||
:max="99999999"
|
||||
:precision="0"
|
||||
style="width: 100%"
|
||||
placeholder="值越小越靠前"
|
||||
>
|
||||
</a-input-number>
|
||||
</a-form-item>
|
||||
<a-form-item label="执行类" name="jobClass">
|
||||
<a-textarea
|
||||
:auto-size="{ minRows: 2, maxRows: 4 }"
|
||||
v-model:value="updateForm.jobClass"
|
||||
placeholder="示例：net.lab1024.sa.base.module.support.job.sample.SmartJobSample1"
|
||||
:maxlength="200"
|
||||
:showCount="true"
|
||||
:auto-size="{ minRows: 2, maxRows: 4 }"
|
||||
v-model:value="updateForm.jobClass"
|
||||
placeholder="示例：net.lab1024.sa.base.module.support.job.sample.SmartJobSample1"
|
||||
:maxlength="200"
|
||||
:showCount="true"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="任务参数" name="param">
|
||||
<a-textarea
|
||||
:auto-size="{ minRows: 3, maxRows: 6 }"
|
||||
v-model:value="updateForm.param"
|
||||
placeholder="(可选)请输入任务执行参数"
|
||||
:maxlength="1000"
|
||||
:showCount="true"
|
||||
:auto-size="{ minRows: 3, maxRows: 6 }"
|
||||
v-model:value="updateForm.param"
|
||||
placeholder="(可选)请输入任务执行参数"
|
||||
:maxlength="1000"
|
||||
:showCount="true"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="触发类型" name="triggerType">
|
||||
@@ -57,19 +57,18 @@
|
||||
</a-form-item>
|
||||
<a-form-item label="触发时间" name="triggerTime">
|
||||
<a-input
|
||||
v-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.CRON.value"
|
||||
placeholder="示例：10 15 0/1 * * *"
|
||||
v-model:value="updateForm.cron"
|
||||
:maxlength="100"
|
||||
:showCount="true"
|
||||
v-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.CRON.value"
|
||||
placeholder="示例：10 15 0/1 * * *"
|
||||
v-model:value="updateForm.cron"
|
||||
:maxlength="100"
|
||||
:showCount="true"
|
||||
/>
|
||||
<a-input-number
|
||||
v-else-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value"
|
||||
v-model:value="updateForm.fixedDelay"
|
||||
:min="1"
|
||||
:max="100000000"
|
||||
:precision="0"
|
||||
:defaultValue="100"
|
||||
v-else-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value"
|
||||
v-model:value="updateForm.fixedDelay"
|
||||
:min="1"
|
||||
:max="100000000"
|
||||
:precision="0"
|
||||
>
|
||||
<template #addonBefore>每隔</template>
|
||||
<template #addonAfter>秒</template>
|
||||
@@ -83,13 +82,13 @@
|
||||
|
||||
<!-- 立即执行 -->
|
||||
<a-modal
|
||||
:open="executeModalShow"
|
||||
:width="650"
|
||||
title="执行任务"
|
||||
ok-text="执行"
|
||||
cancel-text="取消"
|
||||
@cancel="closeExecuteModal"
|
||||
@ok="confirmExecuteJob"
|
||||
:open="executeModalShow"
|
||||
:width="650"
|
||||
title="执行任务"
|
||||
ok-text="执行"
|
||||
cancel-text="取消"
|
||||
@cancel="closeExecuteModal"
|
||||
@ok="confirmExecuteJob"
|
||||
>
|
||||
<br />
|
||||
<a-alert type="info" show-icon style="margin-left: 25px">
|
||||
@@ -105,11 +104,11 @@
|
||||
</a-form-item>
|
||||
<a-form-item label="任务参数" name="param">
|
||||
<a-textarea
|
||||
:auto-size="{ minRows: 3, maxRows: 6 }"
|
||||
v-model:value="executeForm.param"
|
||||
placeholder="(可选)请输入任务执行参数"
|
||||
:maxlength="1000"
|
||||
:showCount="true"
|
||||
:auto-size="{ minRows: 3, maxRows: 6 }"
|
||||
v-model:value="executeForm.param"
|
||||
placeholder="(可选)请输入任务执行参数"
|
||||
:maxlength="1000"
|
||||
:showCount="true"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
@@ -117,42 +116,46 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { message } from 'ant-design-vue';
|
||||
import { reactive, ref } from 'vue';
|
||||
import { jobApi } from '/@/api/support/job-api';
|
||||
import { smartSentry } from '/@/lib/smart-sentry';
|
||||
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
|
||||
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
|
||||
import { message } from 'ant-design-vue';
|
||||
import { reactive, ref } from 'vue';
|
||||
import { jobApi } from '/@/api/support/job-api';
|
||||
import { smartSentry } from '/@/lib/smart-sentry';
|
||||
import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
|
||||
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
|
||||
|
||||
// emit
|
||||
const emit = defineEmits(['reloadList']);
|
||||
// emit
|
||||
const emit = defineEmits(['reloadList']);
|
||||
|
||||
const updateModalShow = ref(false);
|
||||
const updateFormRef = ref();
|
||||
const isAdd = ref(false);
|
||||
const updateModalShow = ref(false);
|
||||
const updateFormRef = ref();
|
||||
|
||||
const updateFormDefault = {
|
||||
jobId: null,
|
||||
jobName: '',
|
||||
jobClass: '',
|
||||
triggerType: null,
|
||||
triggerValue: null,
|
||||
cron: '',
|
||||
fixedDelay: null,
|
||||
param: '',
|
||||
enabledFlag: false,
|
||||
remark: '',
|
||||
sort: null,
|
||||
};
|
||||
let updateForm = reactive({ ...updateFormDefault });
|
||||
const updateRules = {
|
||||
jobName: [{ required: true, message: '请输入任务名称' }],
|
||||
jobClass: [{ required: true, message: '请输入执行类' }],
|
||||
triggerType: [{ required: true, message: '请选择触发类型' }],
|
||||
sort: [{ required: true, message: '请输入排序' }],
|
||||
};
|
||||
const updateFormDefault = {
|
||||
jobId: null,
|
||||
jobName: '',
|
||||
jobClass: '',
|
||||
triggerType: TRIGGER_TYPE_ENUM.CRON.value,
|
||||
triggerValue: null,
|
||||
cron: '',
|
||||
fixedDelay: null,
|
||||
param: '',
|
||||
enabledFlag: false,
|
||||
remark: '',
|
||||
sort: null,
|
||||
};
|
||||
let updateForm = reactive({ ...updateFormDefault });
|
||||
const updateRules = {
|
||||
jobName: [{ required: true, message: '请输入任务名称' }],
|
||||
jobClass: [{ required: true, message: '请输入执行类' }],
|
||||
triggerType: [{ required: true, message: '请选择触发类型' }],
|
||||
sort: [{ required: true, message: '请输入排序' }],
|
||||
};
|
||||
|
||||
// 打开编辑弹框
|
||||
function openUpdateModal(record) {
|
||||
// 打开编辑弹框
|
||||
function openUpdateModal(record) {
|
||||
isAdd.value = null == record;
|
||||
// 更新
|
||||
if(!isAdd.value){
|
||||
Object.assign(updateForm, record);
|
||||
if (TRIGGER_TYPE_ENUM.CRON.value === record.triggerType) {
|
||||
updateForm.cron = record.triggerValue;
|
||||
@@ -160,30 +163,43 @@
|
||||
if (TRIGGER_TYPE_ENUM.FIXED_DELAY.value === record.triggerType) {
|
||||
updateForm.fixedDelay = record.triggerValue;
|
||||
}
|
||||
updateModalShow.value = true;
|
||||
}
|
||||
updateModalShow.value = true;
|
||||
}
|
||||
|
||||
// 关闭编辑弹框
|
||||
function closeUpdateModal() {
|
||||
Object.assign(updateForm, updateFormDefault);
|
||||
updateModalShow.value = false;
|
||||
}
|
||||
// 关闭编辑弹框
|
||||
function closeUpdateModal() {
|
||||
Object.assign(updateForm, updateFormDefault);
|
||||
updateModalShow.value = false;
|
||||
}
|
||||
|
||||
// 确认更新
|
||||
async function confirmUpdateJob() {
|
||||
updateFormRef.value
|
||||
// 确认更新
|
||||
async function confirmUpdateJob() {
|
||||
updateFormRef.value
|
||||
.validate()
|
||||
.then(async () => {
|
||||
SmartLoading.show();
|
||||
|
||||
if (TRIGGER_TYPE_ENUM.CRON.value === updateForm.triggerType) {
|
||||
updateForm.triggerValue = updateForm.cron;
|
||||
}
|
||||
if (TRIGGER_TYPE_ENUM.FIXED_DELAY.value === updateForm.triggerType) {
|
||||
updateForm.triggerValue = updateForm.fixedDelay;
|
||||
}
|
||||
|
||||
if(!updateForm.triggerValue){
|
||||
message.error('请填写 触发时间');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await jobApi.updateJob(updateForm);
|
||||
message.success('更新成功');
|
||||
SmartLoading.show();
|
||||
if(isAdd.value){
|
||||
await jobApi.addJob(updateForm)
|
||||
message.success('添加成功');
|
||||
}else {
|
||||
await jobApi.updateJob(updateForm);
|
||||
message.success('更新成功');
|
||||
}
|
||||
closeUpdateModal();
|
||||
emit('reloadList');
|
||||
} catch (error) {
|
||||
@@ -196,53 +212,53 @@
|
||||
console.log('error', error);
|
||||
message.error('参数验证错误，请检查表单数据');
|
||||
});
|
||||
}
|
||||
|
||||
// ------------------------------------ 执行任务 -------------------------------------
|
||||
const executeModalShow = ref(false);
|
||||
const executeFormDefault = {
|
||||
jobId: null,
|
||||
jobName: '',
|
||||
jobClass: '',
|
||||
param: null,
|
||||
};
|
||||
let executeForm = reactive({ ...executeFormDefault });
|
||||
|
||||
// 打开执行弹框
|
||||
function openExecuteModal(record) {
|
||||
Object.assign(executeForm, record);
|
||||
executeModalShow.value = true;
|
||||
}
|
||||
|
||||
// 关闭执行弹框
|
||||
function closeExecuteModal() {
|
||||
Object.assign(executeForm, executeFormDefault);
|
||||
executeModalShow.value = false;
|
||||
}
|
||||
|
||||
// 确认执行
|
||||
async function confirmExecuteJob() {
|
||||
try {
|
||||
let executeParam = {
|
||||
jobId: executeForm.jobId,
|
||||
param: executeForm.param,
|
||||
};
|
||||
await jobApi.executeJob(executeParam);
|
||||
// loading 延迟后再提示刷新
|
||||
SmartLoading.show();
|
||||
await new Promise((resolve) => setTimeout(resolve, 2000));
|
||||
message.success('执行成功');
|
||||
closeExecuteModal();
|
||||
emit('reloadList');
|
||||
} catch (e) {
|
||||
smartSentry.captureError(e);
|
||||
} finally {
|
||||
SmartLoading.hide();
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------ 执行任务 -------------------------------------
|
||||
const executeModalShow = ref(false);
|
||||
const executeFormDefault = {
|
||||
jobId: null,
|
||||
jobName: '',
|
||||
jobClass: '',
|
||||
param: null,
|
||||
};
|
||||
let executeForm = reactive({ ...executeFormDefault });
|
||||
|
||||
// 打开执行弹框
|
||||
function openExecuteModal(record) {
|
||||
Object.assign(executeForm, record);
|
||||
executeModalShow.value = true;
|
||||
}
|
||||
|
||||
// 关闭执行弹框
|
||||
function closeExecuteModal() {
|
||||
Object.assign(executeForm, executeFormDefault);
|
||||
executeModalShow.value = false;
|
||||
}
|
||||
|
||||
// 确认执行
|
||||
async function confirmExecuteJob() {
|
||||
try {
|
||||
let executeParam = {
|
||||
jobId: executeForm.jobId,
|
||||
param: executeForm.param,
|
||||
};
|
||||
await jobApi.executeJob(executeParam);
|
||||
// loading 延迟后再提示刷新
|
||||
SmartLoading.show();
|
||||
await new Promise((resolve) => setTimeout(resolve, 2000));
|
||||
message.success('执行成功');
|
||||
closeExecuteModal();
|
||||
emit('reloadList');
|
||||
} catch (e) {
|
||||
smartSentry.captureError(e);
|
||||
} finally {
|
||||
SmartLoading.hide();
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
openUpdateModal,
|
||||
openExecuteModal,
|
||||
});
|
||||
defineExpose({
|
||||
openUpdateModal,
|
||||
openExecuteModal,
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -5,122 +5,143 @@
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<a-form class="smart-query-form">
|
||||
<a-row class="smart-query-form-row">
|
||||
<a-form-item label="关键字" class="smart-query-form-item">
|
||||
<a-input style="width: 200px" v-model:value="queryForm.searchWord" placeholder="请输入关键字" :maxlength="30" />
|
||||
</a-form-item>
|
||||
<a-form-item label="触发类型" class="smart-query-form-item">
|
||||
<a-select style="width: 155px" v-model:value="queryForm.triggerType" placeholder="请选择触发类型" allowClear>
|
||||
<a-select-option v-for="item in $smartEnumPlugin.getValueDescList('TRIGGER_TYPE_ENUM')" :key="item.value" :value="item.value">
|
||||
{{ item.desc }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="状态" class="smart-query-form-item">
|
||||
<a-select style="width: 150px" v-model:value="queryForm.enabledFlag" placeholder="请选择状态" allowClear>
|
||||
<a-select-option :key="1"> 开启 </a-select-option>
|
||||
<a-select-option :key="0"> 停止 </a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
<a-form-item class="smart-query-form-item smart-margin-left10">
|
||||
<a-button-group>
|
||||
<a-button type="primary" @click="onSearch" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<ReloadOutlined />
|
||||
</template>
|
||||
查询
|
||||
</a-button>
|
||||
<a-button @click="resetQuery" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<SearchOutlined />
|
||||
</template>
|
||||
重置
|
||||
</a-button>
|
||||
</a-button-group>
|
||||
</a-form-item>
|
||||
</a-row>
|
||||
</a-form>
|
||||
|
||||
<a-card size="small" :bordered="false" :hoverable="true">
|
||||
<a-row justify="end">
|
||||
<TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.JOB" :refresh="queryJobList" />
|
||||
</a-row>
|
||||
<a-tabs v-model:activeKey="activeKey">
|
||||
<a-tab-pane key="1" tab="有效任务">
|
||||
<a-form class="smart-query-form">
|
||||
<a-row class="smart-query-form-row">
|
||||
<a-form-item label="关键字" class="smart-query-form-item">
|
||||
<a-input style="width: 200px" v-model:value="queryForm.searchWord" placeholder="请输入关键字" :maxlength="30" />
|
||||
</a-form-item>
|
||||
<a-form-item label="触发类型" class="smart-query-form-item">
|
||||
<a-select style="width: 155px" v-model:value="queryForm.triggerType" placeholder="请选择触发类型" allowClear>
|
||||
<a-select-option v-for="item in $smartEnumPlugin.getValueDescList('TRIGGER_TYPE_ENUM')" :key="item.value" :value="item.value">
|
||||
{{ item.desc }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
<a-form-item label="状态" class="smart-query-form-item">
|
||||
<a-select style="width: 150px" v-model:value="queryForm.enabledFlag" placeholder="请选择状态" allowClear>
|
||||
<a-select-option :key="1"> 开启 </a-select-option>
|
||||
<a-select-option :key="0"> 停止 </a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
|
||||
<a-table
|
||||
:scroll="{ x: 1800 }"
|
||||
size="small"
|
||||
:loading="tableLoading"
|
||||
bordered
|
||||
:dataSource="tableData"
|
||||
:columns="columns"
|
||||
rowKey="jobId"
|
||||
:pagination="false"
|
||||
>
|
||||
<template #bodyCell="{ record, column }">
|
||||
<template v-if="column.dataIndex === 'jobClass'">
|
||||
<a-tooltip>
|
||||
<template #title>{{ record.jobClass }}</template>
|
||||
{{ handleJobClass(record.jobClass) }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'triggerType'">
|
||||
<a-tag v-if="record.triggerType === TRIGGER_TYPE_ENUM.CRON.value" color="success">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else-if="record.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value" color="processing">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else color="pink">{{ record.triggerTypeDesc }}</a-tag>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'lastJob'">
|
||||
<div v-if="record.lastJobLog">
|
||||
<a-tooltip>
|
||||
<template #title>{{ handleExecuteResult(record.lastJobLog.executeResult) }}</template>
|
||||
<CheckOutlined v-if="record.lastJobLog.successFlag" style="color: #39c710" />
|
||||
<WarningOutlined v-else style="color: #f50" />
|
||||
{{ record.lastJobLog.executeStartTime }}
|
||||
</a-tooltip>
|
||||
<a-form-item class="smart-query-form-item smart-margin-left10">
|
||||
<a-button-group>
|
||||
<a-button type="primary" @click="onSearch" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<ReloadOutlined />
|
||||
</template>
|
||||
查询
|
||||
</a-button>
|
||||
<a-button @click="resetQuery" v-privilege="'support:job:query'">
|
||||
<template #icon>
|
||||
<SearchOutlined />
|
||||
</template>
|
||||
重置
|
||||
</a-button>
|
||||
</a-button-group>
|
||||
|
||||
<a-button class="smart-margin-left20" type="primary" @click="openUpdateModal()" v-privilege="'support:job:add'">
|
||||
<template #icon>
|
||||
<plus-outlined />
|
||||
</template>
|
||||
添加任务
|
||||
</a-button>
|
||||
</a-form-item>
|
||||
</a-row>
|
||||
</a-form>
|
||||
<a-flex align="end" vertical>
|
||||
<div class="smart-table-setting-block smart-margin-bottom10">
|
||||
<TableOperator
|
||||
class="smart-margin-bottom5 pull-right"
|
||||
v-model="columns"
|
||||
:tableId="TABLE_ID_CONST.SUPPORT.JOB"
|
||||
:refresh="queryJobList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'nextJob'">
|
||||
<a-tooltip v-if="record.enabledFlag && record.nextJobExecuteTimeList">
|
||||
<template #title>
|
||||
<div>下次执行(预估时间)</div>
|
||||
<div v-for="item in record.nextJobExecuteTimeList" :key="item">{{ item }}</div>
|
||||
</a-flex>
|
||||
|
||||
<a-table
|
||||
:scroll="{ x: 1800 }"
|
||||
size="small"
|
||||
:loading="tableLoading"
|
||||
bordered
|
||||
:dataSource="tableData"
|
||||
:columns="columns"
|
||||
rowKey="jobId"
|
||||
:pagination="false"
|
||||
>
|
||||
<template #bodyCell="{ record, column }">
|
||||
<template v-if="column.dataIndex === 'jobClass'">
|
||||
<a-tooltip>
|
||||
<template #title>{{ record.jobClass }}</template>
|
||||
{{ handleJobClass(record.jobClass) }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
{{ record.nextJobExecuteTimeList[0] }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'enabledFlag'">
|
||||
<a-switch
|
||||
v-model:checked="record.enabledFlag"
|
||||
@change="(checked) => handleEnabledUpdate(checked, record)"
|
||||
:loading="record.enabledLoading"
|
||||
<template v-if="column.dataIndex === 'triggerType'">
|
||||
<a-tag v-if="record.triggerType === TRIGGER_TYPE_ENUM.CRON.value" color="success">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else-if="record.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value" color="processing">{{ record.triggerTypeDesc }}</a-tag>
|
||||
<a-tag v-else color="pink">{{ record.triggerTypeDesc }}</a-tag>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'lastJob'">
|
||||
<div v-if="record.lastJobLog">
|
||||
<a-tooltip>
|
||||
<template #title>{{ handleExecuteResult(record.lastJobLog.executeResult) }}</template>
|
||||
<CheckOutlined v-if="record.lastJobLog.successFlag" style="color: #39c710" />
|
||||
<WarningOutlined v-else style="color: #f50" />
|
||||
{{ record.lastJobLog.executeStartTime }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'nextJob'">
|
||||
<a-tooltip v-if="record.enabledFlag && record.nextJobExecuteTimeList">
|
||||
<template #title>
|
||||
<div>下次执行(预估时间)</div>
|
||||
<div v-for="item in record.nextJobExecuteTimeList" :key="item">{{ item }}</div>
|
||||
</template>
|
||||
{{ record.nextJobExecuteTimeList[0] }}
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'enabledFlag'">
|
||||
<a-switch
|
||||
v-model:checked="record.enabledFlag"
|
||||
checked-children="已启用" un-checked-children="已禁用"
|
||||
@change="(checked) => handleEnabledUpdate(checked, record)"
|
||||
:loading="record.enabledLoading"
|
||||
/>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'action'">
|
||||
<div class="smart-table-operate">
|
||||
<a-button v-privilege="'support:job:update'" @click="openUpdateModal(record)" type="link">编辑</a-button>
|
||||
<a-button v-privilege="'support:job:execute'" type="link" @click="openExecuteModal(record)">执行</a-button>
|
||||
<a-button v-privilege="'support:job:log:query'" @click="openJobLogModal(record.jobId, record.jobName)" type="link">记录</a-button>
|
||||
<a-button danger v-privilege="'support:job:log:delete'" @click="confirmDelete(record.jobId, record.jobName)" type="link">删除</a-button>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
</a-table>
|
||||
<div class="smart-query-table-page">
|
||||
<a-pagination
|
||||
showSizeChanger
|
||||
showQuickJumper
|
||||
show-less-items
|
||||
:pageSizeOptions="PAGE_SIZE_OPTIONS"
|
||||
:defaultPageSize="queryForm.pageSize"
|
||||
v-model:current="queryForm.pageNum"
|
||||
v-model:pageSize="queryForm.pageSize"
|
||||
:total="total"
|
||||
@change="queryJobList"
|
||||
@showSizeChange="queryJobList"
|
||||
:show-total="(total) => `共${total}条`"
|
||||
/>
|
||||
</template>
|
||||
<template v-if="column.dataIndex === 'action'">
|
||||
<div class="smart-table-operate">
|
||||
<a-button v-privilege="'support:job:update'" @click="openUpdateModal(record)" type="link">编辑</a-button>
|
||||
<a-button v-privilege="'support:job:execute'" type="link" @click="openExecuteModal(record)">执行</a-button>
|
||||
<a-button v-privilege="'support:job:log:query'" @click="openJobLogModal(record.jobId, record.jobName)" type="link">记录</a-button>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
</a-table>
|
||||
</div>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="2" tab="已删除任务"><DeletedJobList /></a-tab-pane>
|
||||
</a-tabs>
|
||||
|
||||
|
||||
<div class="smart-query-table-page">
|
||||
<a-pagination
|
||||
showSizeChanger
|
||||
showQuickJumper
|
||||
show-less-items
|
||||
:pageSizeOptions="PAGE_SIZE_OPTIONS"
|
||||
:defaultPageSize="queryForm.pageSize"
|
||||
v-model:current="queryForm.pageNum"
|
||||
v-model:pageSize="queryForm.pageSize"
|
||||
:total="total"
|
||||
@change="queryJobList"
|
||||
@showSizeChange="queryJobList"
|
||||
:show-total="(total) => `共${total}条`"
|
||||
/>
|
||||
</div>
|
||||
</a-card>
|
||||
|
||||
<!-- 表单操作 -->
|
||||
@@ -131,17 +152,18 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { message } from 'ant-design-vue';
|
||||
import {message, Modal} from 'ant-design-vue';
|
||||
import { onMounted, reactive, ref } from 'vue';
|
||||
import { jobApi } from '/@/api/support/job-api';
|
||||
import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
|
||||
import { smartSentry } from '/@/lib/smart-sentry';
|
||||
import TableOperator from '/@/components/support/table-operator/index.vue';
|
||||
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
|
||||
import { useRouter } from 'vue-router';
|
||||
import DeletedJobList from './components/deleted-job-list.vue';
|
||||
import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
|
||||
import JobFormModal from './components/job-form-modal.vue';
|
||||
import JobLogListModal from './components/job-log-list-modal.vue';
|
||||
import {SmartLoading} from "/@/components/framework/smart-loading/index.js";
|
||||
|
||||
const columns = ref([
|
||||
{
|
||||
@@ -182,9 +204,9 @@
|
||||
dataIndex: 'nextJob',
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
title: '启用状态',
|
||||
dataIndex: 'enabledFlag',
|
||||
width: 80,
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: '执行参数',
|
||||
@@ -215,7 +237,7 @@
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
fixed: 'right',
|
||||
width: 130,
|
||||
width: 170,
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -225,6 +247,7 @@
|
||||
searchWord: '',
|
||||
enabledFlag: null,
|
||||
triggerType: null,
|
||||
deletedFlag: false,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
};
|
||||
@@ -249,7 +272,7 @@
|
||||
return jobClass.split('.').pop();
|
||||
}
|
||||
|
||||
// 上次处理结果展示 最多展示300
|
||||
// 上次处理结果展示
|
||||
function handleExecuteResult(result) {
|
||||
let num = 400;
|
||||
return result ? result.substring(0, num) + (result.length > num ? ' ...' : '') : '';
|
||||
@@ -308,6 +331,35 @@
|
||||
jobLogModal.value.show(jobId, name);
|
||||
}
|
||||
|
||||
// ------------------------------------ 删除操作 -------------------------------------
|
||||
|
||||
function confirmDelete(jobId, jobName){
|
||||
Modal.confirm({
|
||||
title: '警告',
|
||||
content: `确定要删除【${jobName}】任务吗?`,
|
||||
okText: '删除',
|
||||
okType: 'danger',
|
||||
onOk() {
|
||||
deleteJob(jobId);
|
||||
},
|
||||
cancelText: '取消',
|
||||
onCancel() {},
|
||||
});
|
||||
}
|
||||
|
||||
async function deleteJob(jobId){
|
||||
try{
|
||||
SmartLoading.show();
|
||||
await jobApi.deleteJob(jobId);
|
||||
message.success('删除成功!');
|
||||
queryJobList();
|
||||
}catch (e){
|
||||
smartSentry.captureError(e);
|
||||
}finally {
|
||||
SmartLoading.hide();
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------ 表单操作 -------------------------------------
|
||||
const jobFormModal = ref();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user