Skip to content

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

1.统一风格 

2.分页
parent 9e970e27
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 38 deletions
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ da1468e1
...@@ -33,17 +33,21 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -33,17 +33,21 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
}; };
$scope.getAnalyseLog=function(){ $scope.getAnalyseLog=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.getAnalyseLogPage();
}
} }
$scope.getAnalyseLogPage = function(){ $scope.getAnalyseLogPage = function(){
HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) { HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems) console.log($scope.paginationConf.totalItems)
}) })
if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1; // $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)
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ da1468e1
...@@ -90,7 +90,14 @@ ...@@ -90,7 +90,14 @@
</div> </div>
</div> </div>
<div class="box box-default"> <div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong> <div class="box-header with-border">
<strong >制证信息详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)
<div class="pull-right">
<span style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></span>
</div>
</div>
<div class="box-info" style="padding: 7px; padding-top: 0px;"> <div class="box-info" style="padding: 7px; padding-top: 0px;">
<div ng-if="packageData.length>0"> <div ng-if="packageData.length>0">
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
...@@ -120,7 +127,6 @@ ...@@ -120,7 +127,6 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></p>
<div style="padding-left: 27%;"> <div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ da1468e1
...@@ -35,12 +35,16 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -35,12 +35,16 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
}) })
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
itemsPerPage: 10, itemsPerPage:10,
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.doPackageQuery=function(){ $scope.doPackageQuery=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.doPackageQueryPage();
}
} }
$scope.doPackageQueryPage=function(){ $scope.doPackageQueryPage=function(){
var date = $("#datepicker").val(); var date = $("#datepicker").val();
...@@ -71,9 +75,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -71,9 +75,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
date=$scope.choseDate date=$scope.choseDate
} }
if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 // $scope.paginationConf.currentPage=1
} // }
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg, HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,downloadState,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) { cardType,packageType,downloadState,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total; $scope.paginationConf.totalItems=data.total;
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ da1468e1
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
</div> </div>
<div class="box box-default"> <div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong> <div class="box-header with-border"><strong>制证信息详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;"> <div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas.length>0"> <table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
<thead> <thead>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ da1468e1
...@@ -52,8 +52,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -52,8 +52,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.doXmlQuery=function(){ $scope.doXmlQuery=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.doXmlQueryPage();
}
} }
$scope.doXmlQueryPage = function() { $scope.doXmlQueryPage = function() {
var startDate=$("#datepicker1").val(); var startDate=$("#datepicker1").val();
...@@ -73,9 +77,9 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -73,9 +77,9 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(endDate=='{{choseDate}}'){ if(endDate=='{{choseDate}}'){
endDate=$scope.choseDate; endDate=$scope.choseDate;
} }
if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 // $scope.paginationConf.currentPage=1
} // }
if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
MessageService.showAlert("请选择起始日期和结束日期") MessageService.showAlert("请选择起始日期和结束日期")
}else{ }else{
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ da1468e1
...@@ -89,17 +89,21 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -89,17 +89,21 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
perPageOptions: [5 ,10 ,15 ,20 ,25] perPageOptions: [5 ,10 ,15 ,20 ,25]
}; };
$scope.getPostPackage=function(){ $scope.getPostPackage=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.getPostPackagePage();
}
} }
$scope.getPostPackagePage = function(){ $scope.getPostPackagePage = function(){
HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) { HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) {
$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){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1; // $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)
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ da1468e1
...@@ -70,7 +70,9 @@ ...@@ -70,7 +70,9 @@
</div> </div>
</div> </div>
<div class="box box-default"> <div class="box box-default">
<strong class="box-header with-border">打包信息详情</strong> <div class="box-header with-border"><strong>打包信息详情</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;"> <div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0"> <table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0">
<thead> <thead>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ da1468e1
...@@ -35,8 +35,12 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -35,8 +35,12 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.getPackageLog=function(){ $scope.getPackageLog=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.getPackageLogPage();
}
} }
$scope.getPackageLogPage = function(){ $scope.getPackageLogPage = function(){
var county = $("#county").val(); var county = $("#county").val();
...@@ -44,9 +48,9 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -44,9 +48,9 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems") console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
}) })
if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 // $scope.paginationConf.currentPage=1
} // }
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data; $scope.packageLogData = data;
console.log($scope.packageLogData,"$scope.packageLogData") console.log($scope.packageLogData,"$scope.packageLogData")
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ da1468e1
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in json.policeCardsList"> <tr ng-repeat="item in json.policeCardsList | orderBy:'acceptNo'">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.ACCEPT_NO}}</td> <td>{{item.ACCEPT_NO}}</td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ da1468e1
...@@ -12,6 +12,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -12,6 +12,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
.controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) { .controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
$scope.acceptNo = 'ACCEPT_NO';
//Date picker //Date picker
$('#datepicker').datetimepicker({ $('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
......
src/main/resources/static/views/task/taskListPrint.html
View file @ da1468e1
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th> <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>核验日期</th> <th>核验日期</th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th> <th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th> <th>核验数量</th>
...@@ -57,7 +56,6 @@ ...@@ -57,7 +56,6 @@
<td ng-if="task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.downloadCount"></td> <td ng-if="task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.downloadCount"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td> <td class="mailbox-subject">{{task.countyValidCount}}</td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ da1468e1
...@@ -42,8 +42,12 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -42,8 +42,12 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.doQuery=function(){ $scope.doQuery=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.doQueryPage();
}
} }
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCountJson = function(){ var getCountJson = function(){
...@@ -138,9 +142,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -138,9 +142,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.notNull=notNull json.notNull=notNull
} }
if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 // $scope.paginationConf.currentPage=1
} // }
json.firstIndex=$scope.paginationConf.currentPage; json.firstIndex=$scope.paginationConf.currentPage;
json.pageSize=$scope.paginationConf.itemsPerPage; json.pageSize=$scope.paginationConf.itemsPerPage;
return json; return json;
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ da1468e1
...@@ -48,8 +48,12 @@ ...@@ -48,8 +48,12 @@
</table> </table>
</div> </div>
</div> </div>
<div class="box "> <div class="box">
<strong class="box-header with-border ">制证包管理</strong> <div class="box-header with-border">
<strong>制证包管理</strong>
(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
{{paginationConf.totalItems}}条</span>)
</div>
<div class="box box-primary"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ da1468e1
...@@ -39,13 +39,17 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -39,13 +39,17 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.getXmlPackage=function(){ $scope.getXmlPackage=function(){
$scope.paginationConf.currentPage=0; if($scope.paginationConf.currentPage!=1){
$scope.paginationConf.currentPage=1;
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage=10;
}else{
$scope.getXmlPackagePage();
} }
$scope.getXmlPackagePage = function(){
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1;
} }
$scope.getXmlPackagePage = function(){
// if($scope.paginationConf.currentPage==0){
// $scope.paginationConf.currentPage=1;
// }
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems=data.respData.count; $scope.paginationConf.totalItems=data.respData.count;
$scope.xmlPackageData = data.respData.mapList; $scope.xmlPackageData = data.respData.mapList;
......
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