remove all semicolons

RuoYi

2025-04-27 2f8a257efd2b64dc40666b0d332edb7824a9768d

 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">

@@ -300,24 +285,24 @@
</template>



<script setup name="Job">

import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/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")



const router = useRouter();

const { proxy } = getCurrentInstance();

const { sys_job_group, sys_job_status } = proxy.useDict("sys_job_group", "sys_job_status");



const jobList = ref([]);

const open = ref(false);

const loading = ref(true);

const showSearch = ref(true);

const ids = ref([]);

const single = ref(true);

const multiple = ref(true);

const total = ref(0);

const title = ref("");

const openView = ref(false);

const openCron = ref(false);

const expression = ref("");

const jobList = ref([])

const open = ref(false)

const loading = ref(true)

const showSearch = ref(true)

const ids = ref([])

const single = ref(true)

const multiple = ref(true)

const total = ref(0)

const title = ref("")

const openView = ref(false)

const openCron = ref(false)

const expression = ref("")



const data = reactive({

  form: {},

@@ -331,30 +316,33 @@
  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" }]

  }

});

})



const { queryParams, form, rules } = toRefs(data);

const { queryParams, form, rules } = toRefs(data)



/** 查询定时任务列表 */

function getList() {

  loading.value = true;

  loading.value = true

  listJob(queryParams.value).then(response => {

    jobList.value = response.rows;

    total.value = response.total;

    loading.value = false;

  });

    jobList.value = response.rows

    total.value = response.total

    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();

  open.value = false

  reset()

}



/** 表单重置 */

function reset() {

  form.value = {

@@ -366,133 +354,148 @@
    misfirePolicy: 1,

    concurrent: 1,

    status: "0"

  };

  proxy.resetForm("jobRef");

  }

  proxy.resetForm("jobRef")

}



/** 搜索按钮操作 */

function handleQuery() {

  queryParams.value.pageNum = 1;

  getList();

  queryParams.value.pageNum = 1

  getList()

}



/** 重置按钮操作 */

function resetQuery() {

  proxy.resetForm("queryRef");

  handleQuery();

  proxy.resetForm("queryRef")

  handleQuery()

}



// 多选框选中数据

function handleSelectionChange(selection) {

  ids.value = selection.map(item => item.jobId);

  single.value = selection.length != 1;

  multiple.value = !selection.length;

  ids.value = selection.map(item => item.jobId)

  single.value = selection.length != 1

  multiple.value = !selection.length

}



// 更多操作触发

function handleCommand(command, row) {

  switch (command) {

    case "handleRun":

      handleRun(row);

      break;

      handleRun(row)

      break

    case "handleView":

      handleView(row);

      break;

      handleView(row)

      break

    case "handleJobLog":

      handleJobLog(row);

      break;

      handleJobLog(row)

      break

    default:

      break;

      break

  }

}



// 任务状态修改

function handleStatusChange(row) {

  let text = row.status === "0" ? "启用" : "停用";

  let text = row.status === "0" ? "启用" : "停用"

  proxy.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗?').then(function () {

    return changeJobStatus(row.jobId, row.status);

    return changeJobStatus(row.jobId, row.status)

  }).then(() => {

    proxy.$modal.msgSuccess(text + "成功");

    proxy.$modal.msgSuccess(text + "成功")

  }).catch(function () {

    row.status = row.status === "0" ? "1" : "0";

  });

    row.status = row.status === "0" ? "1" : "0"

  })

}



/* 立即执行一次 */

function handleRun(row) {

  proxy.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {

    return runJob(row.jobId, row.jobGroup);

    return runJob(row.jobId, row.jobGroup)

  }).then(() => {

    proxy.$modal.msgSuccess("执行成功");})

  .catch(() => {});

    proxy.$modal.msgSuccess("执行成功")})

  .catch(() => {})

}



/** 任务详细信息 */

function handleView(row) {

  getJob(row.jobId).then(response => {

    form.value = response.data;

    openView.value = true;

  });

    form.value = response.data

    openView.value = true

  })

}



/** cron表达式按钮操作 */

function handleShowCron() {

  expression.value = form.value.cronExpression;

  openCron.value = true;

  expression.value = form.value.cronExpression

  openCron.value = true

}



/** 确定后回传值 */

function crontabFill(value) {

  form.value.cronExpression = value;

  form.value.cronExpression = value

}



/** 任务日志列表查询 */

function handleJobLog(row) {

  const jobId = row.jobId || 0;

  router.push({ path: "/monitor/job-log/index", query: { jobId: jobId } });

  const jobId = row.jobId || 0

  router.push('/monitor/job-log/index/' + jobId)

}



/** 新增按钮操作 */

function handleAdd() {

  reset();

  open.value = true;

  title.value = "添加任务";

  reset()

  open.value = true

  title.value = "添加任务"

}



/** 修改按钮操作 */

function handleUpdate(row) {

  reset();

  const jobId = row.jobId || ids.value;

  reset()

  const jobId = row.jobId || ids.value

  getJob(jobId).then(response => {

    form.value = response.data;

    open.value = true;

    title.value = "修改任务";

  });

    form.value = response.data

    open.value = true

    title.value = "修改任务"

  })

}



/** 提交按钮 */

function submitForm() {

  proxy.$refs["jobRef"].validate(valid => {

    if (valid) {

      if (form.value.jobId != undefined) {

        updateJob(form.value).then(response => {

          proxy.$modal.msgSuccess("修改成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("修改成功")

          open.value = false

          getList()

        })

      } else {

        addJob(form.value).then(response => {

          proxy.$modal.msgSuccess("新增成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("新增成功")

          open.value = false

          getList()

        })

      }

    }

  });

  })

}



/** 删除按钮操作 */

function handleDelete(row) {

  const jobIds = row.jobId || ids.value;

  const jobIds = row.jobId || ids.value

  proxy.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项?').then(function () {

    return delJob(jobIds);

    return delJob(jobIds)

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("删除成功");

  }).catch(() => {});

    getList()

    proxy.$modal.msgSuccess("删除成功")

  }).catch(() => {})

}



/** 导出按钮操作 */

function handleExport() {

  proxy.download("monitor/job/export", {

    ...queryParams.value,

  }, `job_${new Date().getTime()}.xlsx`);

  }, `job_${new Date().getTime()}.xlsx`)

}



getList();

getList()

</script>