From 06513446a0a4a993d17e7bb8085f7bf7dfb4597c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期六, 29 五月 2021 19:44:33 +0800 Subject: [PATCH] update 还原数据权限修改 --- ruoyi-ui/src/views/monitor/job/index.vue | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 3a69360..8074287 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" @@ -40,6 +40,7 @@ <el-col :span="1.5"> <el-button type="primary" + plain icon="el-icon-plus" size="mini" @click="handleAdd" @@ -49,6 +50,7 @@ <el-col :span="1.5"> <el-button type="success" + plain icon="el-icon-edit" size="mini" :disabled="single" @@ -59,6 +61,7 @@ <el-col :span="1.5"> <el-button type="danger" + plain icon="el-icon-delete" size="mini" :disabled="multiple" @@ -69,8 +72,10 @@ <el-col :span="1.5"> <el-button type="warning" + plain icon="el-icon-download" size="mini" + :loading="exportLoading" @click="handleExport" v-hasPermi="['monitor:job:export']" >瀵煎嚭</el-button> @@ -78,12 +83,14 @@ <el-col :span="1.5"> <el-button type="info" + plain icon="el-icon-s-operation" size="mini" @click="handleJobLog" v-hasPermi="['monitor:job:query']" >鏃ュ織</el-button> </el-col> + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange"> @@ -110,7 +117,7 @@ type="text" icon="el-icon-caret-right" @click="handleRun(scope.row)" - v-hasPermi="['monitor:job:edit']" + v-hasPermi="['monitor:job:changeStatus']" >鎵ц涓�娆�</el-button> <el-button size="mini" @@ -133,7 +140,7 @@ <!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 --> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body> - <el-form ref="form" :model="form" :rules="rules" label-width="100px"> + <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> <el-col :span="12"> <el-form-item label="浠诲姟鍚嶇О" prop="jobName"> @@ -268,12 +275,16 @@ return { // 閬僵灞� loading: true, + // 瀵煎嚭閬僵灞� + exportLoading: false, // 閫変腑鏁扮粍 ids: [], // 闈炲崟涓鐢� single: true, // 闈炲涓鐢� multiple: true, + // 鏄剧ず鎼滅储鏉′欢 + showSearch: true, // 鎬绘潯鏁� total: 0, // 瀹氭椂浠诲姟琛ㄦ牸鏁版嵁 @@ -399,7 +410,7 @@ return runJob(row.jobId, row.jobGroup); }).then(() => { this.msgSuccess("鎵ц鎴愬姛"); - }).catch(function() {}); + }) }, /** 浠诲姟璇︾粏淇℃伅 */ handleView(row) { @@ -434,23 +445,15 @@ if (valid) { if (this.form.jobId != undefined) { updateJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } else { - this.msgError(response.msg); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } else { - this.msgError(response.msg); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -468,7 +471,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -477,12 +480,14 @@ confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning" - }).then(function() { + }).then(() => { + this.exportLoading = true; return exportJob(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + this.exportLoading = false; + }) } } }; -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3