From 93f18e0fc637d00fd58b54a6c508f5f724074fdf Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 11 九月 2025 11:57:58 +0800
Subject: [PATCH] 冲突
---
src/views/monitor/job/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index e5f808d..31108b5 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -256,7 +256,7 @@
<el-form-item label="cron琛ㄨ揪寮忥細">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="涓嬫鎵ц鏃堕棿锛�">{{ parseTime(form.nextValidTime) }}</el-form-item>
+ <el-form-item label="涓嬫鎵ц鏃堕棿锛�">{{ formatTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="璋冪敤鐩爣鏂规硶锛�">{{ form.invokeTarget }}</el-form-item>
--
Gitblit v1.9.3