Commit cbbc0fc0 by java-lixy

转交消息 序号顺序显示

parent aed2e6ae
...@@ -465,7 +465,7 @@ public class ReportController extends BaseController { ...@@ -465,7 +465,7 @@ public class ReportController extends BaseController {
} }
Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity); Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
User userEntity = new User(); User userEntity = new User();
Page<User> userPage = reportService.findUserPage(new Page<User>(1, 10), userEntity); Page<User> userPage = reportService.findUserPage(new Page<User>(1, 20), userEntity);
List<ReportEntity> reportlist = page.getList(); List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist){ for (ReportEntity report : reportlist){
String typeStr=""; String typeStr="";
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<type name="files"> <type name="files">
<url>%BASE_URL%files/</url> <url>%BASE_URL%files/</url>
<directory>%BASE_DIR%files</directory> <directory>%BASE_DIR%files</directory>
<maxSize>5M</maxSize> <maxSize>50M</maxSize>
<allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions> <allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions>
<deniedExtensions></deniedExtensions> <deniedExtensions></deniedExtensions>
</type> </type>
......
...@@ -46,6 +46,15 @@ ...@@ -46,6 +46,15 @@
$("#chooseDiv").hide(); $("#chooseDiv").hide();
$("#fade").hide(); $("#fade").hide();
}); });
//序号连续
var i = 1;
var pageNo = $("#pageNo").val();
var pageSize = $("#pageSize").val();
$(".reportList").each(function(){
var num = (pageNo-1)*pageSize + i;
i += 1;
$(this).children("td").eq(1).html(num);
});
}); });
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
...@@ -123,9 +132,9 @@ ...@@ -123,9 +132,9 @@
<tbody> <tbody>
<c:if test="${page.list.size()>0}"> <c:if test="${page.list.size()>0}">
<c:forEach items="${page.list}" var="report" varStatus="vs"> <c:forEach items="${page.list}" var="report" varStatus="vs">
<tr> <tr class="reportList">
<td><input type="checkbox" value="${report.id}"></td> <td><input type="checkbox" value="${report.id}"></td>
<td>${vs.count}</td> <td></td>
<td>${report.supplementTitle}</td> <td>${report.supplementTitle}</td>
<td> <td>
${report.supplementType} ${report.supplementType}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment