From 06d52deb60040d968c3f69d625f9cd52ecbdac4c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 四月 2025 11:48:56 +0800
Subject: [PATCH] 优化代码
---
src/views/monitor/job/index.vue | 139 +++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 68 deletions(-)
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index f7b9e35..77a472a 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -1,17 +1,17 @@
<template>
<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">
<el-form-item label="浠诲姟鍚嶇О" prop="jobName">
<el-input
v-model="queryParams.jobName"
placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
clearable
- size="small"
+ style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="浠诲姟缁勫悕" prop="jobGroup">
- <el-select v-model="queryParams.jobGroup" placeholder="璇烽�夋嫨浠诲姟缁勫悕" clearable>
+ <el-select v-model="queryParams.jobGroup" placeholder="璇烽�夋嫨浠诲姟缁勫悕" clearable style="width: 200px">
<el-option
v-for="dict in sys_job_group"
:key="dict.value"
@@ -21,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item label="浠诲姟鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨浠诲姟鐘舵��" clearable>
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨浠诲姟鐘舵��" clearable style="width: 200px">
<el-option
v-for="dict in sys_job_status"
:key="dict.value"
@@ -31,8 +31,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 +42,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['monitor:job:add']"
>鏂板</el-button>
@@ -52,7 +51,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
@@ -63,7 +61,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
@@ -74,7 +71,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>瀵煎嚭</el-button>
@@ -84,7 +80,6 @@
type="info"
plain
icon="Operation"
- size="mini"
@click="handleJobLog"
v-hasPermi="['monitor:job:query']"
>鏃ュ織</el-button>
@@ -115,35 +110,21 @@
</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 link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鎵ц涓�娆�" placement="top">
+ <el-button link type="primary" icon="CaretRight" @click="handleRun(scope.row)" v-hasPermi="['monitor:job:changeStatus']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="浠诲姟璇︾粏" placement="top">
+ <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="璋冨害鏃ュ織" placement="top">
+ <el-button link type="primary" icon="Operation" @click="handleJobLog(scope.row)" v-hasPermi="['monitor:job:query']"></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -157,7 +138,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
- <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+ <el-dialog :title="title" v-model="open" width="820px" append-to-body>
<el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
@@ -190,7 +171,7 @@
<br />鍙傛暟璇存槑锛氭敮鎸佸瓧绗︿覆锛屽竷灏旂被鍨嬶紝闀挎暣鍨嬶紝娴偣鍨嬶紝鏁村瀷
</div>
</template>
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
</span>
</template>
@@ -209,31 +190,31 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
- <el-radio-group v-model="form.misfirePolicy" size="small">
- <el-radio-button label="1">绔嬪嵆鎵ц</el-radio-button>
- <el-radio-button label="2">鎵ц涓�娆�</el-radio-button>
- <el-radio-button label="3">鏀惧純鎵ц</el-radio-button>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏄惁骞跺彂" prop="concurrent">
- <el-radio-group v-model="form.concurrent" size="small">
- <el-radio-button label="0">鍏佽</el-radio-button>
- <el-radio-button label="1">绂佹</el-radio-button>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="12">
+ <el-col :span="24" v-if="form.jobId !== undefined">
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_job_status"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵ц绛栫暐" prop="misfirePolicy">
+ <el-radio-group v-model="form.misfirePolicy">
+ <el-radio-button value="1">绔嬪嵆鎵ц</el-radio-button>
+ <el-radio-button value="2">鎵ц涓�娆�</el-radio-button>
+ <el-radio-button value="3">鏀惧純鎵ц</el-radio-button>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏄惁骞跺彂" prop="concurrent">
+ <el-radio-group v-model="form.concurrent">
+ <el-radio-button value="0">鍏佽</el-radio-button>
+ <el-radio-button value="1">绂佹</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
@@ -246,10 +227,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>
@@ -271,7 +256,7 @@
<el-col :span="12">
<el-form-item label="浠诲姟鐘舵�侊細">
<div v-if="form.status == 0">姝ｅ父</div>
- <div v-else-if="form.status == 1">澶辫触</div>
+ <div v-else-if="form.status == 1">鏆傚仠</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -301,7 +286,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 +316,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" }]
}
});
@@ -346,15 +331,18 @@
loading.value = false;
});
}
+
/** 浠诲姟缁勫悕瀛楀吀缈昏瘧 */
function jobGroupFormat(row, column) {
- return proxy.selectDictLabel(sys_job_group, row.jobGroup);
+ return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
}
+
/** 鍙栨秷鎸夐挳 */
function cancel() {
open.value = false;
reset();
}
+
/** 琛ㄥ崟閲嶇疆 */
function reset() {
form.value = {
@@ -369,22 +357,26 @@
};
proxy.resetForm("jobRef");
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
proxy.resetForm("queryRef");
handleQuery();
}
+
// 澶氶�夋閫変腑鏁版嵁
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.jobId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
+
// 鏇村鎿嶄綔瑙﹀彂
function handleCommand(command, row) {
switch (command) {
@@ -401,6 +393,7 @@
break;
}
}
+
// 浠诲姟鐘舵�佷慨鏀�
function handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
@@ -412,6 +405,7 @@
row.status = row.status === "0" ? "1" : "0";
});
}
+
/* 绔嬪嵆鎵ц涓�娆� */
function handleRun(row) {
proxy.$modal.confirm('纭瑕佺珛鍗虫墽琛屼竴娆�"' + row.jobName + '"浠诲姟鍚�?').then(function () {
@@ -420,6 +414,7 @@
proxy.$modal.msgSuccess("鎵ц鎴愬姛");})
.catch(() => {});
}
+
/** 浠诲姟璇︾粏淇℃伅 */
function handleView(row) {
getJob(row.jobId).then(response => {
@@ -427,26 +422,31 @@
openView.value = true;
});
}
+
/** cron琛ㄨ揪寮忔寜閽搷浣� */
function handleShowCron() {
expression.value = form.value.cronExpression;
openCron.value = true;
}
+
/** 纭畾鍚庡洖浼犲�� */
function crontabFill(value) {
form.value.cronExpression = value;
}
+
/** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
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() {
reset();
open.value = true;
title.value = "娣诲姞浠诲姟";
}
+
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
reset();
@@ -457,6 +457,7 @@
title.value = "淇敼浠诲姟";
});
}
+
/** 鎻愪氦鎸夐挳 */
function submitForm() {
proxy.$refs["jobRef"].validate(valid => {
@@ -477,6 +478,7 @@
}
});
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const jobIds = row.jobId || ids.value;
@@ -487,6 +489,7 @@
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
}
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
function handleExport() {
proxy.download("monitor/job/export", {
--
Gitblit v1.9.3