diff --git a/src/api/monitor/job.js b/src/api/monitor/job.js
index 3815569..30b9897 100644
--- a/src/api/monitor/job.js
+++ b/src/api/monitor/job.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询定时任务调度列表
 export function listJob(query) {
   return request({
-    url: '/monitor/job/list',
+    url: '/job/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listJob(query) {
 // 查询定时任务调度详细
 export function getJob(jobId) {
   return request({
-    url: '/monitor/job/' + jobId,
+    url: '/job/' + jobId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getJob(jobId) {
 // 新增定时任务调度
 export function addJob(data) {
   return request({
-    url: '/monitor/job',
+    url: '/job',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addJob(data) {
 // 修改定时任务调度
 export function updateJob(data) {
   return request({
-    url: '/monitor/job',
+    url: '/job',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateJob(data) {
 // 删除定时任务调度
 export function delJob(jobId) {
   return request({
-    url: '/monitor/job/' + jobId,
+    url: '/job/' + jobId,
     method: 'delete'
   })
 }
@@ -50,7 +50,7 @@ export function changeJobStatus(jobId, status) {
     status
   }
   return request({
-    url: '/monitor/job/changeStatus',
+    url: '/job/changeStatus',
     method: 'put',
     data: data
   })
@@ -64,7 +64,7 @@ export function runJob(jobId, jobGroup) {
     jobGroup
   }
   return request({
-    url: '/monitor/job/run',
+    url: '/job/run',
     method: 'put',
     data: data
   })
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 10e1979..014cb7a 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -181,7 +181,7 @@
                             v-hasPermi="['monitor:job:query']"
                         ></el-button>
                     </el-tooltip>
-                    <el-tooltip content="调度日志" placement="top">
+                    <!-- <el-tooltip content="调度日志" placement="top">
                         <el-button
                             link
                             type="primary"
@@ -189,7 +189,7 @@
                             @click="handleJobLog(scope.row)"
                             v-hasPermi="['monitor:job:query']"
                         ></el-button>
-                    </el-tooltip>
+                    </el-tooltip> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -203,168 +203,184 @@
         />
 
         <!-- 添加或修改定时任务对话框 -->
-        <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">
-                        <el-form-item label="任务名称" prop="jobName">
-                            <el-input v-model="form.jobName" placeholder="请输入任务名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="任务分组" prop="jobGroup">
-                            <el-select v-model="form.jobGroup" placeholder="请选择">
-                                <el-option
-                                    v-for="dict in sys_job_group"
-                                    :key="dict.value"
-                                    :label="dict.label"
-                                    :value="dict.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item prop="invokeTarget">
-                            <template #label>
-                                <span>
-                                    调用方法
-                                    <el-tooltip placement="top">
-                                        <template #content>
-                                            <div>
-                                                Bean调用示例：ryTask.ryParams('ry')
-                                                <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
-                                                <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
-                                            </div>
-                                        </template>
-                                        <el-icon><question-filled /></el-icon>
-                                    </el-tooltip>
-                                </span>
-                            </template>
-                            <el-input
-                                v-model="form.invokeTarget"
-                                placeholder="请输入调用目标字符串"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="cron表达式" prop="cronExpression">
-                            <el-input
-                                v-model="form.cronExpression"
-                                placeholder="请输入cron执行表达式"
-                            >
-                                <template #append>
-                                    <el-button type="primary" @click="handleShowCron">
-                                        生成表达式
-                                        <i class="el-icon-time el-icon--right"></i>
-                                    </el-button>
+        <ComDialog :dialog-config="jobDialogConfig" @closeDialogOuter="onCloseJobDialogOuter">
+            <template #outerContent>
+                <el-form
+                    ref="jobRef"
+                    :model="form"
+                    :rules="rules"
+                    label-width="120px"
+                    size="medium"
+                >
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="任务名称" prop="jobName">
+                                <el-input v-model="form.jobName" placeholder="请输入任务名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="任务分组" prop="jobGroup">
+                                <el-select v-model="form.jobGroup" placeholder="请选择">
+                                    <el-option
+                                        v-for="dict in sys_job_group"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item prop="invokeTarget">
+                                <template #label>
+                                    <span>
+                                        调用方法
+                                        <el-tooltip placement="top">
+                                            <template #content>
+                                                <div>
+                                                    Bean调用示例：ryTask.ryParams('ry')
+                                                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                                                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
+                                                </div>
+                                            </template>
+                                            <el-icon><question-filled /></el-icon>
+                                        </el-tooltip>
+                                    </span>
                                 </template>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <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"
-                                    :value="dict.value"
-                                    >{{ dict.label }}</el-radio
+                                <el-input
+                                    v-model="form.invokeTarget"
+                                    placeholder="请输入调用目标字符串"
+                                />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="cron表达式" prop="cronExpression">
+                                <el-input
+                                    v-model="form.cronExpression"
+                                    placeholder="请输入cron执行表达式"
                                 >
-                            </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>
-                </el-row>
-            </el-form>
-            <template #footer>
+                                    <template #append>
+                                        <el-button type="primary" @click="handleShowCron">
+                                            生成表达式
+                                            <i class="el-icon-time el-icon--right"></i>
+                                        </el-button>
+                                    </template>
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <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"
+                                        :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>
+                    </el-row>
+                </el-form>
                 <div class="dialog-footer">
                     <el-button type="primary" @click="submitForm">确 定</el-button>
                     <el-button @click="cancel">取 消</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </ComDialog>
 
-        <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>
+        <!-- Cron 表达式生成器 -->
+        <ComDialog :dialog-config="cronDialogConfig" @closeDialogOuter="onCloseCronDialogOuter">
+            <template #outerContent>
+                <crontab
+                    ref="crontabRef"
+                    @hide="onHideCronDialog"
+                    @fill="crontabFill"
+                    :expression="expression"
+                ></crontab>
+            </template>
+        </ComDialog>
 
         <!-- 任务日志详细 -->
-        <el-dialog title="任务详细" v-model="openView" width="700px" append-to-body>
-            <el-form :model="form" label-width="120px">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
-                        <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
-                        <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <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-col>
-                    <el-col :span="24">
-                        <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="任务状态：">
-                            <div v-if="form.status == 0">正常</div>
-                            <div v-else-if="form.status == 1">暂停</div>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="是否并发：">
-                            <div v-if="form.concurrent == 0">允许</div>
-                            <div v-else-if="form.concurrent == 1">禁止</div>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="执行策略：">
-                            <div v-if="form.misfirePolicy == 0">默认策略</div>
-                            <div v-else-if="form.misfirePolicy == 1">立即执行</div>
-                            <div v-else-if="form.misfirePolicy == 2">执行一次</div>
-                            <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <template #footer>
+        <ComDialog :dialog-config="viewDialogConfig" @closeDialogOuter="onCloseViewDialogOuter">
+            <template #outerContent>
+                <el-form :model="form" label-width="120px" size="medium">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
+                            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="任务分组：">{{
+                                jobGroupFormat(form)
+                            }}</el-form-item>
+                            <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <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-col>
+                        <el-col :span="24">
+                            <el-form-item label="调用目标方法：">{{
+                                form.invokeTarget
+                            }}</el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="任务状态：">
+                                <div v-if="form.status == 0">正常</div>
+                                <div v-else-if="form.status == 1">暂停</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="是否并发：">
+                                <div v-if="form.concurrent == 0">允许</div>
+                                <div v-else-if="form.concurrent == 1">禁止</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="执行策略：">
+                                <div v-if="form.misfirePolicy == 0">默认策略</div>
+                                <div v-else-if="form.misfirePolicy == 1">立即执行</div>
+                                <div v-else-if="form.misfirePolicy == 2">执行一次</div>
+                                <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
                 <div class="dialog-footer">
-                    <el-button @click="openView = false">关 闭</el-button>
+                    <el-button @click="viewDialogConfig.outerVisible = false">关 闭</el-button>
                 </div>
             </template>
-        </el-dialog>
+        </ComDialog>
     </div>
 </template>
 
 <script setup name="Job">
 import Crontab from '@/components/Crontab'
+import ComDialog from '@/components/ComDialog/index.vue'
 import {
     listJob,
     getJob,
@@ -380,18 +396,39 @@ 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 jobDialogConfig = reactive({
+    outerVisible: false,
+    outerTitle: '添加任务',
+    outerWidth: '820px',
+    minHeight: '300px',
+    maxHeight: '80vh',
+})
+
+const cronDialogConfig = reactive({
+    outerVisible: false,
+    outerTitle: 'Cron表达式生成器',
+    outerWidth: '700px',
+    minHeight: '300px',
+    maxHeight: '80vh',
+})
+
+const viewDialogConfig = reactive({
+    outerVisible: false,
+    outerTitle: '任务详细',
+    outerWidth: '700px',
+    minHeight: '300px',
+    maxHeight: '80vh',
+})
+
 const data = reactive({
     form: {},
     queryParams: {
@@ -427,7 +464,7 @@ function jobGroupFormat(row, column) {
 
 /** 取消按钮 */
 function cancel() {
-    open.value = false
+    jobDialogConfig.outerVisible = false
     reset()
 }
 
@@ -515,14 +552,14 @@ function handleRun(row) {
 function handleView(row) {
     getJob(row.jobId).then((response) => {
         form.value = response.data
-        openView.value = true
+        viewDialogConfig.outerVisible = true
     })
 }
 
 /** cron表达式按钮操作 */
 function handleShowCron() {
     expression.value = form.value.cronExpression
-    openCron.value = true
+    cronDialogConfig.outerVisible = true
 }
 
 /** 确定后回传值 */
@@ -539,8 +576,8 @@ function handleJobLog(row) {
 /** 新增按钮操作 */
 function handleAdd() {
     reset()
-    open.value = true
-    title.value = '添加任务'
+    jobDialogConfig.outerTitle = '添加任务'
+    jobDialogConfig.outerVisible = true
 }
 
 /** 修改按钮操作 */
@@ -549,8 +586,8 @@ function handleUpdate(row) {
     const jobId = row.jobId || ids.value
     getJob(jobId).then((response) => {
         form.value = response.data
-        open.value = true
-        title.value = '修改任务'
+        jobDialogConfig.outerTitle = '修改任务'
+        jobDialogConfig.outerVisible = true
     })
 }
 
@@ -561,13 +598,13 @@ function submitForm() {
             if (form.value.jobId != undefined) {
                 updateJob(form.value).then((response) => {
                     proxy.$modal.msgSuccess('修改成功')
-                    open.value = false
+                    jobDialogConfig.outerVisible = false
                     getList()
                 })
             } else {
                 addJob(form.value).then((response) => {
                     proxy.$modal.msgSuccess('新增成功')
-                    open.value = false
+                    jobDialogConfig.outerVisible = false
                     getList()
                 })
             }
@@ -602,4 +639,24 @@ function handleExport() {
 }
 
 getList()
+
+// 对话框关闭统一处理
+function onCloseJobDialogOuter(visible) {
+    jobDialogConfig.outerVisible = visible
+    if (!visible) {
+        reset()
+    }
+}
+
+function onCloseCronDialogOuter(visible) {
+    cronDialogConfig.outerVisible = visible
+}
+
+function onHideCronDialog() {
+    cronDialogConfig.outerVisible = false
+}
+
+function onCloseViewDialogOuter(visible) {
+    viewDialogConfig.outerVisible = visible
+}
 </script>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index ef581fd..6184983 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -1,181 +1,214 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="任务名称" prop="jobName">
-            <el-input
-               v-model="queryParams.jobName"
-               placeholder="请输入任务名称"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryRef"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+        >
+            <el-form-item label="任务名称" prop="jobName">
+                <el-input
+                    v-model="queryParams.jobName"
+                    placeholder="请输入任务名称"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="任务组名" prop="jobGroup">
+                <el-select
+                    v-model="queryParams.jobGroup"
+                    placeholder="请选择任务组名"
+                    clearable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="dict in sys_job_group"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="执行状态" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="请选择执行状态"
+                    clearable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="dict in sys_common_status"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="执行时间" style="width: 308px">
+                <el-date-picker
+                    v-model="dateRange"
+                    value-format="YYYY-MM-DD"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="Delete"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['monitor:job:remove']"
+                    >删除</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="Delete"
+                    @click="handleClean"
+                    v-hasPermi="['monitor:job:remove']"
+                    >清空</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="Download"
+                    @click="handleExport"
+                    v-hasPermi="['monitor:job:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
+            <el-table-column
+                label="任务名称"
+                align="center"
+                prop="jobName"
+                :show-overflow-tooltip="true"
             />
-         </el-form-item>
-         <el-form-item label="任务组名" prop="jobGroup">
-            <el-select
-               v-model="queryParams.jobGroup"
-               placeholder="请选择任务组名"
-               clearable
-               style="width: 240px"
+            <el-table-column
+                label="任务组名"
+                align="center"
+                prop="jobGroup"
+                :show-overflow-tooltip="true"
             >
-               <el-option
-                  v-for="dict in sys_job_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="执行状态" prop="status">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="请选择执行状态"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_common_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="执行时间" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-            ></el-date-picker>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+                <template #default="scope">
+                    <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="调用目标字符串"
+                align="center"
+                prop="invokeTarget"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="日志信息"
+                align="center"
+                prop="jobMessage"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column label="执行状态" align="center" prop="status">
+                <template #default="scope">
+                    <dict-tag :options="sys_common_status" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template #default="scope">
+                    <el-button
+                        link
+                        type="primary"
+                        icon="View"
+                        @click="handleView(scope.row)"
+                        v-hasPermi="['monitor:job:query']"
+                        >详细</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:job:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:job:remove']"
-            >清空</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:job:export']"
-            >导出</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button 
-               type="warning" 
-               plain 
-               icon="Close"
-               @click="handleClose"
-            >关闭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-      <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-         <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-         <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
-            <template #default="scope">
-               <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
+        <!-- 调度日志详细 -->
+        <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
+            <el-form :model="form" label-width="100px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
+                        <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
+                        <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="执行状态：">
+                            <div v-if="form.status == 0">正常</div>
+                            <div v-else-if="form.status == 1">失败</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="异常信息：" v-if="form.status == 1">{{
+                            form.exceptionInfo
+                        }}</el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="open = false">关 闭</el-button>
+                </div>
             </template>
-         </el-table-column>
-         <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-         <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
-         <el-table-column label="执行状态" align="center" prop="status">
-            <template #default="scope">
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="执行时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 调度日志详细 -->
-      <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
-         <el-form :model="form" label-width="100px">
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
-                  <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
-                  <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="执行状态：">
-                     <div v-if="form.status == 0">正常</div>
-                     <div v-else-if="form.status == 1">失败</div>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button @click="open = false">关 闭</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script setup name="JobLog">
-import { getJob } from "@/api/monitor/job"
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog"
+import { getJob } from '@/api/monitor/job'
+import { listJobLog, delJobLog, cleanJobLog } from '@/api/monitor/jobLog'
 
 const { proxy } = getCurrentInstance()
-const { sys_common_status, sys_job_group } = proxy.useDict("sys_common_status", "sys_job_group")
+const { sys_common_status, sys_job_group } = proxy.useDict('sys_common_status', 'sys_job_group')
 
 const jobLogList = ref([])
 const open = ref(false)
@@ -188,96 +221,108 @@ const dateRange = ref([])
 const route = useRoute()
 
 const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    dictName: undefined,
-    dictType: undefined,
-    status: undefined
-  }
+    form: {},
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined,
+    },
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询调度日志列表 */
 function getList() {
-  loading.value = true
-  listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    jobLogList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+    loading.value = true
+    listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
+        jobLogList.value = response.rows
+        total.value = response.total
+        loading.value = false
+    })
 }
 
 // 返回按钮
 function handleClose() {
-  const obj = { path: "/monitor/job" }
-  proxy.$tab.closeOpenPage(obj)
+    const obj = { path: '/monitor/job' }
+    proxy.$tab.closeOpenPage(obj)
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+    queryParams.value.pageNum = 1
+    getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  dateRange.value = []
-  proxy.resetForm("queryRef")
-  handleQuery()
+    dateRange.value = []
+    proxy.resetForm('queryRef')
+    handleQuery()
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.jobLogId)
-  multiple.value = !selection.length
+    ids.value = selection.map((item) => item.jobLogId)
+    multiple.value = !selection.length
 }
 
 /** 详细按钮操作 */
 function handleView(row) {
-  open.value = true
-  form.value = row
+    open.value = true
+    form.value = row
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?').then(function () {
-    return delJobLog(ids.value)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    proxy.$modal
+        .confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?')
+        .then(function () {
+            return delJobLog(ids.value)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
 }
 
 /** 清空按钮操作 */
 function handleClean() {
-  proxy.$modal.confirm("是否确认清空所有调度日志数据项?").then(function () {
-    return cleanJobLog()
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("清空成功")
-  }).catch(() => {})
+    proxy.$modal
+        .confirm('是否确认清空所有调度日志数据项?')
+        .then(function () {
+            return cleanJobLog()
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('清空成功')
+        })
+        .catch(() => {})
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("monitor/jobLog/export", {
-    ...queryParams.value,
-  }, `job_log_${new Date().getTime()}.xlsx`)
+    proxy.download(
+        'monitor/jobLog/export',
+        {
+            ...queryParams.value,
+        },
+        `job_log_${new Date().getTime()}.xlsx`,
+    )
 }
 
-(() => {
-  const jobId = route.params && route.params.jobId
-  if (jobId !== undefined && jobId != 0) {
-    getJob(jobId).then(response => {
-      queryParams.value.jobName = response.data.jobName
-      queryParams.value.jobGroup = response.data.jobGroup
-      getList()
-    })
-  } else {
-    getList()
-  }
+;(() => {
+    const jobId = route.params && route.params.jobId
+    if (jobId !== undefined && jobId != 0) {
+        getJob(jobId).then((response) => {
+            queryParams.value.jobName = response.data.jobName
+            queryParams.value.jobGroup = response.data.jobGroup
+            getList()
+        })
+    } else {
+        getList()
+    }
 })()
 </script>
diff --git a/src/views/sMsSendManage/loopSend/index.vue b/src/views/sMsSendManage/loopSend/index.vue
index c2f11b0..814cf47 100644
--- a/src/views/sMsSendManage/loopSend/index.vue
+++ b/src/views/sMsSendManage/loopSend/index.vue
@@ -1,9 +1,16 @@
 <template>
     <div class="app-container">
         <!-- 循环发送短信列表 -->
-        <div class="table-wrapper">
-            <!-- 表格工具栏区域 -->
-            <div class="table-toolbar">
+        <ComTable
+            ref="comTableRef"
+            :form-columns="formColumns"
+            :table-columns="tableColumns"
+            :load-data="listLoopSendAPI"
+            :show-toolbar="true"
+            :show-action="true"
+            :action-columns="actionColumns"
+        >
+            <template #toolbar>
                 <div class="toolbar-left">
                     <ComButton
                         type="primary"
@@ -13,41 +20,24 @@
                     >
                         新建
                     </ComButton>
+                    <span v-if="smsBalance !== null" class="sms-balance-text">
+                        短信余额剩余 {{ smsBalance }} 条
+                        <span v-if="smsBalance < 10000">，请及时充值！</span>
+                    </span>
                 </div>
-                <div class="toolbar-right">
-                    <!-- 短信余额提醒 -->
-                    <el-alert
-                        v-if="smsBalance !== null"
-                        :title="`短信余额剩余 ${smsBalance} 条，请及时充值！`"
-                        type="warning"
-                        :closable="false"
-                        show-icon
-                        class="balance-alert"
-                    />
-                </div>
-            </div>
+            </template>
 
-            <ComTable
-                ref="comTableRef"
-                :form-columns="formColumns"
-                :table-columns="tableColumns"
-                :load-data="listLoopSendAPI"
-                :show-toolbar="false"
-                :show-action="true"
-                :action-columns="actionColumns"
-            >
-                <template #taskStatus="{ row }">
-                    <el-switch
-                        active-value="0"
-                        inactive-value="1"
-                        :model-value="getTaskStatusValue(row)"
-                        :loading="getSwitchLoading(row.id)"
-                        :disabled="getSwitchLoading(row.id)"
-                        @change="(value) => debouncedStatusChange(value, row)"
-                    />
-                </template>
-            </ComTable>
-        </div>
+            <template #taskStatus="{ row }">
+                <el-switch
+                    active-value="0"
+                    inactive-value="1"
+                    :model-value="getTaskStatusValue(row)"
+                    :loading="getSwitchLoading(row.id)"
+                    :disabled="getSwitchLoading(row.id)"
+                    @change="(value) => debouncedStatusChange(value, row)"
+                />
+            </template>
+        </ComTable>
     </div>
 </template>
 
@@ -224,58 +214,15 @@ onMounted(() => {
     padding: 20px;
 }
 
-.table-wrapper {
-    display: flex;
-    flex-direction: column;
-    gap: 0;
-}
-
-.table-toolbar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16px;
-    padding: 0;
-}
-
 .toolbar-left {
     display: flex;
     align-items: center;
     gap: 12px;
 }
 
-.toolbar-right {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-}
-
-.balance-alert {
-    margin: 0;
-    max-width: 400px;
-
-    :deep(.el-alert__content) {
-        .el-alert__title {
-            font-size: 14px;
-            font-weight: 500;
-            color: #e6a23c;
-        }
-    }
-}
-
-@media (max-width: 768px) {
-    .table-toolbar {
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 12px;
-    }
-
-    .toolbar-right {
-        width: 100%;
-    }
-
-    .balance-alert {
-        max-width: 100%;
-    }
+.sms-balance-text {
+    margin-left: 16px;
+    font-size: 14px;
+    color: #f56c6c;
 }
 </style>