Skip to content

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

新增页面

parent 645fa034
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 89 deletions
src/main/resources/static/index.html
View file @ b9605950
......@@ -113,85 +113,6 @@
<!--导航右边-->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- Messages: style can be found in dropdown.less-->
<li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-envelope-o"></i>
<span class="label label-success">4</span>
</a>
<ul class="dropdown-menu">
<li class="header">You have 4 messages</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
<li><!-- start message -->
<a href="#">
<p>Why not buy a new awesome theme?</p>
</a>
</li>
</ul>
</li>
<li class="footer"><a href="#">See All Messages</a></li>
</ul>
</li>
<!-- Notifications: style can be found in dropdown.less -->
<li class="dropdown notifications-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bell-o"></i>
<span class="label label-warning">10</span>
</a>
<ul class="dropdown-menu">
<li class="header">You have 10 notifications</li>
<li>
<!-- inner menu: contains the actual data -->
<ul class="menu">
<li>
<a href="#">
<i class="fa fa-users text-aqua"></i> 5 new members joined today
</a>
</li>
<li>
<a href="#">
<i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
page and may cause design problems
</a>
</li>
<li>
<a href="#">
<i class="fa fa-users text-red"></i> 5 new members joined
</a>
</li>
<li>
<a href="#">
<i class="fa fa-shopping-cart text-green"></i> 25 sales made
</a>
</li>
<li>
<a href="#">
<i class="fa fa-user text-red"></i> You changed your username
</a>
</li>
</ul>
</li>
<li class="footer"><a href="#">View all</a></li>
</ul>
</li>
<li class="dropdown user">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-user"></i>
......
src/main/resources/static/js/service.js
View file @ b9605950
......@@ -83,7 +83,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
getCountyListData: function (success) {
$http({
method: 'GET',
url: "../api/idCard/districts" + urlTimeStamp()
url: "../LogApi/selectCountyList" + urlTimeStamp()
}).then(function successCallback(response) {
success(response.data)
})
......@@ -297,15 +297,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectPackageLog:function(newPackageName,idCard,date,county,success){
// selectPackageLogCount:
selectPackageLog:function(newPackageName,idCard,date,county,currentPage,itemsPerPage,success){
if(angular.isUndefined(newPackageName)){
newPackageName='';
}
if(angular.isUndefined(idCard)){
idCard='';
}
if(angular.isUndefined(county)){
county = -1;
}
console.log(newPackageName,idCard,date,county)
$http({
method: 'GET',
url: "../CreatePackageApi/selectPackageData"+urlTimeStamp(),
url: "../LogApi/selectNewFilesLog"+urlTimeStamp(),
params:{
newPackageName:newPackageName,
idCard:idCard,
newFileName:newPackageName,
cardId:idCard,
createDate:date,
readCounty:county
uploadCountyCode:county,
currPage:currentPage,
pageSize:itemsPerPage
}
}).then(function successCallback(response) {
success(response.data)
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ b9605950
......@@ -57,7 +57,9 @@
</td>
<td>上传地区:</td>
<td>
<input type="text" class="form-control" placeholder="上传地区名称" ng-model="county"/>
<select class="form-control select2" id="print" ng-model="county">
<option ng-repeat="item in countyList" value="item.countycode">{{item.countyname}}</option>
</select>
</td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
</tr>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ b9605950
......@@ -12,6 +12,10 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
.controller('packageLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
HttpService.getCountyListData(function(data) {
$scope.countyList = data;
console.log($scope.countyList)
})
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -28,15 +32,20 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.getPackageLog = function(){
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function(data){
HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
$scope.paginationConf.totalItems = data.totalCount;
console.log($scope.paginationConf.totalItems)
})
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,"?")
})
}
});
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