市平台跳转

src/main/resources/static/app/app.js

@@ -290,7 +290,12 @@ angular.module('app', [
                             $rootScope.orgInfo = null;
                             $rootScope.depotInfo = null;
                             $rootScope.depotId = null;
-                            $state.go("userLogin");
+                            if(toState.name == "sptLogin"){
+                            	$state.go("sptLogin");
+                            }else{
+                            	$state.go("userLogin");
+                            }
+                            
                         }
                     });
                 }

src/main/resources/static/app/system/controller/sptLoginCtrl.js

@@ -0,0 +1,51 @@
+"use strict";
+
+angular.module('app.system').controller("sptLoginCtrl",
+    function($scope, $rootScope, $state, $location, $stateParams, userService, powerService, permissions, APP_CONFIG) {
+		var loginType;//默认是账号登录
+		var sendState = 0;//消息发送状态，默认未发送
+		var type = $stateParams.type;
+
+        // 设置为false,下次再因为session超时还会提示，登录超时提示！
+        //$rootScope.isSessionOverTime = false;
+        
+        if (type == "2071695E17E61D12B2458657796E9265") {
+        	
+        	//先退出在登录
+            //sessionStorage.setItem("permissionList", "");
+            userService.exitLogin().then(function() {
+				// 退出登录，userInfo设置为空.
+				$rootScope.userInfo = null;
+				
+				//var kqbm = $stateParams.kqbm;
+				userService.spt_login($stateParams.kqbm).then(function(data) {
+	                if (data.status == true) {
+	                	//clearInterval(timers);//登录成功删除短信倒计时
+	                	userRoleType = data.userInfo.status;
+	                    permissions.getLoginInfo();
+	                    // 获取权限后再跳转
+	                    powerService.getFuncByUserId().then(function(data) {
+	                        hasFuncList = data;
+	                        sessionStorage.setItem("hasFuncList", angular.toJson(data));
+	                        powerService.getButtonByUserId().then(function(data) {
+	                            permissionList = data;
+	                            sessionStorage.setItem("permissionList", angular.toJson(data));
+	                            if($stateParams.emergency){
+	                                $state.go("app.system.emergencyJump");
+	                            }else if(!$stateParams.emergency){
+	                            	$state.go("app.dashboard");
+	                            }
+	                        })
+	                    })
+	                    $scope.isLogin = false; //关闭回车登录开关
+	                } else {
+	                    alert(data.success);
+	                }
+	            }, function(data) {
+	                console.log(data);
+	            });
+				
+			})
+        } 
+    });
+

src/main/resources/static/app/system/controller/userCtrl.js

@@ -634,46 +634,47 @@ angular.module('app.system').controller("userLoginCtrl",
         }
 
         if (type == "2071695E17E61D12B2458657796E9265") {
-    		var kqbm = $stateParams.kqbm;
-			userService.spt_login(kqbm).then(function(data) {
-                if (data.status == true) {
-                	//clearInterval(timers);//登录成功删除短信倒计时
-                	userRoleType = data.userInfo.status;
-                    permissions.getLoginInfo();
-                    // 获取权限后再跳转
-                    powerService.getFuncByUserId().then(function(data) {
-                        hasFuncList = data;
-                        sessionStorage.setItem("hasFuncList", angular.toJson(data));
-                        powerService.getButtonByUserId().then(function(data) {
-                            permissionList = data;
-                            sessionStorage.setItem("permissionList", angular.toJson(data));
-                            if($stateParams.emergency){
-                                $state.go("app.system.emergencyJump");
-                            }else if(!$stateParams.emergency){
-                            	// if(userRoleType == "2"){//经营人员
-                            	// 	$state.go("app.additionalHome.businessHome");
-                            	// }else if(userRoleType == "3"){//仓储人员
-                            	// 	$state.go("app.additionalHome.storageHome");
-                            	// }else if(userRoleType == "4"){//质检人员
-                            	// 	$state.go("app.additionalHome.qualityCheckHome");
-                            	// }else if(userRoleType == "5"){//保卫人员
-                            	// 	$state.go("app.additionalHome.defendHome");
-                            	// }else if(userRoleType == "6"){//中转人员
-                            	// 	$state.go("app.additionalHome.transferHome");
-                            	// }else{
-                            		$state.go("app.dashboard");
-                            	// }
-                            }
-                        })
-                    })
-                    $scope.isLogin = false; //关闭回车登录开关
-                } else {
-                    alert(data.success);
-                    $scope.onload();
-                }
-            }, function(data) {
-                console.log(data);
-            });
+        	
+        	//先退出在登录
+            //sessionStorage.setItem("permissionList", "");
+            //userService.exitLogin().then(function() {
+				// 退出登录，userInfo设置为空.
+				$rootScope.userInfo = null;
+				
+				var kqbm = $stateParams.kqbm;
+				userService.spt_login(kqbm).then(function(data) {
+	                if (data.status == true) {
+	                	//clearInterval(timers);//登录成功删除短信倒计时
+	                	userRoleType = data.userInfo.status;
+	                    permissions.getLoginInfo();
+	                    // 获取权限后再跳转
+	                    powerService.getFuncByUserId().then(function(data) {
+	                        hasFuncList = data;
+	                        sessionStorage.setItem("hasFuncList", angular.toJson(data));
+	                        powerService.getButtonByUserId().then(function(data) {
+	                            permissionList = data;
+	                            sessionStorage.setItem("permissionList", angular.toJson(data));
+	                            if($stateParams.emergency){
+	                                $state.go("app.system.emergencyJump");
+	                            }else if(!$stateParams.emergency){
+	                            	$state.go("app.dashboard");
+	                            }
+	                        })
+	                    })
+	                    $scope.isLogin = false; //关闭回车登录开关
+	                } else {
+	                    alert(data.success);
+	                    $scope.onload();
+	                }
+	            }, function(data) {
+	                console.log(data);
+	            });
+				
+			//})
+			
+
+        	
+    		
         } else {
         	$scope.onload();
         }

src/main/resources/static/app/system/module.js

@@ -145,7 +145,7 @@ angular.module('app.system').config(function ($stateProvider) {
     })
 
     .state('userLogin', {
-        url: '/userLogin/:type/:kqbm',
+        url: '/userLogin',
         views: {
             root: {
                 templateUrl: 'app/auth/views/login.html',
@@ -169,8 +169,7 @@ angular.module('app.system').config(function ($stateProvider) {
         url: '/sptLogin/:type/:kqbm',
         views: {
             root: {
-            	templateUrl: 'app/dashboard/dashboard.html',
-                controller: 'userLoginCtrl'
+                controller: 'sptLoginCtrl'
             }
         },
         data: {