From bebeca442cee4b83de0d00df29a6514b3f723c4f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 13:41:06 +0800
Subject: [PATCH] 2021-07-28

---
 src/views/login/index.jsx |   64 ++++++++++++++-----------------
 1 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index e7045ff..3598767 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -121,44 +121,38 @@
         BasePath: '/'
       }
 
-      localStorage.setItem('bmsSystem', param.system)
-
-      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')
-            }
+      if (process.env.NODE_ENV === 'production') {
+        Api.loginAndRedirect(_param).then(result => {
+          if (result.IsError) {
+            this.setState({
+              isDisabled: false
+            })
+            message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!')
           } 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')
-            }
+            window.location.replace(document.location.origin + '/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 if (res.ErrCode === 'Need_Get_Appkey' && options.sysType === 'SSO') {
       message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒')
 

--
Gitblit v1.8.0