diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 77dd96b..3a8f4c6 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,168 +1,173 @@ -import { - login, - logout, - getInfo, - loginOss -} from '@/api/user' -import { - getToken, - setToken, - removeToken -} from '@/utils/auth' -import { - resetRouter -} from '@/router' - -const getDefaultState = () => { - return { - token: getToken(), - name: '', - avatar: '', - roles: [] - } -} - -const state = getDefaultState() - -const mutations = { - RESET_STATE: (state) => { - Object.assign(state, getDefaultState()) - }, - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_NAME: (state, name) => { - state.name = name - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - }, - SET_ROLES: (state, roles) => { - state.roles = roles - } -} - -const actions = { - loginskip({ - commit - }, userInfo) { - const { - token, +import { + login, + logout, + getInfo, + loginOss +} from '@/api/user' +import { + getToken, + setToken, + removeToken +} from '@/utils/auth' +import { + resetRouter +} from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + info: {}, + avatar: '', + roles: [] + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_INFO: (state, info) => { + state.info = info + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + }, + SET_ROLES: (state, roles) => { + state.roles = roles + } +} + +const actions = { + loginskip({ + commit + }, userInfo) { + const { + token, tp, - loginId - } = userInfo - - return new Promise((resolve, reject) => { - loginOss({ - token: token, - tp: tp, - loginId: loginId + loginId + } = userInfo + + return new Promise((resolve, reject) => { + loginOss({ + token: token, + tp: tp, + loginId: loginId }).then(response => { - + //console.log(response) - - const { - data - } = response; - console.log(response.access_token) - commit('SET_TOKEN', response.access_token) - setToken(response.access_token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - // user login - login({ - commit - }, userInfo) { - const { - username, - password - } = userInfo - return new Promise((resolve, reject) => { - login({ - username: username.trim(), - password: password - }).then(response => { - console.log(response) - const { - data - } = response; - console.log(response.access_token) - commit('SET_TOKEN', response.access_token) - setToken(response.access_token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // get user info - getInfo({ - commit, - state - }) { - return new Promise((resolve, reject) => { - getInfo(state.token).then(response => { - - if (!response) { - reject('身份验证失败请重新登录') - } - response["roles"] = ["admin"]; - const { - roles, - name, - avatar - } = response - - - - commit('SET_ROLES', roles) - commit('SET_NAME', name) - commit('SET_AVATAR', avatar) - resolve(response) - }).catch(error => { - reject(error) - }) - }) - }, - - // user logout - logout({ - commit, - state - }) { + + const { + data + } = response; + console.log(response.access_token) + commit('SET_TOKEN', response.access_token) + setToken(response.access_token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + // user login + login({ + commit + }, userInfo) { + const { + username, + password + } = userInfo return new Promise((resolve, reject) => { - console.log("logout",state.token) - logout(state.token).then(() => { - removeToken() // must remove token first - resetRouter() - commit('RESET_STATE') - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // remove token - resetToken({ - commit - }) { - return new Promise(resolve => { - removeToken() // must remove token first - commit('RESET_STATE') - resolve() - }) - } -} - -export default { - namespaced: true, - state, - mutations, - actions + login({ + username: username.trim(), + password: password + }).then(response => { + console.log(response) + const { + data + } = response; + console.log(response.access_token) + commit('SET_TOKEN', response.access_token) + setToken(response.access_token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ + commit, + state + }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + + if (!response) { + reject('身份验证失败请重新登录') + } + response["roles"] = ["admin"]; + const { + roles, + name, + avatar + } = response + + + + commit('SET_ROLES', roles) + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + commit('SET_INFO', response) + resolve(response) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ + commit, + state + }) { + return new Promise((resolve, reject) => { + console.log("logout",state.token) + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ + commit + }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions } diff --git a/src/views/finance/components/file.vue b/src/views/finance/components/file.vue index 68921c5..8fd7846 100644 --- a/src/views/finance/components/file.vue +++ b/src/views/finance/components/file.vue @@ -66,6 +66,7 @@ export default { width: 100, align: "left", render: (h, { row }) => { + if (this.role == 0 || this.role == 1) return h("Poptip", { props: { transfer: true, diff --git a/src/views/statisticalReport/components/addGovPlane.vue b/src/views/statisticalReport/components/addGovPlane.vue index c141d85..936d766 100644 --- a/src/views/statisticalReport/components/addGovPlane.vue +++ b/src/views/statisticalReport/components/addGovPlane.vue @@ -28,6 +28,32 @@ +