分页加条数。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9335 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -3264,8 +3264,8 @@ input::-webkit-clear{display:none;}
 }
 .tab-first .row a.active{
 	background: #fff;
-	/*border:#e8e8e8 1px solid;
-	border-bottom: #fff 1px solid;*/
+	border:#e8e8e8 1px solid;
+	border-bottom: #fff 1px solid;
 }
 #myquest-public .group-container .btn-group .btn,#myrequest-btn .btn-group .btn{
 	width: 80px;
@@ -4002,7 +4002,9 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 .pagination>li>a, .pagination>li>span{
 	border: #ccc 1px solid;
 }
-
+.ng-table-pager .pagination>li button[disabled]{
+	cursor: not-allowed;
+}
 /*企业圈新修改*/
 #myquest-public{
 	position: relative;
@@ -4131,4 +4133,35 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	color: #327ebe;
 	font-style: inherit;
 	margin: 0 2px;
+}
+#myquest-public{
+	border: #e8e8e8 1px solid;
+	border-top: none;
+}
+.tab-first{
+	position: relative;
+}
+.tab-first .row{
+	border-bottom: #e8e8e8 1px solid;
+	height: 45px;
+}
+.tab-first .row:before{
+	content: '';
+	position: absolute;
+	display: inline-block;
+	height: 45px;
+	width: 1px;
+	background: #f5f5f5;
+	left: -1px;
+	top: 0;
+}
+.tab-first .row:after{
+	content: '';
+	position: absolute;
+	display: inline-block;
+	height: 45px;
+	width: 1px;
+	background: #f5f5f5;
+	right: -1px;
+	top: 0;
 }

src/main/webapp/resources/lib/angular/ng-table.min.js

@@ -382,7 +382,7 @@ function(a) {
         a.put("ng-table/filters/select.html", '<select ng-options="data.id as data.title for data in column.data" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control" name="{{column.filterName}}"> </select>'),
         a.put("ng-table/filters/text.html", '<input type="text" name="{{column.filterName}}" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>'),
         a.put("ng-table/header.html", '<tr> <th ng-repeat="column in $columns" ng-class="{ \'sortable\': parse(column.sortable), \'sort-asc\': params.sorting()[parse(column.sortable)]==\'asc\', \'sort-desc\': params.sorting()[parse(column.sortable)]==\'desc\' }" ng-click="sortBy(column, $event)" ng-show="column.show(this)" ng-init="template=column.headerTemplateURL(this)" class="header {{column.class}}"> <div ng-if="!template" ng-show="!template" ng-bind="parse(column.title)"></div> <div ng-if="template" ng-show="template"><div ng-include="template"></div></div> </th> </tr> <tr ng-show="show_filter" class="ng-table-filters"> <th ng-repeat="column in $columns" ng-show="column.show(this)" class="filter"> <div ng-repeat="(name, filter) in column.filter"> <div ng-if="column.filterTemplateURL" ng-show="column.filterTemplateURL"> <div ng-include="column.filterTemplateURL"></div> </div> <div ng-if="!column.filterTemplateURL" ng-show="!column.filterTemplateURL"> <div ng-include="\'ng-table/filters/\' + filter + \'.html\'"></div> </div> </div> </th> </tr>'),
-        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li ng-if="pages.length != 0"><div class="page-record"><span>共{{params.total()/params.count()+0.4| number: 0}}页</span><span>到第<input type="text" ng-model="page.number"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > {{params.total()/params.count()+0.4| number: 0}} || page.number < 1">确定</button></span></div></li></ul> </div> ')
+        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li ng-if="pages.length != 0"><div class="page-record"><span>共{{params.total()/params.count()+0.4| number: 0}}页,共{{params.total()}}条</span><span>到第<input type="text" ng-model="page.number"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > {{params.total()/params.count()+0.4| number: 0}} || page.number < 1" ng-keypress="params.page(page.number)">确定</button></span></div></li></ul> </div> ')
     }]),
     b
 });

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -291,7 +291,7 @@
 	border-top:#e8e8e8 1px solid;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="margin-left: -240px; width: 1170px;border: #e8e8e8 1px solid;border-top: none;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>