From d13dfb00437aceb1fe327d54aebd786724872e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sat, 11 Mar 2023 23:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E8=BF=90=E8=A1=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/api/dev/jobApi.js       |  4 ++++
 snowy-admin-web/src/views/dev/job/form.vue  | 26 ++++++++++-----------
 snowy-admin-web/src/views/dev/job/index.vue | 13 ++++++++++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/snowy-admin-web/src/api/dev/jobApi.js b/snowy-admin-web/src/api/dev/jobApi.js
index 9ab72727..8e5dca53 100644
--- a/snowy-admin-web/src/api/dev/jobApi.js
+++ b/snowy-admin-web/src/api/dev/jobApi.js
@@ -46,6 +46,10 @@ export default {
 	jobRunJob(data) {
 		return request('runJob', data)
 	},
+	// 运行定时任务
+	jobRunJobNow(data) {
+		return request('runJobNow', data)
+	},
 	// 获取定时任务类
 	jobGetActionClass(data) {
 		return request('getActionClass', data, 'get')
diff --git a/snowy-admin-web/src/views/dev/job/form.vue b/snowy-admin-web/src/views/dev/job/form.vue
index 2cc8f831..a3baa407 100644
--- a/snowy-admin-web/src/views/dev/job/form.vue
+++ b/snowy-admin-web/src/views/dev/job/form.vue
@@ -84,20 +84,18 @@
 
 	// 验证并提交数据
 	const onSubmit = () => {
-		formRef.value
-			.validate()
-			.then(() => {
-				submitLoading.value = true
-				jobApi
-					.submitForm(formData.value, !formData.value.id)
-					.then(() => {
-						onClose()
-						emit('successful')
-					})
-					.finally(() => {
-						submitLoading.value = false
-					})
-			})
+		formRef.value.validate().then(() => {
+			submitLoading.value = true
+			jobApi
+				.submitForm(formData.value, !formData.value.id)
+				.then(() => {
+					onClose()
+					emit('successful')
+				})
+				.finally(() => {
+					submitLoading.value = false
+				})
+		})
 	}
 	// 分类
 	const categoryOptions = tool.dictTypeList('JOB_CATEGORY').map((item) => {
diff --git a/snowy-admin-web/src/views/dev/job/index.vue b/snowy-admin-web/src/views/dev/job/index.vue
index 27ac8402..cd92dc10 100644
--- a/snowy-admin-web/src/views/dev/job/index.vue
+++ b/snowy-admin-web/src/views/dev/job/index.vue
@@ -64,6 +64,8 @@
 				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
+						<a @click="immediatelyRun(record)">立即运行</a>
+						<a-divider type="vertical" />
 						<a @click="form.onOpen(record)">编辑</a>
 						<a-divider type="vertical" />
 						<a-popconfirm title="确定要删除此定时任务吗？" @confirm="deleteJob(record)">
@@ -123,7 +125,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
-			width: '200px'
+			width: '220px'
 		}
 	]
 	let selectedRowKeys = ref([])
@@ -169,6 +171,15 @@
 				})
 		}
 	}
+	// 立即运行
+	const immediatelyRun = (record) => {
+		const params = {
+			id: record.id
+		}
+		jobApi.jobRunJobNow(params).then(() => {
+			table.value.refresh(true)
+		})
+	}
 	// 删除
 	const deleteJob = (record) => {
 		let params = [