Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp
===================================================================
diff -u -r24841 -r24857
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp	(.../washingApplication.jsp)	(revision 24841)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/washingApplication/washingApplication.jsp	(.../washingApplication.jsp)	(revision 24857)
@@ -27,6 +27,7 @@
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css" type="text/css"/>
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css"type="text/css"/>
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.css"type="text/css"/>
+
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/css/bootstrap-datetimepicker.min.css">
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/css/common/dingxiang-common.css">
@@ -91,24 +92,41 @@
 		<div class="mainNav-shop-search pull-right search">
 			<input type="text" name="" class="form-control" placeholder="输入关键字查询" id="mainNav-shop-search" value="" />
 		</div>
+
 	</div><!-- /.modal-->
 	<div class="mainTable">
 		<div id="gridContainer" class="mainContainer">
 			<div id="myGrid" style="width:601px;height:500px;" class="mainContainerGrid"></div>
-			<div>
+			<div class="bottomContain">
 				<div class="pageContain">
 						<div class="pageContainTotal">
 								共<span id="pageTotal"></span> 条记录，每页<span id="pageSingle"></span> 条
 						</div>
 						<div class="pageContainButton">
 							<ul class="pagination" id="pagination">
 							</ul>
+							<div class="dataAmount btn-group dropup" >
+								<button type="button" class="btn btn-default" id="dataAmountCurrent">1</button>
+								<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+									<span class="caret"></span>
+									<span class="sr-only">Toggle Dropdown</span>
+								</button>
+								<ul class="dropdown-menu">
+									<li onclick="changePageAmount(10)" >10</li>
+									<li onclick="changePageAmount(20)">20</li>
+									<li onclick="changePageAmount(30)">30</li>
+									<li onclick="changePageAmount(50)">50</li>
+									<li onclick="changePageAmount(100)">100</li>
+								</ul>
+							</div>
 						</div>
 				</div>
 				<input type="hidden" id="PageCount" runat="server" />
 				<input type="hidden" id="PageSize" runat="server"  />
 				<input type="hidden" id="countindex" runat="server" />
 				<input type="hidden" id="loadstate" value="hason" />
+				<input type="hidden" id="pageAmount" value="10" />
+				<input type="hidden" id="pageOffset" value="0" />
 				<!--设置最多显示的页码数 可以手动设置 默认为7-->
 				<input type="hidden" id="visiblePages" runat="server" value="7" />
 			</div>
@@ -1073,7 +1091,7 @@
 <!-- myJs -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/washingApplication/jqPaginator.min.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/washingApplication/myPage.js"></script>
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/washingApplication/slickWash.2.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/washingApplication/slickWash.js"></script>
 <!-- myJs end -->
 <script type="text/javascript">
 	var WWWROOT = '${basePath}';