升级组件依赖到最新版本

RuoYi

2022-11-17 750a09d5b702f8e857f09ccc124565796f601d3f

 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,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 +196,7 @@
                                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型

                                 </div>

                              </template>

                              <i class="el-icon-question"></i>

                              <el-icon><question-filled /></el-icon>

                           </el-tooltip>

                        </span>

                     </template>

@@ -211,7 +217,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 +226,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 +252,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 +311,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 +341,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 +358,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 +449,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() {