Commit 3e17d976 authored by liboyang's avatar liboyang

解析日志解析完成重新获得数据

parent dc05d95c
...@@ -134,7 +134,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -134,7 +134,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
document.body.appendChild(a); document.body.appendChild(a);
a.href = encodeURI(getCountAndDownloadUrl(url)); a.href = encodeURI(getCountAndDownloadUrl(url));
console.log(encodeURI(getCountAndDownloadUrl(url))) console.log(encodeURI(getCountAndDownloadUrl(url)))
// a.click(); a.click();
} }
var getTypeList = function(){ var getTypeList = function(){
......
...@@ -30,8 +30,25 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -30,8 +30,25 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getXmlPackage = function(){
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems=data.respData.count;
$scope.xmlPackageData = data.respData.mapList;
console.log($scope.xmlPackageData,"$scope.xmlPackageData")
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
var getData = $scope.getXmlPackage;
$scope.analysis = function (uploadDate,packageCount) { $scope.analysis = function (uploadDate,packageCount) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/analysisDialog.html' + urlTimeStamp(), template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
...@@ -48,7 +65,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -48,7 +65,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
console.log(uploadDate) console.log(uploadDate)
HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){ HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){
if(data){ if(data){
$scope.closeThisDialog();
MessageService.showAlert("解析完成") MessageService.showAlert("解析完成")
getData();
} }
}) })
} }
...@@ -66,7 +85,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -66,7 +85,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
for(var i in files){ for(var i in files){
fd.append('file', files[i]); fd.append('file', files[i]);
} }
var getData = $scope.getXmlPackage;
ngDialog.openConfirm({ ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(), template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600, width: 600,
...@@ -89,23 +107,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -89,23 +107,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.getXmlPackage = function(){
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
}
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems=data.respData.count;
$scope.xmlPackageData = data.respData.mapList;
console.log($scope.xmlPackageData,"$scope.xmlPackageData")
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
var reGet = $scope.getXmlPackage; var reGet = $scope.getXmlPackage;
......
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