From 28ff2b58165d4b79151afecea569f7fbacb95d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Wed, 24 Feb 2021 22:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-ui/.env.development | 2 + dvadmin-ui/package.json | 7 +-- dvadmin-ui/src/api/system/menu.js | 6 +-- dvadmin-ui/src/store/modules/user.js | 15 +++--- dvadmin-ui/src/views/system/menu/index.vue | 58 ++++++++++------------ dvadmin-ui/vue.config.js | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dvadmin-ui/.env.development b/dvadmin-ui/.env.development index d4ac021..52dbf84 100755 --- a/dvadmin-ui/.env.development +++ b/dvadmin-ui/.env.development @@ -6,3 +6,5 @@ VUE_APP_BASE_API = 'http://127.0.0.1:8000' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true +PORT=8080 +TITLE = 'dvAdmin管理系统' diff --git a/dvadmin-ui/package.json b/dvadmin-ui/package.json index 567842d..7a917c8 100755 --- a/dvadmin-ui/package.json +++ b/dvadmin-ui/package.json @@ -1,8 +1,8 @@ { "name": "ruoyi", "version": "3.3.0", - "description": "若依管理系统", - "author": "若依", + "description": "dvAdmin管理系统", + "author": "dvAdmin", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", @@ -26,6 +26,7 @@ "vue", "admin", "dashboard", + "ruoyi-ui", "element-ui", "boilerplate", "admin-template", @@ -33,7 +34,7 @@ ], "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "https://gitee.com/liqianglog/django-vue-admin.git" }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", diff --git a/dvadmin-ui/src/api/system/menu.js b/dvadmin-ui/src/api/system/menu.js index f6415c6..7517ead 100755 --- a/dvadmin-ui/src/api/system/menu.js +++ b/dvadmin-ui/src/api/system/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询菜单列表 export function listMenu(query) { return request({ - url: '/system/menu/list', + url: '/permission/menus/', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listMenu(query) { // 查询菜单详细 export function getMenu(menuId) { return request({ - url: '/system/menu/' + menuId, + url: '/permission/menus/' + menuId, method: 'get' }) } @@ -57,4 +57,4 @@ export function delMenu(menuId) { url: '/system/menu/' + menuId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/dvadmin-ui/src/store/modules/user.js b/dvadmin-ui/src/store/modules/user.js index 6c1f8d5..79634f6 100755 --- a/dvadmin-ui/src/store/modules/user.js +++ b/dvadmin-ui/src/store/modules/user.js @@ -1,5 +1,6 @@ import { login, logout, getInfo } from '@/api/login' import { getToken, setToken, removeToken } from '@/utils/auth' +import {console} from "vuedraggable/src/util/helper"; const user = { state: { @@ -50,17 +51,17 @@ const user = { GetInfo({ commit, state }) { return new Promise((resolve, reject) => { getInfo(state.token).then(res => { - const user = res.user - const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; - if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLES', res.roles) - commit('SET_PERMISSIONS', res.permissions) + const user = res.data.user + const avatar = user.avatar === "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; + if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 + commit('SET_ROLES', res.data.roles) + commit('SET_PERMISSIONS', res.data.permissions) } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - commit('SET_NAME', user.userName) + commit('SET_NAME', user.name) commit('SET_AVATAR', avatar) - resolve(res) + resolve(res.data) }).catch(error => { reject(error) }) diff --git a/dvadmin-ui/src/views/system/menu/index.vue b/dvadmin-ui/src/views/system/menu/index.vue index 63cecc0..943b3e3 100755 --- a/dvadmin-ui/src/views/system/menu/index.vue +++ b/dvadmin-ui/src/views/system/menu/index.vue @@ -46,33 +46,38 @@ row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" > - + - + - + + + + \ No newline at end of file + diff --git a/dvadmin-ui/vue.config.js b/dvadmin-ui/vue.config.js index c68960b..b6c40b0 100755 --- a/dvadmin-ui/vue.config.js +++ b/dvadmin-ui/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '若依管理系统' // 标题 +const name = defaultSettings.title || 'dvAdmin管理系统' // 标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口