From cb80de3742d66cfee20bc3136c735e5ca5a7d45c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:44:42 +0800
Subject: [PATCH] 优化字典标签支持自定义分隔符

---
 src/views/monitor/job/log.vue |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 6bc0724..803dbbd 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -6,7 +6,6 @@
                v-model="queryParams.jobName"
                placeholder="璇疯緭鍏ヤ换鍔″悕绉�"
                clearable
-               size="small"
                style="width: 240px"
                @keyup.enter="handleQuery"
             />
@@ -14,9 +13,8 @@
          <el-form-item label="浠诲姟缁勫悕" prop="jobGroup">
             <el-select
                v-model="queryParams.jobGroup"
-               placeholder="璇蜂换鍔＄粍鍚�"
+               placeholder="璇烽�夋嫨浠诲姟缁勫悕"
                clearable
-               size="small"
                style="width: 240px"
             >
                <el-option
@@ -32,7 +30,6 @@
                v-model="queryParams.status"
                placeholder="璇烽�夋嫨鎵ц鐘舵��"
                clearable
-               size="small"
                style="width: 240px"
             >
                <el-option
@@ -43,11 +40,9 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="鎵ц鏃堕棿">
+         <el-form-item label="鎵ц鏃堕棿" style="width: 308px">
             <el-date-picker
                v-model="dateRange"
-               size="small"
-               style="width: 240px"
                value-format="YYYY-MM-DD"
                type="daterange"
                range-separator="-"
@@ -56,8 +51,8 @@
             ></el-date-picker>
          </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>
 
@@ -67,7 +62,6 @@
                type="danger"
                plain
                icon="Delete"
-               size="mini"
                :disabled="multiple"
                @click="handleDelete"
                v-hasPermi="['monitor:job:remove']"
@@ -78,7 +72,6 @@
                type="danger"
                plain
                icon="Delete"
-               size="mini"
                @click="handleClean"
                v-hasPermi="['monitor:job:remove']"
             >娓呯┖</el-button>
@@ -88,7 +81,6 @@
                type="warning"
                plain
                icon="Download"
-               size="mini"
                @click="handleExport"
                v-hasPermi="['monitor:job:export']"
             >瀵煎嚭</el-button>
@@ -98,7 +90,6 @@
                type="warning" 
                plain 
                icon="Close"
-               size="mini"
                @click="handleClose"
             >鍏抽棴</el-button>
          </el-col>
@@ -128,13 +119,7 @@
          </el-table-column>
          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button
-                  size="mini"
-                  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>
             </template>
          </el-table-column>
       </el-table>
@@ -149,7 +134,7 @@
 
       <!-- 璋冨害鏃ュ織璇︾粏 -->
       <el-dialog title="璋冨害鏃ュ織璇︾粏" v-model="open" width="700px" append-to-body>
-         <el-form :model="form" label-width="100px" size="mini">
+         <el-form :model="form" label-width="100px">
             <el-row>
                <el-col :span="12">
                   <el-form-item label="鏃ュ織搴忓彿锛�">{{ form.jobLogId }}</el-form-item>
@@ -276,7 +261,7 @@
 }
 
 (() => {
-  const jobId = route.query.jobId;
+  const jobId = route.params && route.params.jobId;
   if (jobId !== undefined && jobId != 0) {
     getJob(jobId).then(response => {
       queryParams.value.jobName = response.data.jobName;

--
Gitblit v1.9.3