Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
2129f7c90f
|
@ -1,5 +1,5 @@
|
|||
import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
|
||||
import { login,loginOut,getUserMenuTree, getUserPermissions } from '@/api/user'
|
||||
import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user'
|
||||
|
||||
import { resetRouter } from '@/router'
|
||||
import md5 from 'js-md5'
|
||||
|
@ -167,8 +167,8 @@ const actions = {
|
|||
commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
|
||||
commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
|
||||
commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
|
||||
console.log( zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
|
||||
console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
|
||||
console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
|
||||
console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
|
||||
zzSessionStorage.setItem('userName', user.name)
|
||||
zzSessionStorage.setItem('userId', user.id)
|
||||
zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
|
||||
|
@ -180,14 +180,14 @@ const actions = {
|
|||
},
|
||||
// user logout
|
||||
async logout({ commit, state }) {
|
||||
try{
|
||||
try {
|
||||
await loginOut()
|
||||
removeToken() // must remove token first
|
||||
resetRouter()
|
||||
removeName()
|
||||
zzSessionStorage.clear()
|
||||
commit('RESET_STATE')
|
||||
await loginOut()
|
||||
}catch(e){
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
|
|
|
@ -342,7 +342,7 @@ export default {
|
|||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style lang="scss" scoped>
|
||||
.trial-myinfo{
|
||||
background: #f3f3f3;
|
||||
flex: 1;overflow: auto;display: flex;flex-direction: row;justify-content: space-around;
|
||||
|
|
Loading…
Reference in New Issue