diff --git a/src/api/system/menu.js b/src/api/system/menu.js index f6415c6..87af6c3 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -57,4 +57,4 @@ export function delMenu(menuId) { url: '/system/menu/' + menuId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 89c5059..0f5eaae 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -311,6 +311,7 @@ export default { refreshTable: true, // 查询参数 queryParams: { + parentId: 0, menuName: undefined, visible: undefined }, @@ -342,6 +343,7 @@ export default { getList() { this.loading = true; listMenu(this.queryParams).then(response => { + console.log(response) this.menuList = this.handleTree(response.data, "menuId"); this.loading = false; }); diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 8414e76..caf31e7 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -638,10 +638,12 @@ export default { inputPattern: /^.{5,20}$/, inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" }).then(({value}) => { - resetUserPwd(row.userId, value).then(response => { this.$modal.msgSuccess("修改成功,新密码是:" + value); - forceLogout(tokenId) + if(tokenId!==""){ + forceLogout(tokenId) + } + }); }).catch(() => { }); diff --git a/vue.config.js b/vue.config.js index dd8b15d..6e14aed 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:8080`, + target: `http://localhost:8081`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''