Commit 18aa5cd7 authored by liboyang's avatar liboyang

当前页为0的bug已解决

parent 7ec8068f
...@@ -232,7 +232,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -232,7 +232,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(fileName)){ if(angular.isUndefined(fileName)){
fileName=''; fileName='';
} }
if(angular.isUndefined(state)){ if(angular.isUndefined(state)||state==''){
state=-1; state=-1;
} }
console.log(fileName,state,date) console.log(fileName,state,date)
...@@ -252,7 +252,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -252,7 +252,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(fileName)){ if(angular.isUndefined(fileName)){
fileName=''; fileName='';
} }
if(angular.isUndefined(state)){ if(angular.isUndefined(state)||state==''){
state=-1; state=-1;
} }
console.log(fileName,state,currentPage,itemsPerPage,date) console.log(fileName,state,currentPage,itemsPerPage,date)
......
...@@ -38,6 +38,9 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -38,6 +38,9 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems) console.log($scope.paginationConf.totalItems)
}) })
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.analyseLog = data; $scope.analyseLog = data;
console.log($scope.analyseLog) console.log($scope.analyseLog)
......
...@@ -39,7 +39,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -39,7 +39,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
$scope.doPackageQuery=function(){ $scope.doPackageQuery=function(){
var date = $("#datepicker").val(); var date = $("#datepicker").val();
var typeCode = $("#county").val(); var cardType = $("#cardType").val();
var packageType = $("#packageType").val(); var packageType = $("#packageType").val();
if(angular.isUndefined($scope.uploadNo)){ if(angular.isUndefined($scope.uploadNo)){
$scope.uploadNo=''; $scope.uploadNo='';
...@@ -56,14 +56,11 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -56,14 +56,11 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(angular.isUndefined($scope.sljg)){ if(angular.isUndefined($scope.sljg)){
$scope.sljg=''; $scope.sljg='';
} }
if(angular.isUndefined(typeCode)){
typeCode='';
}
if(angular.isUndefined(packageType)){ if(angular.isUndefined(packageType)){
packageType=''; packageType='';
} }
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg, HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) { cardType,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total; $scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum; $scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum; $scope.postCardCount = data.youSum;
......
...@@ -91,6 +91,9 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -91,6 +91,9 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.paginationConf.totalItems = data.respData.string; $scope.paginationConf.totalItems = data.respData.string;
console.log($scope.paginationConf.totalItems) console.log($scope.paginationConf.totalItems)
}) })
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){ HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){
$scope.postPackageData = data.respData; $scope.postPackageData = data.respData;
console.log($scope.postPackageData) console.log($scope.postPackageData)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment