From 6666ce5526b1ed17f5c3906c94620cad586745a5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 六月 2024 17:01:39 +0800
Subject: [PATCH] 优化代码

---
 src/views/monitor/job/index.vue |   92 +++++++++++++++++++++------------------------
 1 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index aab4ba4..1f36520 100644
--- a/src/views/monitor/job/index.vue
+++ b/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">
@@ -204,7 +180,7 @@
                </el-col>
                <el-col :span="24">
                   <el-form-item label="cron琛ㄨ揪寮�" prop="cronExpression">
-                     <el-input v-model="form.cronExpression" placeholder="璇疯緭鍏ron鎵ц琛ㄨ揪寮�" readonly>
+                     <el-input v-model="form.cronExpression" placeholder="璇疯緭鍏ron鎵ц琛ㄨ揪寮�">
                         <template #append>
                            <el-button type="primary" @click="handleShowCron">
                               鐢熸垚琛ㄨ揪寮�
@@ -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">姝e父</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">
@@ -355,15 +331,18 @@
     loading.value = false;
   });
 }
+
 /** 浠诲姟缁勫悕瀛楀吀缈昏瘧 */
 function jobGroupFormat(row, column) {
   return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
 }
+
 /** 鍙栨秷鎸夐挳 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 琛ㄥ崟閲嶇疆 */
 function reset() {
   form.value = {
@@ -378,22 +357,26 @@
   };
   proxy.resetForm("jobRef");
 }
+
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
 }
+
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 // 澶氶�夋閫変腑鏁版嵁
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.jobId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
+
 // 鏇村鎿嶄綔瑙﹀彂
 function handleCommand(command, row) {
   switch (command) {
@@ -410,6 +393,7 @@
       break;
   }
 }
+
 // 浠诲姟鐘舵�佷慨鏀�
 function handleStatusChange(row) {
   let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
@@ -421,6 +405,7 @@
     row.status = row.status === "0" ? "1" : "0";
   });
 }
+
 /* 绔嬪嵆鎵ц涓�娆� */
 function handleRun(row) {
   proxy.$modal.confirm('纭瑕佺珛鍗虫墽琛屼竴娆�"' + row.jobName + '"浠诲姟鍚�?').then(function () {
@@ -429,6 +414,7 @@
     proxy.$modal.msgSuccess("鎵ц鎴愬姛");})
   .catch(() => {});
 }
+
 /** 浠诲姟璇︾粏淇℃伅 */
 function handleView(row) {
   getJob(row.jobId).then(response => {
@@ -436,26 +422,31 @@
     openView.value = true;
   });
 }
+
 /** cron琛ㄨ揪寮忔寜閽搷浣� */
 function handleShowCron() {
   expression.value = form.value.cronExpression;
   openCron.value = true;
 }
+
 /** 纭畾鍚庡洖浼犲�� */
 function crontabFill(value) {
   form.value.cronExpression = value;
 }
+
 /** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
 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() {
   reset();
   open.value = true;
   title.value = "娣诲姞浠诲姟";
 }
+
 /** 淇敼鎸夐挳鎿嶄綔 */
 function handleUpdate(row) {
   reset();
@@ -466,6 +457,7 @@
     title.value = "淇敼浠诲姟";
   });
 }
+
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {
   proxy.$refs["jobRef"].validate(valid => {
@@ -486,6 +478,7 @@
     }
   });
 }
+
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
   const jobIds = row.jobId || ids.value;
@@ -496,6 +489,7 @@
     proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
   }).catch(() => {});
 }
+
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 function handleExport() {
   proxy.download("monitor/job/export", {

--
Gitblit v1.9.3