From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-ui/src/views/system/oss/config.vue | 78 +++++++++++----------------------------
1 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue
index 446085c..152727e 100644
--- a/ruoyi-ui/src/views/system/oss/config.vue
+++ b/ruoyi-ui/src/views/system/oss/config.vue
@@ -23,10 +23,10 @@
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable size="small">
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -68,17 +68,6 @@
@click="handleDelete"
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>
@@ -129,7 +118,7 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀逛簯瀛樺偍閰嶇疆瀵硅瘽妗� -->
+ <!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="閰嶇疆key" prop="configKey">
@@ -149,7 +138,7 @@
<el-input v-model="form.accessKey" placeholder="璇疯緭鍏ccessKey" />
</el-form-item>
<el-form-item label="secretKey" prop="secretKey">
- <el-input v-model="form.secretKey" placeholder="璇疯緭鍏ョ閽�" />
+ <el-input v-model="form.secretKey" placeholder="璇疯緭鍏ョ閽�" show-password />
</el-form-item>
<el-form-item label="妗跺悕绉�" prop="bucketName">
<el-input v-model="form.bucketName" placeholder="璇疯緭鍏ユ《鍚嶇О" />
@@ -160,23 +149,14 @@
<el-form-item label="鏄惁HTTPS">
<el-radio-group v-model="form.isHttps">
<el-radio
- v-for="dict in isHttpsOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</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="璇疯緭鍏ュ唴瀹�" />
@@ -203,6 +183,7 @@
export default {
name: "OssConfig",
+ dicts: ['sys_yes_no', 'sys_normal_disable'],
data() {
return {
// 鎸夐挳loading
@@ -221,7 +202,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // 浜戝瓨鍌ㄩ厤缃〃鏍兼暟鎹�
+ // 瀵硅薄瀛樺偍閰嶇疆琛ㄦ牸鏁版嵁
ossConfigList: [],
// configKeyOptions
configKeyOptions: [],
@@ -295,16 +276,10 @@
},
created() {
this.getList();
- this.getDicts("sys_yes_no").then(response => {
- this.isHttpsOptions = response.data;
- });
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
this.configKeyOptions = this.configKeyDatas;
},
methods: {
- /** 鏌ヨ浜戝瓨鍌ㄩ厤缃垪琛� */
+ /** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */
getList() {
this.loading = true;
listOssConfig(this.queryParams).then((response) => {
@@ -355,7 +330,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞浜戝瓨鍌ㄩ厤缃�";
+ this.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -366,7 +341,7 @@
this.loading = false;
this.form = response.data;
this.open = true;
- this.title = "淇敼浜戝瓨鍌ㄩ厤缃�";
+ this.title = "淇敼瀵硅薄瀛樺偍閰嶇疆";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -376,7 +351,7 @@
this.buttonLoading = true;
if (this.form.ossConfigId != null) {
updateOssConfig(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -384,7 +359,7 @@
});
} else {
addOssConfig(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -397,34 +372,25 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossConfigIds = row.ossConfigId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎浜戝瓨鍌ㄩ厤缃紪鍙蜂负"' + ossConfigIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎瀵硅薄瀛樺偍閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?').then(() => {
this.loading = true;
return delOssConfig(ossConfigIds);
}).then(() => {
this.loading = false;
this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).finally(() => {
this.loading = false;
});
},
- // 浜戝瓨鍌ㄩ厤缃姸鎬佷慨鏀�
+ // 瀵硅薄瀛樺偍閰嶇疆鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$confirm(
- '纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- }).then(() => {
+ this.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?').then(() => {
return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
}).then(() => {
this.getList()
- this.msgSuccess(text + "鎴愬姛");
+ this.$modal.msgSuccess(text + "鎴愬姛");
}).catch(() => {
row.status = row.status === "0" ? "1" : "0";
})
--
Gitblit v1.9.3