diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index e39a45b9d..094feeb66 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -11,11 +11,11 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.springframework.web.servlet.support.RequestContext; import com.fasterxml.jackson.annotation.JsonIgnore; import com.nis.util.Configurations; @@ -60,12 +60,7 @@ public class Page { private String message = ""; // 设置提示消息，显示在“共n条”之后 - private String prevPage="previousPage"; - private String nextPage="nextPage"; - private String currentPage="current"; - private String TotalCount="Total"; - private String pageEn="page"; - private String countPage="count"; + private RequestContext requestContext; public Page() { this.pageSize = -1; @@ -78,27 +73,26 @@ public class Page { */ public Page(HttpServletRequest request, HttpServletResponse response){ this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); - zhcnPageInfo(request); - } public Page(HttpServletRequest request, HttpServletResponse response,String alias){ this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)),alias); - zhcnPageInfo(request); } public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize,String alias){ this.setAlias(alias); this.initPage(request, response, defaultPageSize); - zhcnPageInfo(request); } public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){ this.initPage(request, response, defaultPageSize); - zhcnPageInfo(request); } //更换中文提示 public void zhcnPageInfo(HttpServletRequest request){ - try { + + + /*try { + + if(CookieUtil.getValue(request, "Language")!=null&&CookieUtil.getValue(request, "Language").equalsIgnoreCase("zh_cn")){ prevPage="上一页"; nextPage="下一页"; @@ -109,10 +103,13 @@ public class Page { } } catch (UnsupportedEncodingException e) { e.printStackTrace(); - } + }*/ } private void initPage(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){ try { + + this.requestContext = new RequestContext(request); + // 设置页码参数（传递repage参数，来记住页码） String no = request.getParameter("pageNo"); if (StringUtils.isNotBlank(no)) { @@ -337,13 +334,19 @@ public class Page { */ @Override public String toString() { + + + if(list != null && list.isEmpty()) { + return "
  "+requestContext.getMessage("noneData")+"
"; + } + StringBuilder sb = new StringBuilder(); if (pageNo == first) {// 如果是首页 - sb.append("
  • « "+prevPage+"
    • \n"); + sb.append("
  • « "+requestContext.getMessage("previousPage")+"
    • \n"); } else { - sb.append("
  • « "+prevPage+"
    • \n"); + sb.append("
  • « "+requestContext.getMessage("previousPage")+"
    • \n"); } int begin = pageNo - (length / 2); @@ -394,18 +397,18 @@ public class Page { } if (pageNo == last) { - sb.append("
  • "+nextPage+" »
    • \n"); + sb.append("
  • "+requestContext.getMessage("nextPage")+" »
    • \n"); } else { sb.append("
  • " - + ""+nextPage+" »
    • \n"); + + ""+requestContext.getMessage("nextPage")+" »\n"); } - sb.append("
  • "+currentPage+" "); + sb.append("
  • "+requestContext.getMessage("current")+" "); sb.append(" / "); sb.append(" "+pageEn+"，"); - sb.append(""+TotalCount+" " + count + " "+countPage+""+(message!=null?message:"")+"
    • \n"); + sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，"); + sb.append(""+requestContext.getMessage("total")+" " + count + " "+requestContext.getMessage("count")+""+(message!=null?message:"")+"\n"); sb.insert(0,"
      \n").append("
    \n"); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 48953a7ce..e4254032d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -261,6 +261,7 @@ sendind_org=sending organization no_node=Node can not be selected select_icon=select icon nothing=nothing +noneData=Could not find any record that met the condition. #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 8efea095b..1f543dd18 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -220,6 +220,7 @@ maxlength_128=The maxlength is 128? maxlength_256=The maxlength is 256? maxlength_512=The maxlength is 512? maxlength_4000=The maxlength is 4000? +noneData=Could not find any record that met the condition. #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 65ddcbfee..b63872cd6 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -259,6 +259,7 @@ sendind_org=\u4e0b\u53d1\u5355\u4f4d no_node=\u4e0d\u80fd\u9009\u62e9\u8282\u70b9 select_icon=\u9009\u62e9\u56fe\u6807 nothing=\u65e0 +noneData=\u6CA1\u6709\u67E5\u8BE2\u5230\u7B26\u5408\u6761\u4EF6\u7684\u8BB0\u5F55 #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp index b37938235..562ec9519 100644 --- a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp +++ b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp @@ -4,29 +4,20 @@ 机构管理 + -
    -