fanxw 2 роки тому
батько
коміт
b13fdaeff1

+ 48 - 1
src/main/resources/static/app/system/controller/userCtrl.js

@@ -498,6 +498,8 @@ angular.module('app.system').controller("userLoginCtrl",
498 498
     function($scope, $rootScope, $state, $location, $stateParams, userService, powerService, permissions, APP_CONFIG) {
499 499
 		var loginType;//默认是账号登录
500 500
 		var sendState = 0;//消息发送状态,默认未发送
501
+		var type = $stateParams.type;
502
+
501 503
 		$scope.onload = function () {
502 504
 	        var readTime = new Date().getTime();
503 505
 	        userService.getCode(16, 70, 30, readTime).then(function(data) {
@@ -631,7 +633,52 @@ angular.module('app.system').controller("userLoginCtrl",
631 633
         	$scope.yzm = "";
632 634
         }
633 635
 
634
-        $scope.onload();
636
+        if (type == "") {
637
+        	if (type=="2071695E17E61D12B2458657796E9265") {
638
+        		var kqbm = $stateParams.kqbm;
639
+    			userService.spt_login(kqbm).then(function(data) {
640
+                    if (data.status == true) {
641
+                    	//clearInterval(timers);//登录成功删除短信倒计时
642
+                    	userRoleType = data.userInfo.status;
643
+                        permissions.getLoginInfo();
644
+                        // 获取权限后再跳转
645
+                        powerService.getFuncByUserId().then(function(data) {
646
+                            hasFuncList = data;
647
+                            sessionStorage.setItem("hasFuncList", angular.toJson(data));
648
+                            powerService.getButtonByUserId().then(function(data) {
649
+                                permissionList = data;
650
+                                sessionStorage.setItem("permissionList", angular.toJson(data));
651
+                                if($stateParams.emergency){
652
+                                    $state.go("app.system.emergencyJump");
653
+                                }else if(!$stateParams.emergency){
654
+                                	// if(userRoleType == "2"){//经营人员
655
+                                	// 	$state.go("app.additionalHome.businessHome");
656
+                                	// }else if(userRoleType == "3"){//仓储人员
657
+                                	// 	$state.go("app.additionalHome.storageHome");
658
+                                	// }else if(userRoleType == "4"){//质检人员
659
+                                	// 	$state.go("app.additionalHome.qualityCheckHome");
660
+                                	// }else if(userRoleType == "5"){//保卫人员
661
+                                	// 	$state.go("app.additionalHome.defendHome");
662
+                                	// }else if(userRoleType == "6"){//中转人员
663
+                                	// 	$state.go("app.additionalHome.transferHome");
664
+                                	// }else{
665
+                                		$state.go("app.dashboard");
666
+                                	// }
667
+                                }
668
+                            })
669
+                        })
670
+                        $scope.isLogin = false; //关闭回车登录开关
671
+                    } else {
672
+                        alert(data.success);
673
+                        $scope.onload();
674
+                    }
675
+                }, function(data) {
676
+                    console.log(data);
677
+                });
678
+    		}
679
+        } else {
680
+        	$scope.onload();
681
+        }
635 682
     });
636 683
 
637 684
 angular.module('app.system').controller("pwdCtrl",

+ 1 - 1
src/main/resources/static/app/system/module.js

@@ -145,7 +145,7 @@ angular.module('app.system').config(function ($stateProvider) {
145 145
     })
146 146
 
147 147
     .state('userLogin', {
148
-        url: '/userLogin',
148
+        url: '/userLogin/:type/:kqbm',
149 149
         views: {
150 150
             root: {
151 151
                 templateUrl: 'app/auth/views/login.html',

+ 20 - 2
src/main/resources/static/app/system/service/userService.js

@@ -226,7 +226,7 @@ angular.module('app.system').service("userService", function($http, $q, $rootSco
226 226
 	}
227 227
 	
228 228
 	/**
229
-	 * 登录
229
+	 * 库级平台登录
230 230
 	 */
231 231
 	this.login = function(username, password, yzm, from, pOrgId, verifyCode) {
232 232
 		var d = $q.defer();
@@ -250,7 +250,25 @@ angular.module('app.system').service("userService", function($http, $q, $rootSco
250 250
 		});
251 251
 		return d.promise;
252 252
 	}
253
-	
253
+
254
+	this.spt_login = function(kqbm) {
255
+		var d = $q.defer();
256
+		$http({ 
257
+			method : 'POST',
258
+			url : APP_CONFIG.systemUrl + '/userInfo/loginspt',
259
+			data : {
260
+				kqbm : kqbm
261
+			}
262
+		}).then(function successCallback(response) {
263
+			// 请求成功执行代码
264
+			d.resolve(response.data);
265
+		}, function errorCallback(response) {
266
+			// 请求失败执行代码
267
+			d.reject("error");
268
+		});
269
+		return d.promise;
270
+	}
271
+
254 272
 	/**
255 273
 	 * 退出登录
256 274
 	 */