git-svn-id: https://192.168.57.71/svn/qt@46 12fe181a-e57f-b044-8676-16dc139aa63e

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/common/BaseWebCtl.java

@@ -145,8 +145,8 @@ public class BaseWebCtl extends BaseCtl {
         if (page.getPage() < 1) {
             page.setPage(1);
         }
-        if (page.getRows() < 10) {
-            page.setRows(10);
+        if (page.getRows() == 0) {
+            page.setRows(20);
         }
         Sort newsort = new Sort(Direction.fromString(page.getOrder()), new String[] { page.getSort() });
         // 页码从0开始

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/command/task.jsp

@@ -77,7 +77,7 @@
 	<form id="taskform" method="post" enctype="multipart/form-data">
 	<input id="id" name="id" type="hidden" value="${taskVo.id}"/>
 	<input id="recordStatus" type="hidden" value="${taskVo.recordStatus}"/>
-	<div id="divContent" style="height:475px;overflow-x:hidden;overflow-y:auto;">
+	<div id="divContent" style="height:505px;overflow-x:hidden;overflow-y:auto;">
 		<table style="margin-left:0px" id="tabTask">
 			<tr>
 				<td style="width: 90px;">任务代号</td>

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/command/taskview.jsp

@@ -62,7 +62,7 @@
 	<form id="taskform" method="post" enctype="multipart/form-data">
 	<input id="id" name="id" type="hidden" value="${taskVo.id}"/>
 	<input id="recordStatus" type="hidden" value="${taskVo.recordStatus}"/>
-	<div style="height:475px;overflow-x:hidden;overflow-y:auto;">
+	<div style="height:505px;overflow-x:hidden;overflow-y:auto;">
 		<table style="margin-left:0px" id="tabTask">
 			<tr>
 				<td style="width: 90px;">任务代号</td>

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/include/pageinfo.jsp

@@ -6,8 +6,10 @@
 		<!-- <button class="btn_gwgl_delete" type="button"><span>删除</span></button> -->
 	</li>
 	<li class="page_btn" id="pagesizeset"><select id="pagesize"
-		name="rows" num="${page.rows}"><option value="10">10</option>
-			<option value="20">20</option></select></li>
+		name="rows" num="${page.rows}">
+			<option value="10">10</option>
+			<option value="20" selected="selected">20</option>
+			<option value="50">50</option></select></li>
 	<li class="gwgl_table_page_a"><a href="javascript:void(0)" id="pagefirst"><img
 			src="${ctx}/static/xt/images/icon/gwgl_icon_9.png"></a></li>
 	<li class="gwgl_table_page_a"><a href="javascript:void(0)" id="pageprev"><img

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/include/pageinfo2.jsp

@@ -6,8 +6,10 @@
 		<!-- <button class="btn_gwgl_delete" type="button"><span>删除</span></button> -->
 	</li>
 	<li class="page_btn" id="pagesizeset"><select id="pagesize"
-		name="rows" num="${page.rows}"><option value="10">10</option>
-			<option value="20">20</option></select></li>
+		name="rows" num="${page.rows}">
+			<option value="10">10</option>
+			<option value="20" selected="selected">20</option>
+			<option value="50">50</option></select></li>
 	<li class="gwgl_table_page_a"><a href="javascript:void(0)" id="pagefirst"><img
 			src="${ctx}/static/xt/images/icon/gwgl_icon_9.png"></a></li>
 	<li class="gwgl_table_page_a"><a href="javascript:void(0)" id="pageprev"><img

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_command.js

@@ -864,7 +864,7 @@ function addCommandTask(taskId) {
                 closeRoutePopupWin();
                 clearLjghRoute();
             },
-            area : [ '500px', '560px' ],
+            area : [ '500px', '590px' ],
             content : url, // iframe的url
             success : function(layero, index) {
                 // 得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -923,7 +923,7 @@ function openTaskInfo(taskId, operFlg) {
                 closeRoutePopupWin();
                 clearLjghRoute();
             },
-            area : [ '500px', '560px' ],
+            area : [ '500px', '590px' ],
             content : url, // iframe的url
             success : function(layero, index) {
                 // 得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();