From 47187a49748b632d1ab12a5cb0e87914f9d94bbe Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Fri, 7 Dec 2018 18:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E7=9A=84=E6=80=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=8F=AA=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/Page.java             |  6 ++++--
 src/main/java/com/nis/domain/PageLog.java          |  6 ++++--
 src/main/webapp/WEB-INF/include/form/pageGroup.jsp | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java
index e1af7f486..671f650b9 100644
--- a/src/main/java/com/nis/domain/Page.java
+++ b/src/main/java/com/nis/domain/Page.java
@@ -410,8 +410,10 @@ public class Page<T> {
 		sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
 		sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
 		sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
-		sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
-		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
+		/*sb.append(pageNo+" / ");*/
+		/*sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");*/
+		sb.append(last+" "+requestContext.getMessage("page")+"，");
+		//sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
 		sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
 
 		sb.insert(0,"<ul>\n").append("</ul>\n");
diff --git a/src/main/java/com/nis/domain/PageLog.java b/src/main/java/com/nis/domain/PageLog.java
index e8da615fa..1f6f478da 100644
--- a/src/main/java/com/nis/domain/PageLog.java
+++ b/src/main/java/com/nis/domain/PageLog.java
@@ -414,8 +414,10 @@ public class PageLog<T> {
 			sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
 			sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
 			sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
-			sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
-			sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
+			/*sb.append(pageNo+" / ");*/
+			sb.append(last+" "+requestContext.getMessage("page")+"，");
+			/*sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");*/
 			sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
 
 			sb.insert(0,"<ul>\n").append("</ul>\n");
diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp
index 66e1dbb1b..4ae88a92c 100644
--- a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp
+++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp
@@ -136,11 +136,13 @@ function getFootHtml(pageNo) {
 	}
 
 	htm += "<li class=\"disabled controls\"><a href=\"javascript:\">" + "<spring:message code="current"/>" + " ";
-	htm += "<input type=\"text\" value=\"" + pageNo + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
+ 	htm += "<input type=\"text\" value=\"" + pageNo + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
 	htm += "toPage(this.value," + pageSize + ",'" + funcParam + "');\" onclick=\"this.select();\"/> / ";
-	htm += "<input type=\"text\" value=\"" + last + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
-	htm += "(toPage" + pageNo + ",this.value,'" + funcParam + "');\" onclick=\"this.select();\"/> " + "<spring:message code="page"/>" + "，";
-	htm += "" + "<spring:message code="total"/>" + " <span id='showTotalCount'>" + count + "</span> " + "<spring:message code="count"/>" + "</a></li>";
+	/*htm += pageNo+" / ";*/
+	htm += last+ " <spring:message code="page"/>" + "，";
+	/* htm += "<input type=\"text\" value=\"" + last + "\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)";
+	htm += "(toPage" + pageNo + ",this.value,'" + funcParam + "');\" onclick=\"this.select();\"/> " + "<spring:message code="page"/>" + "，"; */
+	htm += "" + "<spring:message code="total"/>" + " <span id='showTotalCount'>" + count + " </span> " + "<spring:message code="count"/> " + "</a></li>";
 	htm += "</ul>";
 	return htm;
 }