From 26dfee2ce8ac0112d698bffdb66c0e3ca5bf61d1 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期三, 05 八月 2020 10:24:54 +0800
Subject: [PATCH] 彻底重写回显数据字典方法

---
 ruoyi-ui/src/views/monitor/job/index.vue |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 7c01fd7..bd39c16 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
@@ -84,6 +84,14 @@
           v-hasPermi="['monitor:job:query']"
         >鏃ュ織</el-button>
       </el-col>
+      <div class="top-right-btn">
+        <el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
+          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
+        </el-tooltip>
+        <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top">
+          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
+        </el-tooltip>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
@@ -132,8 +140,8 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="浠诲姟鍚嶇О" prop="jobName">
@@ -210,7 +218,7 @@
     </el-dialog>
 
     <!-- 浠诲姟鏃ュ織璇︾粏 -->
-    <el-dialog title="浠诲姟璇︾粏" :visible.sync="openView" width="700px">
+    <el-dialog title="浠诲姟璇︾粏" :visible.sync="openView" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -238,8 +246,8 @@
           </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>
+              <div v-if="form.concurrent == 0">鍏佽</div>
+              <div v-else-if="form.concurrent == 1">绂佹</div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -274,6 +282,8 @@
       single: true,
       // 闈炲涓鐢�
       multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
       // 瀹氭椂浠诲姟琛ㄦ牸鏁版嵁
@@ -397,7 +407,7 @@
           type: "warning"
         }).then(function() {
           return runJob(row.jobId, row.jobGroup);
-        }).then(function() {
+        }).then(() => {
           this.msgSuccess("鎵ц鎴愬姛");
         }).catch(function() {});
     },
@@ -438,8 +448,6 @@
                 this.msgSuccess("淇敼鎴愬姛");
                 this.open = false;
                 this.getList();
-              } else {
-                this.msgError(response.msg);
               }
             });
           } else {
@@ -448,8 +456,6 @@
                 this.msgSuccess("鏂板鎴愬姛");
                 this.open = false;
                 this.getList();
-              } else {
-                this.msgError(response.msg);
               }
             });
           }

--
Gitblit v1.9.3