Skip to content

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

新增添加废证、余证、回迁证页面 

增加解析日志和打包日志页面
parent d8ca0dbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 48 deletions
src/main/resources/static/index.html
View file @ a145ed63
...@@ -216,6 +216,12 @@ ...@@ -216,6 +216,12 @@
<span>添加余证</span> <span>添加余证</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/historyBack']" ng-click="getFocus('/historyBack')">
<a href="#!/historyBack">
<i class="fa fa-plus"></i>
<span>历史回迁证</span>
</a>
</li>
<li> <li>
<a ng-click="logout()"> <a ng-click="logout()">
<i class="glyphicon glyphicon-user"></i> <i class="glyphicon glyphicon-user"></i>
...@@ -257,5 +263,8 @@ ...@@ -257,5 +263,8 @@
<script src="views/dispatchTask/dispatchTask.js"></script> <script src="views/dispatchTask/dispatchTask.js"></script>
<script src="views/addRest/addRest.js"></script> <script src="views/addRest/addRest.js"></script>
<script src="views/login/login.js"></script> <script src="views/login/login.js"></script>
<script src="views/historyCards/historyBack.js"></script>
<script src="views/analysisLog/analysisLog.js"></script>
<script src="views/packageLog/packageLog.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ a145ed63
...@@ -19,6 +19,9 @@ angular.module('AvatarCheck', [ ...@@ -19,6 +19,9 @@ angular.module('AvatarCheck', [
'AvatarCheck.createTaskList', 'AvatarCheck.createTaskList',
'AvatarCheck.dispatchTask', 'AvatarCheck.dispatchTask',
'AvatarCheck.login', 'AvatarCheck.login',
'AvatarCheck.historyBack',
'AvatarCheck.analysisLog',
'AvatarCheck.packageLog',
'tm.pagination' 'tm.pagination'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
...@@ -99,6 +102,10 @@ angular.module('AvatarCheck', [ ...@@ -99,6 +102,10 @@ angular.module('AvatarCheck', [
if ($location.path() == "/dispatchTask") { if ($location.path() == "/dispatchTask") {
$rootScope.tab = '/dispatchTask'; $rootScope.tab = '/dispatchTask';
} }
if ($location.path() == "/historyBack") {
$rootScope.tab = '/historyBack';
}
console.log($rootScope.tab) console.log($rootScope.tab)
......
src/main/resources/static/js/service.js
View file @ a145ed63
...@@ -153,6 +153,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -153,6 +153,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
uploadExcelFile:function(fd,success){
$http({
method: 'POST',
url: "../ReadExcel/ReadPersonPost",
data: fd,
headers: {'Content-Type': undefined},
transformRequest: angular.identity
}).then(function successCallback(response) {
success(response.data)
})
},
logout:function(success){ logout:function(success){
$http({ $http({
method: 'GET', method: 'GET',
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ a145ed63
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;"> <section class="content-header" style="padding-top: 1px;">
<h4> <h4>
添加废证 添加废证
</h4> </h4>
</section> </section>
\ No newline at end of file <div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="failedCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
<td>
身份证号:
</td>
<td>
<input type="text" placeholder="请填写身份证号" style="height: 34px;">
</td>
<td>
废证原因:
</td>
<td>
<input type="text" placeholder="请填写废证原因" style="height: 34px;">
</td>
<td>
废证类型:
</td>
<td>
<select class="form-control select2" id="state">
<option value="">芯片废</option>
<option value="">压废</option>
<option value="">膜废</option>
</select>
</td>
</tr>
</table>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button>
<button class="btn btn-danger" ng-click="cancelAdd()">取消</button>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.js
View file @ a145ed63
...@@ -11,5 +11,15 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http']) ...@@ -11,5 +11,15 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
.controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createInputs = function(){
$scope.arr = [];
for (var i=0;i<$scope.failedCount;i++){
$scope.arr.push(i);
}
}
$scope.cancelAdd =function(){
$scope.arr = [];
}
}); });
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html
View file @ a145ed63
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
/*清除浮动代码*/
.cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
.cl{zoom:1}
</style>
<section class="content-header" style="padding-top: 1px;"> <section class="content-header" style="padding-top: 1px;">
<h4> <h4>
添加余证 添加余证
</h4> </h4>
</section> </section>
\ No newline at end of file <div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">余证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="restCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<ul class="cl">
<li ng-repeat="item in arr" style="float: left;margin:0 10px 10px 0">
<input type="text" style="height: 34px;" placeholder="请输入身份证号或受理号">
</li>
</ul>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button>
<button class="btn btn-danger" ng-click="cancelAddRest()">取消</button>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.js
View file @ a145ed63
...@@ -11,5 +11,15 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http']) ...@@ -11,5 +11,15 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
.controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createInputs = function(){
$scope.arr = [];
for (var i=0;i<$scope.restCount;i++){
$scope.arr.push(i);
}
}
$scope.cancelAddRest =function(){
$scope.arr = [];
}
}); });
\ No newline at end of file
src/main/resources/static/views/analysisLog/analysisLog.html 0 → 100644
View file @ a145ed63
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
解析日志
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>原始包数据:</td>
<td>
<input type="text" class="form-control" placeholder="原始包数据"/>
</td>
<td>
解析时间
</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td>
<button class="btn btn-primary">查询</button>
</td>
</tr>
</table>
<table class="table table-bordered table-hover postTable">
<thead>
<tr>
<th>NO.</th>
<th>原数据包名</th>
<th>记录数</th>
<th>格口文件名</th>
<th>解析时间</th>
<th>普通证</th>
<th>个人邮寄证</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>123420190302001</td>
<td>300</td>
<td>格口信息.xls</td>
<td>20190302</td>
<td>200</td>
<td>150</td>
</tr>
<tr>
<td>2</td>
<td>123420190302002</td>
<td>300</td>
<td>格口信息.xls</td>
<td>20190301</td>
<td>50</td>
<td>250</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
</table>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/analysisLog/analysisLog.js 0 → 100644
View file @ a145ed63
'use strict';
angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/analysisLog', {
templateUrl: 'views/analysisLog/analysisLog.html' + urlTimeStamp(),
controller: 'analysisLogCtrl',
cache: false
});
}])
.controller('analysisLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
});
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ a145ed63
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<td colspan="2"> <td colspan="2">
<input type="file" id="id_file_photo_for_check" class="file" data-show-preview="true" multiple/> <input type="file" id="id_file_photo_for_check" class="file" data-show-preview="true" multiple/>
</td> </td>
<td style="text-align: left;"><button class="btn btn-primary" ng-click="uploadFile()">上传</button></td> <td style="text-align: left;"><button class="btn btn-primary" ng-click="uploadExcel()">上传</button></td>
</tr> </tr>
</table> </table>
</div> </div>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ a145ed63
...@@ -45,5 +45,22 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -45,5 +45,22 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
}; };
$scope.paginationConf.totalItems = 50; $scope.paginationConf.totalItems = 50;
$scope.uploadExcel = function () {
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
for(var i in files){
fd.append('file', files[i]);
}
if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...")
}else{
fd.append('file', files);
HttpService.uploadExcelFile(fd,function (data) {
console.log("导入项目的返回结果：",data)
})
}
}
}); });
\ No newline at end of file
src/main/resources/static/views/historyCards/historyBack.html 0 → 100644
View file @ a145ed63
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
历史回迁证
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<div class="box-primary">
<form style="padding-left: 15px;">
<span style="font-size:20px;">回迁证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
<input type="submit" class="btn btn-primary" value="确定" ng-click="createHistoryInputs()">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
<td>
身份证号:
</td>
<td>
<input type="text" placeholder="请填写身份证号" style="height: 34px;">
</td>
<td>
制证类型:
</td>
<td>
<select class="form-control select2" id="state">
<option value="">普通证</option>
<option value="">邮寄证</option>
</select>
</td>
<td>
地区:
</td>
<td>
<select class="form-control select2" id="state">
<option value="">回迁证</option>
<option value="">东城区</option>
<option value="">西城区</option>
</select>
</td>
</tr>
</table>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button>
<button class="btn btn-danger" ng-click="cancelAddHistory()">取消</button>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/historyCards/historyBack.js 0 → 100644
View file @ a145ed63
'use strict';
angular.module('AvatarCheck.historyBack', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/historyBack', {
templateUrl: 'views/historyCards/historyBack.html' + urlTimeStamp(),
controller: 'historyBackCtrl',
cache: false
});
}])
.controller('historyBackCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createHistoryInputs = function(){
$scope.arr = [];
for (var i=0;i<$scope.historyCount;i++){
$scope.arr.push(i);
}
}
$scope.cancelAddHistory =function(){
$scope.arr = [];
}
});
\ No newline at end of file
src/main/resources/static/views/packageLog/packageLog.html 0 → 100644
View file @ a145ed63
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<section class="content-header" style="padding-top: 1px;">
<h4>
打包日志
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%">新包名:</td>
<td width="15%">
<input type="text" class="form-control" placeholder="原始包数据"/>
</td>
<td width="10%">身份证:
</td>
<td width="15%">
<input type="text" class="form-control" placeholder="身份证号"/>
</td>
<td width="10%">
生成时间:
</td>
<td width="15%">
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td width="10%">上传地区:</td>
<td width="15%">
<input type="text" class="form-control" placeholder="上传地区名称"/>
</td>
<td><button class="btn btn-primary">查询</button></td>
</tr>
</table>
<table class="table table-bordered table-hover postTable">
<thead>
<tr>
<th>NO.</th>
<th>新包名</th>
<th>生成时间</th>
<th>记录数</th>
<th>上传地区代码</th>
<th>上传地区名称</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>123420190302001</td>
<td>20190302</td>
<td>300</td>
<td>110012</td>
<td>朝阳区</td>
</tr>
<tr>
<td>2</td>
<td>123420190302002</td>
<td>20190301</td>
<td>400</td>
<td>110013</td>
<td>海淀区</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
</table>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/packageLog/packageLog.js 0 → 100644
View file @ a145ed63
'use strict';
angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/packageLog', {
templateUrl: 'views/packageLog/packageLog.html' + urlTimeStamp(),
controller: 'packageLogCtrl',
cache: false
});
}])
.controller('packageLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
});
src/main/resources/static/views/task/taskListPreLocating.html
View file @ a145ed63
<section class="content-header" style="padding-top: 1px;"> <section class="content-header" style="padding-top: 1px;">
<h4> <h4>
任务单 任务单
...@@ -13,8 +12,8 @@ ...@@ -13,8 +12,8 @@
<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;" 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>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
...@@ -31,6 +30,9 @@ ...@@ -31,6 +30,9 @@
</ul> </ul>
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
...@@ -39,10 +41,13 @@ ...@@ -39,10 +41,13 @@
<tr> <tr>
<th><input type="checkbox"></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>
<th>废证数量</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -50,11 +55,14 @@ ...@@ -50,11 +55,14 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.checkDate}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-subject"><a>{{task.groupCount}}</a></td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
<td class="mailbox-date"><a href="#">组号列表</a></td> <td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -63,6 +71,9 @@ ...@@ -63,6 +71,9 @@
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ a145ed63
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</ul> </ul>
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;"> <li class="pull-right" style="padding-right: 20px;">
<h5>任务总数:8001</h5> <h5>任务总数:8001</h5>
<h4>余证数:1</h4> <h4>余证数:1</h4>
</li> </li>
...@@ -38,29 +38,35 @@ ...@@ -38,29 +38,35 @@
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <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"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></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> <th>废证数量</th>
<tbody> <th></th>
<tr ng-repeat="task in type.countyList"> </tr>
<td><input type="checkbox" class="icheckbox_flat-blue"></td> </thead>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <tbody>
<td class="mailbox-name"><a>{{task.county}}</a></td> <tr ng-repeat="task in type.countyList">
<td class="mailbox-subject">{{task.groupNo}}</td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-subject"><a>{{task.checkDate}}</a></td>
<td class="mailbox-date"><a href="#">组号列表</a></td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
</tr> <td class="mailbox-subject"><a>{{task.groupCount}}</a></td>
</tbody> <td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
</table> <td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table --> <!-- /.table -->
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
......
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ a145ed63
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<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;" 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>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
</ul> </ul>
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
...@@ -38,10 +41,13 @@ ...@@ -38,10 +41,13 @@
<tr> <tr>
<th><input type="checkbox"></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>
<th>废证数量</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -49,11 +55,14 @@ ...@@ -49,11 +55,14 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.checkDate}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-subject"><a>{{task.groupCount}}</a></td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
<td class="mailbox-date"><a href="#">组号列表</a></td> <td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -62,6 +71,9 @@ ...@@ -62,6 +71,9 @@
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ a145ed63
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<td colspan="2" width="35%"> <td colspan="2" width="35%">
<input type="file" id="id_file_photo_for_check" class="file" data-show-preview="false" multiple="multiple"/> <input type="file" id="id_file_photo_for_check" class="file" data-show-preview="false" multiple="multiple"/>
</td> </td>
<td style="text-align: left;"><button class="btn btn-primary" ng-click="uploadFile()">上传</button></td> <td style="text-align: left;"><button class="btn btn-primary" ng-click="uploadXml()">上传</button></td>
</tr> </tr>
</table> </table>
</div> </div>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ a145ed63
...@@ -48,7 +48,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -48,7 +48,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
}); });
} }
$scope.uploadFile = function () { $scope.uploadXml = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
for(var i in files){ for(var i in files){
......
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