Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/js/service.js

@@ -133,7 +133,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             getRecordsCount: function (data, success) {
                 var body = JSON.stringify(data);
                 $http({
-                    method: 'GET',
+                    method: 'POST',
                     url: "../personPostApi/findPersonalDataCount",
                     data:body,
                     headers: {'Content-Type': 'application/json'}

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html

@@ -116,9 +116,9 @@
                         </tr>
                         </tbody>
                     </table>
-                    <div style="padding-left: 27%;">
-                        <tm-pagination ng-if="show" conf="paginationConf" class="ul"></tm-pagination>
-                    </div>
+                <div style="padding-left: 27%;" ng-if="postData.length>0">
+                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                </div>
                 <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js

@@ -38,7 +38,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-        $scope.show = true;
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
         var getCountJson = function(){
             var json={};
@@ -72,7 +71,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             return json;
         }
         var getJson = function () {
-            console.log($scope.paginationConf.currentPage+1,"in")
             var json={};
             if (angular.isDefined($scope.applicantName)) {
                 json.applicantName=$scope.applicantName;
@@ -101,17 +99,17 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                 json.getToCounty=[];
             }
             json.uploadDate = $("#datepicker").val();
-            json.firstIndex=$scope.paginationConf.currentPage+1;
+            json.firstIndex=$scope.paginationConf.currentPage;
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
         }
         $scope.postData = [];
         $scope.paginationConf.totalItems = 0
         $scope.doQuery = function () {
-            $scope.show = true;
-            // HttpService.getRecordsCount(getCountJson, function (data) {
-            //     $scope.paginationConf.totalItems = data;
-            // })
+            HttpService.getRecordsCount(getCountJson(), function (data) {
+                $scope.paginationConf.totalItems = data;
+                console.log(data)
+            })
             HttpService.searchPostData(getJson(), function (data) {
                 $scope.postData = data;
                 console.log(data)