From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 18 八月 2021 11:11:24 +0800 Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev --- ruoyi-ui/src/views/system/oss/config.vue | 41 ++++++++++++++--------------------------- 1 files changed, 14 insertions(+), 27 deletions(-) diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue index 9cd528c..c6ea3a6 100644 --- a/ruoyi-ui/src/views/system/oss/config.vue +++ b/ruoyi-ui/src/views/system/oss/config.vue @@ -69,17 +69,6 @@ v-hasPermi="['system:oss:remove']" >鍒犻櫎</el-button> </el-col> - <el-col :span="1.5"> - <el-button - type="warning" - plain - icon="el-icon-download" - size="mini" - :loading="exportLoading" - @click="handleExport" - v-hasPermi="['system:ossConfig:export']" - >瀵煎嚭</el-button> - </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> @@ -168,15 +157,6 @@ </el-form-item> <el-form-item label="鍩�" prop="region"> <el-input v-model="form.region" placeholder="璇疯緭鍏ュ煙" /> - </el-form-item> - <el-form-item label="鐘舵��"> - <el-radio-group v-model="form.status"> - <el-radio - v-for="dict in statusOptions" - :key="dict.dictValue" - :label="dict.dictValue" - >{{dict.dictLabel}}</el-radio> - </el-radio-group> </el-form-item> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> @@ -345,6 +325,12 @@ this.resetForm("queryForm"); this.handleQuery(); }, + // 澶氶�夋閫変腑鏁版嵁 + handleSelectionChange(selection) { + this.ids = selection.map(item => item.ossConfigId) + this.single = selection.length!==1 + this.multiple = !selection.length + }, /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); @@ -402,7 +388,9 @@ this.loading = false; this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + }).finally(() => { + this.loading = false; + }); }, // 浜戝瓨鍌ㄩ厤缃姸鎬佷慨鏀� handleStatusChange(row) { @@ -412,16 +400,15 @@ confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", type: "warning", - }).then(function () { + }).then(() => { return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey); }).then(() => { this.getList() this.msgSuccess(text + "鎴愬姛"); - }).catch(function () { + }).catch(() => { row.status = row.status === "0" ? "1" : "0"; - }).finally(() => { - }); - }, - }, + }) + } + } }; </script> -- Gitblit v1.9.3