diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index f1de25c..bbe7a3a 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -4,9 +4,11 @@ import { getToken, setToken, removeToken } from '@/utils/auth'
const user = {
state: {
token: getToken(),
+ admin: '',
id: '',
name: '',
nickName: '',
+ deptId: '',
avatar: '',
roles: [],
permissions: []
@@ -16,6 +18,9 @@ const user = {
SET_TOKEN: (state, token) => {
state.token = token
},
+ SET_ADMIN: (state, admin) => {
+ state.admin = admin
+ },
SET_ID: (state, id) => {
state.id = id
},
@@ -25,6 +30,9 @@ const user = {
SET_NICKNAME: (state, nickName) => {
state.nickName = nickName
},
+ SET_DEPTID: (state, deptId) => {
+ state.deptId = deptId
+ },
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
},
@@ -66,9 +74,11 @@ const user = {
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ commit('SET_ADMIN', user.admin)
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
commit('SET_NICKNAME', user.nickName)
+ commit('SET_DEPTID', user.deptId)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
diff --git a/ruoyi-ui/src/views/szxc/butie/index.vue b/ruoyi-ui/src/views/szxc/butie/index.vue
index 2c44f1e..d9a12c9 100644
--- a/ruoyi-ui/src/views/szxc/butie/index.vue
+++ b/ruoyi-ui/src/views/szxc/butie/index.vue
@@ -140,7 +140,7 @@
v-hasPermi="['szxc:butie:remove']"
>删除
删除
删除
删除
整改进度