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

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

@@ -32,8 +32,11 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
             perPageOptions: [10, 20, 30, 40, 50]
         };
 
-
-        $scope.getAnalyseLog = function(){
+        $scope.getAnalyseLog=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
+        $scope.getAnalyseLogPage = function(){
             HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
                 $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)
@@ -48,7 +51,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
         }
 
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getAnalyseLog);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getAnalyseLogPage);
 
     });
 

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

@@ -38,8 +38,6 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-
-
         $scope.doPackageQuery=function(){
             $scope.paginationConf.currentPage=0;
             $scope.paginationConf.itemsPerPage=10;

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

@@ -51,8 +51,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-
-        $scope.doXmlQuery = function() {
+        $scope.doXmlQuery=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
+        $scope.doXmlQueryPage = function() {
             var startDate=$("#datepicker1").val();
             var endDate =$("#datepicker2").val();
             if(angular.isUndefined($scope.startId)){
@@ -90,7 +93,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
 
         }
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQueryPage);
 
 
         var reGet = $scope.doXmlQuery;

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

@@ -88,8 +88,11 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             itemsPerPage: 10,
             perPageOptions: [5 ,10 ,15 ,20 ,25]
         };
-
-        $scope.getPostPackage = function(){
+        $scope.getPostPackage=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
+        $scope.getPostPackagePage = function(){
             HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) {
                 $scope.paginationConf.totalItems = data.respData.string;
                 console.log($scope.paginationConf.totalItems)
@@ -105,7 +108,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
 
         var reGetPostData = $scope.getPostPackage;
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPostPackage);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPostPackagePage);
 
         $scope.deletePostData = function(fileid,importDate){
             ngDialog.open({

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

@@ -34,8 +34,11 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-
-        $scope.getPackageLog = function(){
+        $scope.getPackageLog=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
+        $scope.getPackageLogPage = function(){
             var county = $("#county").val();
             HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,function (data) {
                 $scope.paginationConf.totalItems = data;
@@ -51,7 +54,7 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
         }
 
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPackageLog);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPackageLogPage);
 
 
 

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

@@ -23,13 +23,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
 
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
-        $scope.paginationConf = {
-            currentPage: 1,
-            itemsPerPage: 10,
-            perPageOptions: [10, 20, 30, 40, 50]
-        };
-        $scope.paginationConf.totalItems = 50;
-
         $scope.json={
             id:'',
             policeCardsList:[]

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

@@ -41,6 +41,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
+        $scope.doQuery=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
         var getCountJson = function(){
             var date=$('#datepicker').val();
@@ -141,7 +145,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
         }
-        $scope.doQuery = function () {
+        $scope.doQueryPage = function () {
             HttpService.getRecordsCount(getCountJson(), function (data) {
                 $scope.paginationConf.totalItems = data;
                 console.log(data)
@@ -152,7 +156,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             })
         }
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQueryPage);
 
 
         var getCountAndDownloadUrl = function (url) {

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

@@ -38,7 +38,11 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             itemsPerPage: 10,
             perPageOptions: [10, 20, 30, 40, 50]
         };
-        $scope.getXmlPackage = function(){
+        $scope.getXmlPackage=function(){
+            $scope.paginationConf.currentPage=0;
+            $scope.paginationConf.itemsPerPage=10;
+        }
+        $scope.getXmlPackagePage = function(){
             if($scope.paginationConf.currentPage==0){
                 $scope.paginationConf.currentPage=1;
             }
@@ -49,7 +53,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             })
         }
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackagePage);
 
         var getData =  $scope.getXmlPackage;
         $scope.analysis = function (uploadDate,packageCount) {