From 69a246ac8a19604603b32a262eb32aee475ba3bc Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 15 十一月 2022 14:24:34 +0800
Subject: [PATCH] 修复调度日志点击多次数据不变化的问题
---
src/views/monitor/job/index.vue | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index f7b9e35..8f79229 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -6,7 +6,6 @@
v-model="queryParams.jobName"
placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
clearable
- size="small"
@keyup.enter="handleQuery"
/>
</el-form-item>
@@ -31,8 +30,8 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -42,7 +41,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['monitor:job:add']"
>鏂板</el-button>
@@ -52,7 +50,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
@@ -63,7 +60,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
@@ -74,7 +70,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>瀵煎嚭</el-button>
@@ -84,7 +79,6 @@
type="info"
plain
icon="Operation"
- size="mini"
@click="handleJobLog"
v-hasPermi="['monitor:job:query']"
>鏃ュ織</el-button>
@@ -115,35 +109,46 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- size="mini"
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['monitor:job:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['monitor:job:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
- <i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleRun" icon="CaretRight"
- v-hasPermi="['monitor:job:changeStatus']">鎵ц涓�娆�</el-dropdown-item>
- <el-dropdown-item command="handleView" icon="View"
- v-hasPermi="['monitor:job:query']">浠诲姟璇︾粏</el-dropdown-item>
- <el-dropdown-item command="handleJobLog" icon="Operation"
- v-hasPermi="['monitor:job:query']">璋冨害鏃ュ織</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ <el-tooltip content="淇敼" placement="top">
+ <el-button
+ type="text"
+ icon="Edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['monitor:job:edit']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button
+ type="text"
+ icon="Delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['monitor:job:remove']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="鎵ц涓�娆�" placement="top">
+ <el-button
+ type="text"
+ icon="CaretRight"
+ @click="handleRun(scope.row)"
+ v-hasPermi="['monitor:job:changeStatus']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="浠诲姟璇︾粏" placement="top">
+ <el-button
+ type="text"
+ icon="View"
+ @click="handleView(scope.row)"
+ v-hasPermi="['monitor:job:query']"
+ ></el-button>
+ </el-tooltip>
+ <el-tooltip content="璋冨害鏃ュ織" placement="top">
+ <el-button
+ type="text"
+ icon="Operation"
+ @click="handleJobLog(scope.row)"
+ v-hasPermi="['monitor:job:query']"
+ ></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -190,7 +195,7 @@
<br />鍙傛暟璇存槑锛氭敮鎸佸瓧绗︿覆锛屽竷灏旂被鍨嬶紝闀挎暣鍨嬶紝娴偣鍨嬶紝鏁村瀷
</div>
</template>
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
</span>
</template>
@@ -211,7 +216,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
- <el-radio-group v-model="form.misfirePolicy" size="small">
+ <el-radio-group v-model="form.misfirePolicy">
<el-radio-button label="1">绔嬪嵆鎵ц</el-radio-button>
<el-radio-button label="2">鎵ц涓�娆�</el-radio-button>
<el-radio-button label="3">鏀惧純鎵ц</el-radio-button>
@@ -220,7 +225,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏄惁骞跺彂" prop="concurrent">
- <el-radio-group v-model="form.concurrent" size="small">
+ <el-radio-group v-model="form.concurrent">
<el-radio-button label="0">鍏佽</el-radio-button>
<el-radio-button label="1">绂佹</el-radio-button>
</el-radio-group>
@@ -246,10 +251,14 @@
</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" size="mini">
+ <el-form :model="form" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="浠诲姟缂栧彿锛�">{{ form.jobId }}</el-form-item>
@@ -301,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");
@@ -331,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" }]
}
});
@@ -348,7 +357,7 @@
}
/** 浠诲姟缁勫悕瀛楀吀缈昏瘧 */
function jobGroupFormat(row, column) {
- return proxy.selectDictLabel(sys_job_group, row.jobGroup);
+ return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
}
/** 鍙栨秷鎸夐挳 */
function cancel() {
@@ -439,7 +448,7 @@
/** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
function handleJobLog(row) {
const jobId = row.jobId || 0;
- router.push({ path: "/monitor/job-log/index", query: { jobId: jobId } });
+ router.push('/monitor/job-log/index/' + jobId)
}
/** 鏂板鎸夐挳鎿嶄綔 */
function handleAdd() {
--
Gitblit v1.9.3