优化字典标签支持自定义分隔符

RuoYi

2023-11-29 cb80de3742d66cfee20bc3136c735e5ca5a7d45c

 src/views/monitor/job/index.vue

@@ -1,16 +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

               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"

@@ -20,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"

@@ -110,44 +111,19 @@
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">

            <template #default="scope">

               <el-tooltip content="修改" placement="top">

                  <el-button

                     type="text"

                     icon="Edit"

                     @click="handleUpdate(scope.row)"

                     v-hasPermi="['monitor:job:edit']"

                  ></el-button>

                  <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

                     type="text"

                     icon="Delete"

                     @click="handleDelete(scope.row)"

                     v-hasPermi="['monitor:job:remove']"

                  ></el-button>

                  <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

                     type="text"

                     icon="CaretRight"

                     @click="handleRun(scope.row)"

                     v-hasPermi="['monitor:job:changeStatus']"

                  ></el-button>

                  <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

                     type="text"

                     icon="View"

                     @click="handleView(scope.row)"

                     v-hasPermi="['monitor:job:query']"

                  ></el-button>

                  <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

                     type="text"

                     icon="Operation"

                     @click="handleJobLog(scope.row)"

                     v-hasPermi="['monitor:job:query']"

                  ></el-button>

                  <el-button link type="primary" icon="Operation" @click="handleJobLog(scope.row)" v-hasPermi="['monitor:job:query']"></el-button>

               </el-tooltip>

            </template>

         </el-table-column>

@@ -162,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">

@@ -214,7 +190,18 @@
                     </el-input>

                  </el-form-item>

               </el-col>

               <el-col :span="24">

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

                        >{{ 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 label="1">立即执行</el-radio-button>

@@ -228,17 +215,6 @@
                     <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>

                  </el-form-item>

               </el-col>

               <el-col :span="12">

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

                        >{{ dict.label }}</el-radio>

                     </el-radio-group>

                  </el-form-item>

               </el-col>

@@ -280,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">