Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit b3950453 authored by liboyang's avatar liboyang
Browse files
Options

新增页面

parent 019c43ef
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 12 deletions
src/main/resources/static/js/app.js
View file @ b3950453
......@@ -47,7 +47,7 @@ angular.module('AvatarCheck', [
$location.path("/login");
}
if($rootScope.loginData.login == true){
$scope.icons = [
$rootScope.icons = [
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
......
src/main/resources/static/js/service.js
View file @ b3950453
......@@ -260,13 +260,33 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectAnalyseLog:function(oldPackageName,date,success){
selectAnalyseLogCount:function (oldPackageName,date,success) {
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
$http({
method: 'GET',
url: "../LogApi/selectByAnalysisLogCount"+urlTimeStamp(),
params:{
fileName:oldPackageName,
analysisTime:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
selectAnalyseLog:function(oldPackageName,date,currentPage,itemsPerPage,success){
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
$http({
method: 'GET',
url: "../ParsingLogApi/selectParsingLog"+urlTimeStamp(),
url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),
params:{
date:date,
oldPackageData:oldPackageName
fileName:oldPackageName,
analysisTime:date,
currPage:currentPage,
pageSize:itemsPerPage
}
}).then(function successCallback(response) {
success(response.data)
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ b3950453
......@@ -51,7 +51,7 @@
</td>
</tr>
</table>
<table class="table table-bordered table-hover postTable" ng-if="analyseLog">
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<thead>
<tr>
<th>NO.</th>
......@@ -80,9 +80,12 @@
</tbody>
</table>
<div style="padding-left: 27%;" ng-if="analyseLog">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<div ng-if="analyseLog.length==0" class="box-body">
<h4>暂无数据</h4>
</div>
<div style="padding-left: 27%;" ng-if="analyseLog.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ b3950453
......@@ -28,14 +28,20 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.getAnalyseLog = function(){
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),function(data){
HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
$scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems)
})
HttpService.selectAnalyseLog($scope.oldPackageName,$("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.analyseLog = data;
console.log($scope.analyseLog)
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getAnalyseLog);
});
src/main/resources/static/views/login/login.js
View file @ b3950453
......@@ -79,6 +79,26 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
localStorageService.set('loginData', resp.data.user);
$rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
console.log($scope.menuList)
$rootScope.icons = [
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-list icon text-primary",
"fa fa-file icon text-info",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker",
"glyphicon glyphicon-briefcase icon text-danger",
"glyphicon glyphicon-th-large icon text-success",
"glyphicon glyphicon-stats icon text-primary-dker"
]
whereToGo($rootScope.loginData.roleList[0].process)
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ b3950453
......@@ -41,10 +41,13 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
})
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data;
console.log($scope.packageLogData,"?")
console.log($scope.packageLogData)
})
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPackageLog);
......
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