From ba5b8c77c3071722d00f9d1e1878cb8a4efd06d7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 十月 2022 20:35:50 +0800
Subject: [PATCH] 定时任务支持在线生成cron表达式

---
 src/views/monitor/job/index.vue |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index da67945..aab4ba4 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -204,7 +204,7 @@
                </el-col>
                <el-col :span="24">
                   <el-form-item label="cron琛ㄨ揪寮�" prop="cronExpression">
-                     <el-input v-model="form.cronExpression" placeholder="璇疯緭鍏ron鎵ц琛ㄨ揪寮�">
+                     <el-input v-model="form.cronExpression" placeholder="璇疯緭鍏ron鎵ц琛ㄨ揪寮�" readonly>
                         <template #append>
                            <el-button type="primary" @click="handleShowCron">
                               鐢熸垚琛ㄨ揪寮�
@@ -251,7 +251,11 @@
             </div>
          </template>
       </el-dialog>
- 
+
+     <el-dialog title="Cron琛ㄨ揪寮忕敓鎴愬櫒" v-model="openCron" append-to-body destroy-on-close>
+       <crontab ref="crontabRef" @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
+     </el-dialog>
+
       <!-- 浠诲姟鏃ュ織璇︾粏 -->
       <el-dialog title="浠诲姟璇︾粏" v-model="openView" width="700px" append-to-body>
          <el-form :model="form" label-width="120px">
@@ -306,7 +310,7 @@
 
 <script setup name="Job">
 import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
-
+import Crontab from '@/components/Crontab'
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");
@@ -336,7 +340,7 @@
   rules: {
     jobName: [{ required: true, message: "浠诲姟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
     invokeTarget: [{ required: true, message: "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�", trigger: "blur" }],
-    cronExpression: [{ required: true, message: "cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�", trigger: "blur" }]
+    cronExpression: [{ required: true, message: "cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�", trigger: "change" }]
   }
 });
 

--
Gitblit v1.9.3