diff --git a/login/login.html b/login/login.html index 91ed702..f2cddea 100644 --- a/login/login.html +++ b/login/login.html @@ -8,6 +8,7 @@ + @@ -27,5 +28,6 @@ + \ No newline at end of file diff --git a/resource/js/unit.js b/resource/js/unit.js index 36021eb..d5138d0 100644 --- a/resource/js/unit.js +++ b/resource/js/unit.js @@ -32,12 +32,17 @@ var dataUrl = dataUrl || {}; dataUrl.util = { - - queryChargerIncomeByPlNos: function () { - return parkcloudbaseUrl + 'index/new/queryChargerIncomeByPlNos'; + //登录 + login: function () { + return parkcloudbaseUrl + 'oauth/login'; }, + + +} + +var fn ={ //获取普通API鉴权token getToken: function () { var token = sessionStorage.getItem("token"); @@ -62,6 +67,12 @@ dataUrl.util = { setUserName: function (userName) { sessionStorage.setItem("userName", userName); }, + getRoleId: function () { + return sessionStorage.getItem("userRoleId"); + }, + setRoleId: function (userRoleId) { + sessionStorage.setItem("userRoleId", userRoleId); + }, getOpImgPath: function () { return sessionStorage.getItem("imgPath"); }, @@ -103,8 +114,7 @@ dataUrl.util = { } fn.toLoginPage(); } - -} +}; DateUtil = { dataFormat: function (longTime, formatStr) { diff --git a/topages/login/login.js b/topages/login/login.js index 11fa7fa..0fb3b2b 100644 --- a/topages/login/login.js +++ b/topages/login/login.js @@ -2,20 +2,73 @@ * Created by mac on 18/7/27. */ -$('#login-btn').on('click',function () { - - var username = $.trim($('#login-username').val()); - var userpwd = $.trim($('#login-password').val()); - if(username==''||username==null||username==undefined){ - $('#login-errorifo').text('请输入用户名'); - return; - - }else{ - if(userpwd==''||userpwd==null||userpwd==undefined){ - $('#login-errorifo').text('请输入密码'); - - }else{ - //ajax 如果输入不正确 继续提示 。如果正确把 $('#login-errorifo').text('')清空; - } - } -}); \ No newline at end of file +var func ={ + /**1.用户登录**/ + userLogin:function(){ + $(document).on('click','#login-btn',function(){ + + var username = $.trim($('#login-username').val()); + var userpwd = $.trim($('#login-password').val()); + if(username==''||username==null||username==undefined){ + $('#login-errorifo').text('请输入用户名'); + return; + + }else{ + if(userpwd==''||userpwd==null||userpwd==undefined){ + $('#login-errorifo').text('请输入密码'); + + }else{ + //ajax 如果输入不正确 继续提示 。如果正确把 $('#login-errorifo').text('')清空; + func.loginPost(username,userpwd); + } + } + }); + }, + //登录post请求 + loginPost:function(username,userpwd){ + var req = { + loginCode: username, + passWord: userpwd + }; + $.ajax({ + method: 'post', + url: dataUrl.util.login(), + data: JSON.stringify(req), + contentType: 'application/json; charset=utf-8', + dataType: 'json', + success: function (res) { + if(res != null && res != '' && res !=undefined && res.code =='8888' ){ + $('#login-errorifo').text(''); + fn.setToken(res.data.accessToken); + fn.setUserName(res.data.userName); + fn.setUserId(res.data.opId); + fn.setUserAccount(res.data.loginCode); + fn.setRoleId(res.data.roleId); + window.location.href = "../../workreport/index/index.html"; + + }else{ + if('1999' == res.code ){ + $('#login-errorifo').text('账号有误,请重新输入'); + }else if('2000' == res.code ){ + $('#login-errorifo').text('密码有误,请重新输入'); + }else{ + $('#login-errorifo').text('系统错误'); + } + } + } + }); + + + + }, + /**初始化*/ + init:function(){ + debugger; + func.userLogin(); + } +}; + +$(function() { + func.init(); +}); +