Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r12331 -r12841
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 12841)
@@ -352,13 +352,29 @@
 	startTime = 0;
 	barcodeTemp = '';
 }
-function isInputByScanner(){
-	var curTime = new Date().getTime();
-	var ts = Math.abs(curTime - startTime);
-	if(ts < 500){
-		return true
+/**
+ * 是否是有效的条码输入
+ */
+function isValidBarcodeInput(){
+	
+	var usernameValue = getUserName();
+	var password = document.getElementById("j_password").value;
+	// 如果密码输入框不为空，则返回false
+	if (password != ''){
+		return false;
 	}
-	return false;
+    if(isValidBarcode(usernameValue)){
+    	
+    	var usernameFieldValue = document.getElementById("j_username_display").value;
+    	if (usernameFieldValue == ''){
+    		$("#j_username_display").attr("value" , usernameValue);
+    		return true;
+    	}
+    	else if (usernameFieldValue == usernameValue){
+    		return true;
+    	}
+    }
+    return false;
 }
 function showKeyDown(){
     if(event.keyCode == 48 || event.keyCode == 96){
@@ -393,12 +409,8 @@
         setStartTime();
     }else if(event.keyCode == 13){
         if (enalbeScanBarcodeLogin){
-        	if(isInputByScanner()){// 判断是否是条码枪输入
-        		var usernameValue = getUserName();
-                if(isValidBarcode(usernameValue)){
-                    $("#j_username_display").attr("value" , usernameValue);
-                    $("#j_password").attr("value" , "P@ssword");
-                }
+        	if(isValidBarcodeInput()){
+                $("#j_password").attr("value" , "P@ssword");
         	}
         }
         checkSubmit();