XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is running Details

uat_us
caiyiling 2025-01-03 17:02:29 +08:00
parent 5963fc629d 44feb21f63
commit 28bb98099c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/store/modules/user.js
View File

@ -137,12 +137,12 @@ const actions = {
commit('SET_USERNAME', data.BasicInfo.UserName) commit('SET_USERNAME', data.BasicInfo.UserName)
setToken(data.JWTStr) setToken(data.JWTStr)
// setName(data.BasicInfo.RealName) // setName(data.BasicInfo.RealName)
const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')))) // const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
const user = JSON.parse(userString) // const user = JSON.parse(userString)
// zzSessionStorage.setItem('userId', user.identityUserId) // zzSessionStorage.setItem('userId', user.identityUserId)
commit('SET_IDENTITYUSERID', user.identityUserId) // commit('SET_IDENTITYUSERID', user.identityUserId)
zzSessionStorage.setItem('identityUserId', user.identityUserId) // zzSessionStorage.setItem('identityUserId', user.identityUserId)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt) // zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
// var permissions = await getUserPermissions() // var permissions = await getUserPermissions()
// var menuTree = await getUserMenuTree() // var menuTree = await getUserMenuTree()
// commit('SET_TREE', menuTree.Result) // commit('SET_TREE', menuTree.Result)
@ -184,6 +184,9 @@ const actions = {
commit('SET_USERTYPESHORTNAME', user.userTypeShortName) commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
commit('SET_NAME', user.fullName) commit('SET_NAME', user.fullName)
setName(user.fullName) setName(user.fullName)
commit('SET_IDENTITYUSERID', user.identityUserId)
zzSessionStorage.setItem('identityUserId', user.identityUserId)
zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
var permissions = await getUserPermissions() var permissions = await getUserPermissions()
var menuTree = await getUserMenuTree() var menuTree = await getUserMenuTree()
commit('SET_TREE', menuTree.Result) commit('SET_TREE', menuTree.Result)

2
src/utils/request.js
View File

@ -143,6 +143,7 @@ service.interceptors.response.use(
setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', { setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
type: 'warning', type: 'warning',
showCancelButton: false, showCancelButton: false,
confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
callback: action => { } callback: action => { }
}], 'confirm') }], 'confirm')
} }
@ -153,6 +154,7 @@ service.interceptors.response.use(
[store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', { [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
type: 'warning', type: 'warning',
showCancelButton: false, showCancelButton: false,
confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
callback: action => { } callback: action => { }
}], "confirm" }], "confirm"
) )

2
src/views/research/form.vue
View File

@ -117,7 +117,7 @@
:title="$t('trials:researchForm:dialogTitle:reject')" :title="$t('trials:researchForm:dialogTitle:reject')"
width="600px" width="600px"
custom-class="base-dialog-wrapper" custom-class="base-dialog-wrapper"
:append-to-body="userTypeEnumInt !== 0" append-to-body
> >
<el-form ref="rejectForm" :model="rejectForm" label-width="100px"> <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
<div class="base-dialog-body"> <div class="base-dialog-body">