Skip to content

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

新增页面

parent af5cf0a5
Hide whitespace changes
Inline Side-by-side
Showing with 613 additions and 109 deletions
src/main/java/com/yxproject/start/api/TagPrintApi.java 0 → 100644
View file @ 9384c6f1
package com.yxproject.start.api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("tagPrint")
public class TagPrintApi {
@RequestMapping("selectTagPrintData")
public List selectTagPrintData(@RequestParam("idCard")String idCard){
List list = new ArrayList();
return list;
}
}
src/main/resources/static/dialogs/analysisDialog.html
View file @ 9384c6f1
...@@ -83,9 +83,6 @@ ...@@ -83,9 +83,6 @@
</tbody> </tbody>
</table> </table>
<div style="padding-left: 27%;" ng-if="resultData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<div class="progress"> <div class="progress">
......
src/main/resources/static/js/app.js
View file @ 9384c6f1
...@@ -159,7 +159,6 @@ angular.module('AvatarCheck', [ ...@@ -159,7 +159,6 @@ angular.module('AvatarCheck', [
} }
$scope.doSearch = function (searchInput) { $scope.doSearch = function (searchInput) {
$rootScope.searchResult={};
$scope.msg=""; $scope.msg="";
$scope.alertMsg=""; $scope.alertMsg="";
var pattern = /^[0-9]*$/ var pattern = /^[0-9]*$/
...@@ -171,8 +170,9 @@ angular.module('AvatarCheck', [ ...@@ -171,8 +170,9 @@ angular.module('AvatarCheck', [
if(data==''){ if(data==''){
$scope.alertMsg = "暂无数据"; $scope.alertMsg = "暂无数据";
}else{ }else{
$rootScope.searchResult = data; $scope.searchResult = data;
console.log($rootScope.searchResult) console.log($scope.searchResult,"searchResult")
console.log($scope.searchResult['workOrderDate'],"searchResultWorkOrderDate")
} }
}) })
......
src/main/resources/static/js/service.js
View file @ 9384c6f1
...@@ -437,6 +437,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -437,6 +437,32 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getCreateHistoryTask:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process-1,
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
getHistoryTask:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process,
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
getGroupListData:function(saveDate,countyCode,typeCode,currPage,pageSize,success){ getGroupListData:function(saveDate,countyCode,typeCode,currPage,pageSize,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -530,18 +556,16 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -530,18 +556,16 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
analyseData:function(date,currPage,pageSize,success){ analyseData:function(date,success){
if(date==''){ if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd"); date=$filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(date,currPage,pageSize) console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXML"+urlTimeStamp(), url: "../LogApi/selectAnalysisData"+urlTimeStamp(),
params:{ params:{
importDate:date, uploadName:date
currPage:currPage,
pageSize:pageSize
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -554,7 +578,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -554,7 +578,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
console.log(date) console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXMLCount"+urlTimeStamp(), url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
params:{ params:{
importDate:date importDate:date
} }
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 9384c6f1
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -94,7 +94,56 @@ ...@@ -94,7 +94,56 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover">
<thead>
<tr>
<th>保存日期</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 9384c6f1
...@@ -25,7 +25,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -25,7 +25,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchCurrent = function(){ $scope.searchCurrent = function(){
$scope.isHistory=0;
HttpService.getTaskListToCreate($('#datepicker').val(),function(data){ HttpService.getTaskListToCreate($('#datepicker').val(),function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -36,11 +38,25 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -36,11 +38,25 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
} }
} }
console.log($scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
} }
$scope.searchCurrent(); $scope.searchCurrent();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getCreateHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
...@@ -72,6 +88,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -72,6 +88,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.paginationConf.totalItems = data.count; $scope.paginationConf.totalItems = data.count;
$scope.policeList =data.groupList; $scope.policeList =data.groupList;
console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 9384c6f1
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchTaskList()">查询</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" > <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -97,6 +97,84 @@ ...@@ -97,6 +97,84 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>废证数量</th>
<th>特殊证件数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
<td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
<td class="mailbox-date">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 9384c6f1
...@@ -22,7 +22,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -22,7 +22,9 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -32,11 +34,25 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -32,11 +34,25 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.cycleSheetData[i].isActive=false; $scope.cycleSheetData[i].isActive=false;
} }
} }
console.log($scope.cycleSheetData) console.log("当天：",$scope.cycleSheetData)
}) })
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ 9384c6f1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
请输入要查询的受理号/身份证号/任务单编号 请输入要查询的受理号/身份证号/任务单编号
</h4> </h4>
<!--任务单--> <!--任务单-->
<div class="panel panel-info" ng-if="searchResult.workOrderData.length>0"> <div class="panel panel-info" ng-if="searchResult.workOrderDate.length>0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
任务单 任务单
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<th>仓库</th> <th>仓库</th>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in searchResult.workOrderData"> <tr ng-repeat="item in searchResult.workOrderDate">
<td>{{item.TASK_ID}}</td> <td>{{item.TASK_ID}}</td>
<td>{{item.COUNTYNAME}}</td> <td>{{item.COUNTYNAME}}</td>
<td>{{item.CARD_TYPE}}</td> <td>{{item.CARD_TYPE}}</td>
...@@ -151,6 +151,13 @@ ...@@ -151,6 +151,13 @@
</div> </div>
</div> </div>
<h4>{{searchResult.workOrderDate}}</h4>
<h4>{{searchResult.workOrderDate.length}}</h4>
<h4>{{searchResult.ACCdata.length}}</h4>
<h4>{{searchResult.PRODData.length}}</h4>
<div ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
<h4>没有查询到相关信息</h4>
</div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/task/task.js
View file @ 9384c6f1
...@@ -44,76 +44,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -44,76 +44,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
// $scope.cycleSheetData = [ $scope.isHistory=0;
// {
// typeCode: '1',
// typeName: '普通证',
// typeSum: 300,
// isActive: 'true',
// countyList: [
// {
// taskId: '20190228001',
// county: '西城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// },
// {
// taskId: '20190228001',
// county: '东城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// },
// {
// taskId: '20190228001',
// county: '海淀区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// }
// ]
// },
// {
// typeCode: '9',
// typeName: '邮寄证',
// typeSum: 500,
// isActive: 'false',
// countyList: [
// {
// taskId: '20190228001',
// county: '东城区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:1
// },
// {
// taskId: '20190228001',
// county: '海淀区',
// groupNo: '00234653-03687587',
// checkDate:'20190301',
// groupCount:160,
// dataCheckCount:160,
// electricCount:160,
// failedCount:0
// }
// ]
// }
// ]
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
...@@ -128,6 +61,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -128,6 +61,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//TODO 需要保证有废证的任务单不能下发 //TODO 需要保证有废证的任务单不能下发
//创建变量用来保存选中结果 //创建变量用来保存选中结果
...@@ -277,7 +224,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -277,7 +224,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
$scope.isHistory=0;
HttpService.getPingTaskListByProcess(function(data){ HttpService.getPingTaskListByProcess(function(data){
$scope.cycleSheetData = data.typeList; $scope.cycleSheetData = data.typeList;
$scope.total = data.total; $scope.total = data.total;
...@@ -293,6 +242,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -293,6 +242,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.searchTaskList(); $scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
var updateSelected = function (action, task) { var updateSelected = function (action, task) {
......
src/main/resources/static/views/task/taskListCutting.html
View file @ 9384c6f1
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></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.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 9384c6f1
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></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.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 9384c6f1
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -114,6 +114,89 @@ ...@@ -114,6 +114,89 @@
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></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.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 9384c6f1
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body" ng-if="isHistory==0">
<div ng-if="cycleSheetData.length>0"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
...@@ -105,6 +105,89 @@ ...@@ -105,6 +105,89 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div class="box-body" ng-if="isHistory==1">
<div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></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.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ 9384c6f1
...@@ -38,20 +38,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -38,20 +38,20 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
width: 876, width: 876,
cache: false, cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) { controller: ['$scope','HttpService', function ($scope,HttpService) {
$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.upDate =uploadDate; $scope.upDate =uploadDate;
$scope.upCount=packageCount; $scope.upCount=packageCount;
$scope.getAnalyseData = function() { $scope.getAnalyseData = function() {
HttpService.analyseDataCount(uploadDate, function (data) { // HttpService.analyseDataCount(uploadDate, function (data) {
$scope.paginationConf.totalItems =data.respData.string; // $scope.paginationConf.totalItems =data.respData.string;
console.log($scope.paginationConf.totalItems) // console.log($scope.paginationConf.totalItems)
}) // })
HttpService.analyseData(uploadDate, $scope.paginationConf.currentPage, $scope.paginationConf.itemsPerPage, function (data) { HttpService.analyseData(uploadDate, function (data) {
$scope.resultData = data.respData; $scope.resultData = data;
console.log($scope.resultData) console.log($scope.resultData)
}) })
} }
......
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