From d13865ccdef4d569a01b19ae8a0fb898eaa10dc2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十二月 2020 15:39:08 +0800
Subject: [PATCH] 2020-12-25
---
src/views/login/index.jsx | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index ab058ec..79a10c0 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -114,43 +114,42 @@
localStorage.setItem('bmsSystem', param.system)
- if (param.system !== 'new') {
- Api.loginAndRedirect(_param).then(result => {
- if (result.IsError) {
- this.setState({
- isDisabled: false
- })
- message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!')
- } else {
+ Api.loginAndRedirect(_param).then(result => {
+ if (result.IsError) {
+ this.setState({
+ isDisabled: false
+ })
+ message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!')
+ } else {
+ if (param.system !== 'new') {
if (process.env.NODE_ENV === 'production') {
window.location.replace(document.location.origin + '/Home/Index')
} else {
window.location.replace(window.GLOB.location + '/Home/Index')
}
+ } else {
+ sessionStorage.setItem('UserID', res.UserID)
+ sessionStorage.setItem('LoginUID', res.LoginUID)
+ sessionStorage.setItem('User_Name', res.UserName)
+ 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('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')
+ }
}
- })
- } else {
- sessionStorage.setItem('UserID', res.UserID)
- sessionStorage.setItem('LoginUID', res.LoginUID)
- sessionStorage.setItem('User_Name', res.UserName)
- 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('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')
}
- }
-
+ })
} else if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
--
Gitblit v1.8.0