bonus
/
ys_sms_sending_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
BianLzhaoMin 2026-01-27 15:51:33 +08:00
parent 5a7d1bc77c
commit 950d150680
4 changed files with 516 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/monitor/job.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询定时任务调度列表 // 查询定时任务调度列表
export function listJob(query) { export function listJob(query) {
return request({ return request({
url: '/monitor/job/list', url: '/job/list',
method: 'get', method: 'get',
params: query params: query
}) })
@ -12,7 +12,7 @@ export function listJob(query) {
// 查询定时任务调度详细 // 查询定时任务调度详细
export function getJob(jobId) { export function getJob(jobId) {
return request({ return request({
url: '/monitor/job/' + jobId, url: '/job/' + jobId,
method: 'get' method: 'get'
}) })
} }
@ -20,7 +20,7 @@ export function getJob(jobId) {
// 新增定时任务调度 // 新增定时任务调度
export function addJob(data) { export function addJob(data) {
return request({ return request({
url: '/monitor/job', url: '/job',
method: 'post', method: 'post',
data: data data: data
}) })
@ -29,7 +29,7 @@ export function addJob(data) {
// 修改定时任务调度 // 修改定时任务调度
export function updateJob(data) { export function updateJob(data) {
return request({ return request({
url: '/monitor/job', url: '/job',
method: 'put', method: 'put',
data: data data: data
}) })
@ -38,7 +38,7 @@ export function updateJob(data) {
// 删除定时任务调度 // 删除定时任务调度
export function delJob(jobId) { export function delJob(jobId) {
return request({ return request({
url: '/monitor/job/' + jobId, url: '/job/' + jobId,
method: 'delete' method: 'delete'
}) })
} }
@ -50,7 +50,7 @@ export function changeJobStatus(jobId, status) {
status status
} }
return request({ return request({
url: '/monitor/job/changeStatus', url: '/job/changeStatus',
method: 'put', method: 'put',
data: data data: data
}) })
@ -64,7 +64,7 @@ export function runJob(jobId, jobGroup) {
jobGroup jobGroup
} }
return request({ return request({
url: '/monitor/job/run', url: '/job/run',
method: 'put', method: 'put',
data: data data: data
}) })

117
src/views/monitor/job/index.vue
View File

@ -181,7 +181,7 @@
v-hasPermi="['monitor:job:query']" v-hasPermi="['monitor:job:query']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="调度日志" placement="top"> <!-- <el-tooltip content="调度日志" placement="top">
<el-button <el-button
link link
type="primary" type="primary"
@ -189,7 +189,7 @@
@click="handleJobLog(scope.row)" @click="handleJobLog(scope.row)"
v-hasPermi="['monitor:job:query']" v-hasPermi="['monitor:job:query']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -203,8 +203,15 @@
/> />
<!-- 添加或修改定时任务对话框 --> <!-- 添加或修改定时任务对话框 -->
<el-dialog :title="title" v-model="open" width="820px" append-to-body> <ComDialog :dialog-config="jobDialogConfig" @closeDialogOuter="onCloseJobDialogOuter">
<el-form ref="jobRef" :model="form" :rules="rules" label-width="120px"> <template #outerContent>
<el-form
ref="jobRef"
:model="form"
:rules="rules"
label-width="120px"
size="medium"
>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务名称" prop="jobName"> <el-form-item label="任务名称" prop="jobName">
@ -292,37 +299,44 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</template> </template>
</el-dialog> </ComDialog>
<el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close> <!-- Cron 表达式生成器 -->
<ComDialog :dialog-config="cronDialogConfig" @closeDialogOuter="onCloseCronDialogOuter">
<template #outerContent>
<crontab <crontab
ref="crontabRef" ref="crontabRef"
@hide="openCron = false" @hide="onHideCronDialog"
@fill="crontabFill" @fill="crontabFill"
:expression="expression" :expression="expression"
></crontab> ></crontab>
</el-dialog> </template>
</ComDialog>
<!-- 任务日志详细 --> <!-- 任务日志详细 -->
<el-dialog title="任务详细" v-model="openView" width="700px" append-to-body> <ComDialog :dialog-config="viewDialogConfig" @closeDialogOuter="onCloseViewDialogOuter">
<el-form :model="form" label-width="120px"> <template #outerContent>
<el-form :model="form" label-width="120px" size="medium">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务编号：">{{ form.jobId }}</el-form-item> <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
<el-form-item label="任务名称：">{{ form.jobName }}</el-form-item> <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item> <el-form-item label="任务分组：">{{
jobGroupFormat(form)
}}</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>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item> <el-form-item label="cron表达式：">{{
form.cronExpression
}}</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="下次执行时间：">{{ <el-form-item label="下次执行时间：">{{
@ -330,7 +344,9 @@
}}</el-form-item> }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <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>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务状态："> <el-form-item label="任务状态：">
@ -354,17 +370,17 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="openView = false">关 闭</el-button> <el-button @click="viewDialogConfig.outerVisible = false">关 闭</el-button>
</div> </div>
</template> </template>
</el-dialog> </ComDialog>
</div> </div>
</template> </template>
<script setup name="Job"> <script setup name="Job">
import Crontab from '@/components/Crontab' import Crontab from '@/components/Crontab'
import ComDialog from '@/components/ComDialog/index.vue'
import { import {
listJob, listJob,
getJob, getJob,
@ -380,18 +396,39 @@ const { proxy } = getCurrentInstance()
const { sys_job_group, sys_job_status } = proxy.useDict('sys_job_group', 'sys_job_status') const { sys_job_group, sys_job_status } = proxy.useDict('sys_job_group', 'sys_job_status')
const jobList = ref([]) const jobList = ref([])
const open = ref(false)
const loading = ref(true) const loading = ref(true)
const showSearch = ref(true) const showSearch = ref(true)
const ids = ref([]) const ids = ref([])
const single = ref(true) const single = ref(true)
const multiple = ref(true) const multiple = ref(true)
const total = ref(0) const total = ref(0)
const title = ref('')
const openView = ref(false)
const openCron = ref(false)
const expression = ref('') const expression = ref('')
// 对话框配置
const jobDialogConfig = reactive({
outerVisible: false,
outerTitle: '添加任务',
outerWidth: '820px',
minHeight: '300px',
maxHeight: '80vh',
})
const cronDialogConfig = reactive({
outerVisible: false,
outerTitle: 'Cron表达式生成器',
outerWidth: '700px',
minHeight: '300px',
maxHeight: '80vh',
})
const viewDialogConfig = reactive({
outerVisible: false,
outerTitle: '任务详细',
outerWidth: '700px',
minHeight: '300px',
maxHeight: '80vh',
})
const data = reactive({ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
@ -427,7 +464,7 @@ function jobGroupFormat(row, column) {
/** 取消按钮 */ /** 取消按钮 */
function cancel() { function cancel() {
open.value = false jobDialogConfig.outerVisible = false
reset() reset()
} }
@ -515,14 +552,14 @@ function handleRun(row) {
function handleView(row) { function handleView(row) {
getJob(row.jobId).then((response) => { getJob(row.jobId).then((response) => {
form.value = response.data form.value = response.data
openView.value = true viewDialogConfig.outerVisible = true
}) })
} }
/** cron表达式按钮操作 */ /** cron表达式按钮操作 */
function handleShowCron() { function handleShowCron() {
expression.value = form.value.cronExpression expression.value = form.value.cronExpression
openCron.value = true cronDialogConfig.outerVisible = true
} }
/** 确定后回传值 */ /** 确定后回传值 */
@ -539,8 +576,8 @@ function handleJobLog(row) {
/** 新增按钮操作 */ /** 新增按钮操作 */
function handleAdd() { function handleAdd() {
reset() reset()
open.value = true jobDialogConfig.outerTitle = '添加任务'
title.value = '添加任务' jobDialogConfig.outerVisible = true
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -549,8 +586,8 @@ function handleUpdate(row) {
const jobId = row.jobId || ids.value const jobId = row.jobId || ids.value
getJob(jobId).then((response) => { getJob(jobId).then((response) => {
form.value = response.data form.value = response.data
open.value = true jobDialogConfig.outerTitle = '修改任务'
title.value = '修改任务' jobDialogConfig.outerVisible = true
}) })
} }
@ -561,13 +598,13 @@ function submitForm() {
if (form.value.jobId != undefined) { if (form.value.jobId != undefined) {
updateJob(form.value).then((response) => { updateJob(form.value).then((response) => {
proxy.$modal.msgSuccess('修改成功') proxy.$modal.msgSuccess('修改成功')
open.value = false jobDialogConfig.outerVisible = false
getList() getList()
}) })
} else { } else {
addJob(form.value).then((response) => { addJob(form.value).then((response) => {
proxy.$modal.msgSuccess('新增成功') proxy.$modal.msgSuccess('新增成功')
open.value = false jobDialogConfig.outerVisible = false
getList() getList()
}) })
} }
@ -602,4 +639,24 @@ function handleExport() {
} }
getList() getList()
// 对话框关闭统一处理
function onCloseJobDialogOuter(visible) {
jobDialogConfig.outerVisible = visible
if (!visible) {
reset()
}
}
function onCloseCronDialogOuter(visible) {
cronDialogConfig.outerVisible = visible
}
function onHideCronDialog() {
cronDialogConfig.outerVisible = false
}
function onCloseViewDialogOuter(visible) {
viewDialogConfig.outerVisible = visible
}
</script> </script>

119
src/views/monitor/job/log.vue
View File

@ -1,6 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="任务名称" prop="jobName"> <el-form-item label="任务名称" prop="jobName">
<el-input <el-input
v-model="queryParams.jobName" v-model="queryParams.jobName"
@ -65,7 +71,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -74,7 +81,8 @@
icon="Delete" icon="Delete"
@click="handleClean" @click="handleClean"
v-hasPermi="['monitor:job:remove']" v-hasPermi="['monitor:job:remove']"
>清空</el-button> >清空</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -83,15 +91,11 @@
icon="Download" icon="Download"
@click="handleExport" @click="handleExport"
v-hasPermi="['monitor:job:export']" v-hasPermi="['monitor:job:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
type="warning"
plain
icon="Close"
@click="handleClose"
>关闭</el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -99,14 +103,34 @@
<el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true"> label="任务名称"
align="center"
prop="jobName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务组名"
align="center"
prop="jobGroup"
:show-overflow-tooltip="true"
>
<template #default="scope"> <template #default="scope">
<dict-tag :options="sys_job_group" :value="scope.row.jobGroup" /> <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" /> 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="status">
<template #default="scope"> <template #default="scope">
<dict-tag :options="sys_common_status" :value="scope.row.status" /> <dict-tag :options="sys_common_status" :value="scope.row.status" />
@ -119,7 +143,14 @@
</el-table-column> </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 #default="scope"> <template #default="scope">
<el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button> <el-button
link
type="primary"
icon="View"
@click="handleView(scope.row)"
v-hasPermi="['monitor:job:query']"
>详细</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -157,7 +188,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <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-col>
</el-row> </el-row>
</el-form> </el-form>
@ -171,11 +204,11 @@
</template> </template>
<script setup name="JobLog"> <script setup name="JobLog">
import { getJob } from "@/api/monitor/job" import { getJob } from '@/api/monitor/job'
import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog" import { listJobLog, delJobLog, cleanJobLog } from '@/api/monitor/jobLog'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const { sys_common_status, sys_job_group } = proxy.useDict("sys_common_status", "sys_job_group") const { sys_common_status, sys_job_group } = proxy.useDict('sys_common_status', 'sys_job_group')
const jobLogList = ref([]) const jobLogList = ref([])
const open = ref(false) const open = ref(false)
@ -194,8 +227,8 @@ const data = reactive({
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined,
} },
}) })
const { queryParams, form, rules } = toRefs(data) const { queryParams, form, rules } = toRefs(data)
@ -203,7 +236,7 @@ const { queryParams, form, rules } = toRefs(data)
/** 查询调度日志列表 */ /** 查询调度日志列表 */
function getList() { function getList() {
loading.value = true loading.value = true
listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => { listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
jobLogList.value = response.rows jobLogList.value = response.rows
total.value = response.total total.value = response.total
loading.value = false loading.value = false
@ -212,7 +245,7 @@ function getList() {
// 返回按钮 // 返回按钮
function handleClose() { function handleClose() {
const obj = { path: "/monitor/job" } const obj = { path: '/monitor/job' }
proxy.$tab.closeOpenPage(obj) proxy.$tab.closeOpenPage(obj)
} }
@ -225,13 +258,13 @@ function handleQuery() {
/** 重置按钮操作 */ /** 重置按钮操作 */
function resetQuery() { function resetQuery() {
dateRange.value = [] dateRange.value = []
proxy.resetForm("queryRef") proxy.resetForm('queryRef')
handleQuery() handleQuery()
} }
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.jobLogId) ids.value = selection.map((item) => item.jobLogId)
multiple.value = !selection.length multiple.value = !selection.length
} }
@ -243,35 +276,47 @@ function handleView(row) {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
proxy.$modal.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?').then(function () { proxy.$modal
.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?')
.then(function () {
return delJobLog(ids.value) return delJobLog(ids.value)
}).then(() => { })
.then(() => {
getList() getList()
proxy.$modal.msgSuccess("删除成功") proxy.$modal.msgSuccess('删除成功')
}).catch(() => {}) })
.catch(() => {})
} }
/** 清空按钮操作 */ /** 清空按钮操作 */
function handleClean() { function handleClean() {
proxy.$modal.confirm("是否确认清空所有调度日志数据项?").then(function () { proxy.$modal
.confirm('是否确认清空所有调度日志数据项?')
.then(function () {
return cleanJobLog() return cleanJobLog()
}).then(() => { })
.then(() => {
getList() getList()
proxy.$modal.msgSuccess("清空成功") proxy.$modal.msgSuccess('清空成功')
}).catch(() => {}) })
.catch(() => {})
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download("monitor/jobLog/export", { proxy.download(
'monitor/jobLog/export',
{
...queryParams.value, ...queryParams.value,
}, `job_log_${new Date().getTime()}.xlsx`) },
`job_log_${new Date().getTime()}.xlsx`,
)
} }
(() => { ;(() => {
const jobId = route.params && route.params.jobId const jobId = route.params && route.params.jobId
if (jobId !== undefined && jobId != 0) { if (jobId !== undefined && jobId != 0) {
getJob(jobId).then(response => { getJob(jobId).then((response) => {
queryParams.value.jobName = response.data.jobName queryParams.value.jobName = response.data.jobName
queryParams.value.jobGroup = response.data.jobGroup queryParams.value.jobGroup = response.data.jobGroup
getList() getList()

89
src/views/sMsSendManage/loopSend/index.vue
View File

@ -1,9 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 循环发送短信列表 --> <!-- 循环发送短信列表 -->
<div class="table-wrapper"> <ComTable
<!-- 表格工具栏区域 --> ref="comTableRef"
<div class="table-toolbar"> :form-columns="formColumns"
:table-columns="tableColumns"
:load-data="listLoopSendAPI"
:show-toolbar="true"
:show-action="true"
:action-columns="actionColumns"
>
<template #toolbar>
<div class="toolbar-left"> <div class="toolbar-left">
<ComButton <ComButton
type="primary" type="primary"
@ -13,29 +20,13 @@
> >
新建 新建
</ComButton> </ComButton>
<span v-if="smsBalance !== null" class="sms-balance-text">
短信余额剩余 {{ smsBalance }} 条
<span v-if="smsBalance < 10000">，请及时充值！</span>
</span>
</div> </div>
<div class="toolbar-right"> </template>
<!-- 短信余额提醒 -->
<el-alert
v-if="smsBalance !== null"
:title="`短信余额剩余 ${smsBalance} 条，请及时充值！`"
type="warning"
:closable="false"
show-icon
class="balance-alert"
/>
</div>
</div>
<ComTable
ref="comTableRef"
:form-columns="formColumns"
:table-columns="tableColumns"
:load-data="listLoopSendAPI"
:show-toolbar="false"
:show-action="true"
:action-columns="actionColumns"
>
<template #taskStatus="{ row }"> <template #taskStatus="{ row }">
<el-switch <el-switch
active-value="0" active-value="0"
@ -48,7 +39,6 @@
</template> </template>
</ComTable> </ComTable>
</div> </div>
</div>
</template> </template>
<script setup name="LoopSend"> <script setup name="LoopSend">
@ -224,58 +214,15 @@ onMounted(() => {
padding: 20px; padding: 20px;
} }
.table-wrapper {
display: flex;
flex-direction: column;
gap: 0;
}
.table-toolbar {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 16px;
padding: 0;
}
.toolbar-left { .toolbar-left {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 12px; gap: 12px;
} }
.toolbar-right { .sms-balance-text {
display: flex; margin-left: 16px;
align-items: center;
gap: 12px;
}
.balance-alert {
margin: 0;
max-width: 400px;
:deep(.el-alert__content) {
.el-alert__title {
font-size: 14px; font-size: 14px;
font-weight: 500; color: #f56c6c;
color: #e6a23c;
}
}
}
@media (max-width: 768px) {
.table-toolbar {
flex-direction: column;
align-items: flex-start;
gap: 12px;
}
.toolbar-right {
width: 100%;
}
.balance-alert {
max-width: 100%;
}
} }
</style> </style>