+
+
+
+
+

+
+
+ ${message }
+ 账号或密码错误!请重新输入!
+
+
+
+

+
+
+
+

+
-
- ${message }
- 账号或密码错误!请重新输入!
-
-
-
-
-

-
-
-
-
-
-

-
+
${companyName}
-
${companyName}
-
+
@@ -159,6 +156,9 @@
top.location = self.location;
}
+var j_username_display = document.getElementById('j_username_display');
+var j_password_display = document.getElementById('j_password_display');
+
if('${param.redirectToTop}' == 'true'){
if('${param.login_error}' != ''){
top.document.location.href='${ctx}/logon.jsp?login_error=${param.login_error}';
@@ -203,7 +203,8 @@
}
function resetForm(){
- document.getElementById("j_username_display").value = "";
+ document.getElementById("j_username_display").value = "";
+ document.getElementById("j_password_display").value = "";
document.getElementById("j_password").value = "";
document.getElementById("tip").innerHTML = " ";
setFieldFocus(document.getElementById("j_username_display"));
@@ -221,7 +222,7 @@
return;
}
// 判断是否是数字
- var userName = document.loginForm.j_username_display.value + '';
+ var userName = j_username_display.value + '';
if (userName.length < autoFillUserNameLength) {
// 判断是否都为数字
//alert('userName='+userName+',isNumber='+isDigital(userName));
@@ -240,16 +241,19 @@
}
}
function checkSubmit() {
- if (isFieldBlank(document.loginForm.j_username_display) == true) {
+ document.loginForm.j_username.value = j_username_display.value;
+ document.loginForm.j_password.value = j_password_display.value;
+
+ if (j_username_display.value == '') {
alert('
');
- document.loginForm.j_username_display.focus();
+ j_username_display.focus();
return false;
}
- if (isFieldBlank(document.loginForm.j_password) == true) {
- if (document.activeElement.id != 'j_username_display') {
+ if (j_password_display.value == '') {
+ if (document.activeElement.id != 'j_password_display') {
alert('
');
}
- document.loginForm.j_password.focus();
+ j_password_display.focus();
return false;
}
/*
@@ -262,7 +266,6 @@
}*/
// 提交之前,将用户名补0并且设置到隐藏域
// 设置到隐藏域
- document.loginForm.j_username.value = document.loginForm.j_username_display.value;
autoFillUserName();
document.loginForm.submit();
}
@@ -443,14 +446,14 @@
function isValidBarcodeInput(){
var usernameValue = getUserName();
- var password = document.getElementById("j_password").value;
+ var password = j_password_display.value;
// 如果密码输入框不为空,则返回false
if (password != ''){
return false;
}
if(isValidBarcode(usernameValue)){
- var usernameFieldValue = document.getElementById("j_username_display").value;
+ var usernameFieldValue = j_username_display.value;
if (usernameFieldValue == ''){
$("#j_username_display").attr("value" , usernameValue);
return true;
@@ -495,7 +498,7 @@
}else if(event.keyCode == 13){
if (enalbeScanBarcodeLogin){
if(isValidBarcodeInput()){
- $("#j_password").val("P@ssword");
+ $("#j_password_display").val("P@ssword");
}
}
checkSubmit();
@@ -506,7 +509,7 @@
if(barcodeTemp.length >= 9){
return barcodeTemp;
}
- var usernameValue = document.getElementById("j_username_display").value;
+ var usernameValue = j_username_display.value;
return usernameValue;
}
$(document).keypress(showKeyDown);