From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/views/login/index.jsx | 49 ++++++++-----------------------------------------
1 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 2edd976..80c0c73 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -52,7 +52,6 @@
localStorage.removeItem('localDataM')
localStorage.removeItem('debug')
localStorage.removeItem('role_id')
- localStorage.removeItem('localRole_id')
sessionStorage.clear()
}
@@ -112,7 +111,6 @@
localStorage.setItem('departmentcode', res.departmentcode || '')
localStorage.setItem('organization', res.organization || '')
localStorage.setItem('mk_user_type', res.mk_user_type || '')
- localStorage.setItem('localRole_id', res.role_id || '')
localStorage.setItem('lang', 'zh-CN')
@@ -194,16 +192,8 @@
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
- } else {
- this.props.history.replace('/main')
- }
+ this.props.history.replace('/main')
}
} else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
@@ -241,13 +231,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -260,14 +248,7 @@
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
- } else {
- this.props.history.replace('/main')
- }
+ this.props.history.replace('/main')
} else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
@@ -292,13 +273,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -308,14 +287,7 @@
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
- } else {
- this.props.history.replace('/main')
- }
+ this.props.history.replace('/main')
} else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
@@ -657,10 +629,12 @@
}
sessionStorage.setItem('home_background', res.index_background_color || '')
+
+ let seconds = 0
if (res.sys_datetime) {
- sessionStorage.setItem('sys_datetime', res.sys_datetime)
- sessionStorage.setItem('app_datetime', new Date().getTime())
+ seconds = Math.floor((new Date(res.sys_datetime).getTime() - new Date().getTime()) / 1000)
}
+ sessionStorage.setItem('sys_time_shim', isNaN(seconds) ? 0 : seconds)
// url鏍囬
document.title = systemMsg.platTitle
@@ -911,14 +885,7 @@
}
}
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
- } else {
- this.props.history.replace('/main')
- }
+ this.props.history.replace('/main')
} else {
notification.warning({
top: 92,
--
Gitblit v1.8.0