Skip to content

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

新增页面

parent 3340e6c1
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 138 deletions
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ f0127518
...@@ -202,9 +202,11 @@ public class ReadExcelApi { ...@@ -202,9 +202,11 @@ public class ReadExcelApi {
@RequestMapping("deleteByFileId") @RequestMapping("deleteByFileId")
public String deleteFileById(@RequestParam("fileId")String fileId){ public Map<String,String> deleteFileById(@RequestParam("fileId")String fileId){
fileNameDicService.deleteFileByFileId(fileId); fileNameDicService.deleteFileByFileId(fileId);
return "删除成功"; Map<String,String> map = new HashMap<>();
map.put("msg","删除成功");
return map;
} }
private String replaceDate(String str){ private String replaceDate(String str){
......
src/main/resources/static/dialogs/policeList.html
View file @ f0127518
<div class="ui-dialog-title"> <div class="ui-dialog-title">
派出所数量详情 组号详情
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<table class="table table-responsive" style="border-color: black;"> <table class="table" style="border-color: black;">
<thead> <thead>
<tr> <tr>
<th>派出所名称</th> <th>组号</th>
<th>数据核验数量</th> <th>合格数量</th>
<th>打印卸载数量</th> <th>不合格数量</th>
<th>质检数量</th> <th>组状态</th>
<th>废证数量</th> <th>核验提交时间</th>
<th>核验人</th>
<th>装库日期</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in policeList"> <tr ng-repeat="groups in policeList">
<td>{{item.policeName}}</td> <td>{{groups.GROUP_NO}}</td>
<td>{{item.dataCheckCount}}</td> <td>{{groups.VALID_COUNT}}</td>
<td>{{item.printCount}}</td> <td>{{groups.INVALID_COUNT}}</td>
<td>{{item.qualityCheckCount}}</td> <td ng-if="groups.DEAL_FLAG==0">未处理</td>
<td>{{item.failedCount}}</td> <td ng-if="groups.DEAL_FLAG==1||groups.DEAL_FLAG==2">处理中</td>
<td ng-if="groups.DEAL_FLAG==3">可以转出</td>
<td>{{groups.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{groups.SUBMIT_CODE}}</td>
<td>{{groups.IMPORT_TIME | date:'yyyy-MM-dd'}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/js/service.js
View file @ f0127518
...@@ -323,6 +323,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -323,6 +323,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
deleteByFileId:function(fileId,success){ deleteByFileId:function(fileId,success){
console.log(fileId)
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReadExcel/deleteByFileId"+urlTimeStamp(), url: "../ReadExcel/deleteByFileId"+urlTimeStamp(),
...@@ -330,6 +331,21 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -330,6 +331,21 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
fileId:fileId fileId:fileId
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data)
success(response.data)
})
},
getTaskListToCreate:function(date,success){
console.log($rootScope.loginData.roleList[0].process,date)
$http({
method: 'GET',
url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process,
date:date
}
}).then(function successCallback(response) {
console.log(response.data)
success(response.data) success(response.data)
}) })
} }
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ f0127518
...@@ -15,53 +15,58 @@ ...@@ -15,53 +15,58 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div ng-if="cycleSheetData.length>0">
<ul class="nav nav-tabs"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]" <ul class="nav nav-tabs">
ng-repeat="tab in cycleSheetData track by $index"> <li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
<a ng-click="func($index,tab.typeCode)"> ng-repeat="tab in cycleSheetData track by $index">
<ul style="margin: 0;padding: 0;"> <a ng-click="func($index,tab.typeCode)">
<li style="font-size: 16px;">{{tab.typeName}}</li> <ul style="margin: 0;padding: 0;">
<li style="text-align: center;">{{tab.typeSum}}</li> <li style="font-size: 16px;">{{tab.typeName}}</li>
</ul> <li style="text-align: center;">{{tab.typeSum}}</li>
</a> </ul>
</li> </a>
</ul> </li>
</div> </ul>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> </div>
<table class="table table-hover table-striped"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<thead> <table class="table table-hover table-striped">
<tr> <thead>
<th><input type="checkbox"></th> <tr>
<th>保存日期</th> <th><input type="checkbox"></th>
<th>地区</th> <th>保存日期</th>
<th>组数</th> <th>地区</th>
<th>受理组号</th> <th>组数</th>
<th>合格数量</th> <th>受理组号</th>
<th>不合格数量</th> <th>合格数量</th>
<th></th> <th>不合格数量</th>
</tr> <th></th>
</thead> </tr>
<tbody> </thead>
<tr ng-repeat="task in type.countyList"> <tbody>
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <tr ng-repeat="task in type.countyList">
<td class="mailbox-star"><b>{{task.saveDate}}</b></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date">{{task.countyInvalidCount}}</td>
</tr> <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
</tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
</div> </div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;" ng-if="cycleSheetData.length>0">
<button class="btn btn-primary">创建任务单</button> <button class="btn btn-primary">创建任务单</button>
<button class="btn btn-primary">下发任务单</button> <button class="btn btn-primary">下发任务单</button>
</div> </div>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ f0127518
...@@ -22,64 +22,24 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -22,64 +22,24 @@ 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.cycleSheetData = [
{ $scope.searchCurrent = function(){
typeCode: '1', HttpService.getTaskListToCreate($('#datepicker').val(),function(data){
typeName: '普通证', $scope.cycleSheetData = data;
typeSum: 300, for(var i=0;i<$scope.cycleSheetData.length;i++){
isActive: 'true', if(i==$scope.currentTab){
countyList: [ $scope.cycleSheetData[i].isActive=true;
{ }else{
saveDate: '20190228', $scope.cycleSheetData[i].isActive=false;
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
},
{
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
}
]
},
{
typeCode: '9',
typeName: '邮寄证',
typeSum: 500,
isActive: 'false',
countyList: [
{
saveDate: '20190228',
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
} }
] }
}
] console.log($scope.cycleSheetData)
})
}
$scope.searchCurrent();
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
for (var idx in $scope.cycleSheetData) { for (var idx in $scope.cycleSheetData) {
...@@ -92,27 +52,14 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -92,27 +52,14 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.currentTab = index; $scope.currentTab = index;
} }
$scope.getPoliceList = function(taskId){ $scope.getPoliceList = function(groupList){
ngDialog.open({ ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(), template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument:false,
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.policeList = [ $scope.policeList =groupList;
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0
},
]
}] }]
}); });
} }
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ f0127518
...@@ -57,7 +57,9 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -57,7 +57,9 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
fd.append('file', files[i]); fd.append('file', files[i]);
} }
HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) { HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
console.log("导入项目的返回结果：",data) if(data){
MessageService.showAlert("上传成功")
}
}) })
} }
} }
...@@ -68,9 +70,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -68,9 +70,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
perPageOptions: [5 ,10 ,15 ,20 ,25] perPageOptions: [5 ,10 ,15 ,20 ,25]
}; };
var date = $("#datepicker3").val();
$scope.getPostPackage = function(){ $scope.getPostPackage = function(){
console.log($scope.fileName,$scope.state,$("#datepicker3").val())
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)
...@@ -81,6 +81,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -81,6 +81,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
}) })
} }
var reGetPostData = $scope.getPostPackage;
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPostPackage); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getPostPackage);
...@@ -92,13 +93,12 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -92,13 +93,12 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
closeByDocument:false, closeByDocument:false,
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.total = 1; $scope.total = 1;
$scope.importDate = $filter('date')(importDate, 'yyyy-MM-dd');; $scope.importDate = $filter('myDateFilter')(importDate, 'yyyy-MM-dd');;
$scope.confirmDelete = function () { $scope.confirmDelete = function () {
HttpService.deleteByFileId(fileid, function (data) { HttpService.deleteByFileId(fileid, function (data) {
console.log(data) MessageService.showAlert(data.msg);
$scope.getPostPackage(date)
$scope.closeThisDialog(); $scope.closeThisDialog();
MessageService.showAlert(data); reGetPostData();
}) })
}; };
......
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