From 8ca53c7666756073f2103a9235f927faf84a151e Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 12 十月 2020 09:54:59 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue --- ruoyi-ui/src/views/system/dict/data.vue | 20 +-- ruoyi-ui/src/views/monitor/online/index.vue | 2 ruoyi-ui/src/views/monitor/job/log.vue | 6 ruoyi-ui/src/views/tool/gen/index.vue | 4 ruoyi-ui/src/views/system/user/profile/resetPwd.vue | 4 ruoyi-ui/src/views/system/notice/index.vue | 18 +- ruoyi-ui/src/views/system/role/index.vue | 28 +-- ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 20 +-- ruoyi-ui/src/views/system/menu/index.vue | 34 ++--- ruoyi-ui/src/views/system/user/index.vue | 24 +-- ruoyi-ui/src/views/system/dept/index.vue | 18 +- pom.xml | 3 ruoyi-ui/src/views/monitor/job/index.vue | 22 +-- ruoyi-ui/src/views/monitor/operlog/index.vue | 6 ruoyi-ui/src/views/system/config/index.vue | 24 +-- ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 18 +- ruoyi-ui/src/views/system/dict/index.vue | 20 +-- ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 10 - ruoyi-ui/src/views/monitor/logininfor/index.vue | 6 ruoyi-ui/src/views/system/user/profile/userInfo.vue | 6 ruoyi-ui/src/views/system/post/index.vue | 20 +-- 21 files changed, 126 insertions(+), 187 deletions(-) diff --git a/pom.xml b/pom.xml index 76481d0..923a39a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,12 +18,11 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> - <mybatis.boot.version>1.3.2</mybatis.boot.version> <druid.version>1.2.1</druid.version> <bitwalker.version>1.19</bitwalker.version> <swagger.version>2.9.2</swagger.version> <kaptcha.version>2.3.2</kaptcha.version> - <pagehelper.boot.version>1.2.5</pagehelper.boot.version> + <pagehelper.boot.version>1.3.0</pagehelper.boot.version> <fastjson.version>1.2.74</fastjson.version> <oshi.version>5.2.5</oshi.version> <jna.version>5.5.0</jna.version> diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 10a9862..e139a13 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -420,19 +420,15 @@ #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { add${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -449,7 +445,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 7f34716..129c176 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -436,19 +436,15 @@ #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { add${BusinessName}(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -466,7 +462,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -479,7 +475,7 @@ return export${BusinessName}(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 2b091e7..8c725b2 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -402,7 +402,7 @@ return runJob(row.jobId, row.jobGroup); }).then(() => { this.msgSuccess("鎵ц鎴愬姛"); - }).catch(function() {}); + }) }, /** 浠诲姟璇︾粏淇℃伅 */ handleView(row) { @@ -437,19 +437,15 @@ if (valid) { if (this.form.jobId != undefined) { updateJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addJob(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -467,7 +463,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -480,7 +476,7 @@ return exportJob(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 10299dd..4be2398 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -263,7 +263,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 娓呯┖鎸夐挳鎿嶄綔 */ handleClean() { @@ -276,7 +276,7 @@ }).then(() => { this.getList(); this.msgSuccess("娓呯┖鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -289,7 +289,7 @@ return exportJobLog(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 594433a..c5eb4f5 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -196,7 +196,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 娓呯┖鎸夐挳鎿嶄綔 */ handleClean() { @@ -209,7 +209,7 @@ }).then(() => { this.getList(); this.msgSuccess("娓呯┖鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -222,7 +222,7 @@ return exportLogininfor(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index a80690f..a33614b 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -120,7 +120,7 @@ }).then(() => { this.getList(); this.msgSuccess("寮洪��鎴愬姛"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 92cde1b..dc49ae1 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -284,7 +284,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 娓呯┖鎸夐挳鎿嶄綔 */ handleClean() { @@ -297,7 +297,7 @@ }).then(() => { this.getList(); this.msgSuccess("娓呯┖鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -310,7 +310,7 @@ return exportOperlog(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index f7f4091..82e61d4 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -304,19 +304,15 @@ if (valid) { if (this.form.configId != undefined) { updateConfig(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addConfig(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -334,7 +330,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -347,14 +343,12 @@ return exportConfig(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 娓呯悊缂撳瓨鎸夐挳鎿嶄綔 */ handleClearCache() { clearCache().then(response => { - if (response.code === 200) { - this.msgSuccess("娓呯悊鎴愬姛"); - } + this.msgSuccess("娓呯悊鎴愬姛"); }); } } diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index c1bd98a..93559af 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -284,19 +284,15 @@ if (valid) { if (this.form.deptId != undefined) { updateDept(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addDept(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -313,7 +309,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index b9a5354..b603cdb 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -304,19 +304,15 @@ if (valid) { if (this.form.dictCode != undefined) { updateData(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addData(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -334,7 +330,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -347,7 +343,7 @@ return exportData(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 5976f0b..e106585 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -308,19 +308,15 @@ if (valid) { if (this.form.dictId != undefined) { updateType(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addType(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -338,7 +334,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -351,7 +347,7 @@ return exportType(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 娓呯悊缂撳瓨鎸夐挳鎿嶄綔 */ handleClearCache() { diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index e981140..a3b274d 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -62,16 +62,16 @@ </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> - <el-button size="mini" - type="text" - icon="el-icon-edit" + <el-button size="mini" + type="text" + icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']" >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-plus" + <el-button + size="mini" + type="text" + icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']" >鏂板</el-button> @@ -367,19 +367,15 @@ if (valid) { if (this.form.menuId != undefined) { updateMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -396,8 +392,8 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) } } }; -</script> +</script> \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index d31c2d4..98247e5 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -307,19 +307,15 @@ if (valid) { if (this.form.noticeId != undefined) { updateNotice(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addNotice(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -337,7 +333,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index 2bc84b9..7602d93 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -276,19 +276,15 @@ if (valid) { if (this.form.postId != undefined) { updatePost(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addPost(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -306,7 +302,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -319,7 +315,7 @@ return exportPost(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 38745df..97359c1 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -537,20 +537,16 @@ if (this.form.roleId != undefined) { this.form.menuIds = this.getMenuAllCheckedKeys(); updateRole(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { this.form.menuIds = this.getMenuAllCheckedKeys(); addRole(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -561,11 +557,9 @@ if (this.form.roleId != undefined) { this.form.deptIds = this.getDeptAllCheckedKeys(); dataScope(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.openDataScope = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.openDataScope = false; + this.getList(); }); } }, @@ -581,7 +575,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -594,7 +588,7 @@ return exportRole(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) } } }; diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 955226f..cf04e63 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -582,9 +582,7 @@ cancelButtonText: "鍙栨秷" }).then(({ value }) => { resetUserPwd(row.userId, value).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value); - } + this.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value); }); }).catch(() => {}); }, @@ -594,19 +592,15 @@ if (valid) { if (this.form.userId != undefined) { updateUser(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("淇敼鎴愬姛"); + this.open = false; + this.getList(); }); } else { addUser(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("鏂板鎴愬姛"); - this.open = false; - this.getList(); - } + this.msgSuccess("鏂板鎴愬姛"); + this.open = false; + this.getList(); }); } } @@ -624,7 +618,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -637,7 +631,7 @@ return exportUser(queryParams); }).then(response => { this.download(response.msg); - }).catch(function() {}); + }) }, /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue index 0ff3435..ee65240 100644 --- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue +++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue @@ -57,9 +57,7 @@ if (valid) { updateUserPwd(this.user.oldPassword, this.user.newPassword).then( response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - } + this.msgSuccess("淇敼鎴愬姛"); } ); } diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue index 334cc11..37ae1dd 100644 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue @@ -125,12 +125,10 @@ let formData = new FormData(); formData.append("avatarfile", data); uploadAvatar(formData).then(response => { - if (response.code === 200) { - this.open = false; - this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; - store.commit('SET_AVATAR', this.options.img); - this.msgSuccess("淇敼鎴愬姛"); - } + this.open = false; + this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; + store.commit('SET_AVATAR', this.options.img); + this.msgSuccess("淇敼鎴愬姛"); this.visible = false; }); }); diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue index 48b8537..3627a28 100644 --- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue +++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue @@ -2,7 +2,7 @@ <el-form ref="form" :model="user" :rules="rules" label-width="80px"> <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName"> <el-input v-model="user.nickName" /> - </el-form-item> + </el-form-item> <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber"> <el-input v-model="user.phonenumber" maxlength="11" /> </el-form-item> @@ -62,9 +62,7 @@ this.$refs["form"].validate(valid => { if (valid) { updateUserProfile(this.user).then(response => { - if (response.code === 200) { - this.msgSuccess("淇敼鎴愬姛"); - } + this.msgSuccess("淇敼鎴愬姛"); }); } }); diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index 7e95bfa..732ee64 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -270,7 +270,7 @@ return synchDb(tableName); }).then(() => { this.msgSuccess("鍚屾鎴愬姛"); - }).catch(function() {}); + }) }, /** 鎵撳紑瀵煎叆琛ㄥ脊绐� */ openImportTable() { @@ -313,7 +313,7 @@ }).then(() => { this.getList(); this.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(function() {}); + }) } } }; -- Gitblit v1.9.3