Skip to content

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

新增页面

parent d4ba2574
Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 22 deletions
src/main/resources/static/dialogs/confirmFailedCards.html 0 → 100644
View file @ a1e87882
<div class="ui-dialog-title">
确认信息
</div>
<div class="ui-dialog-content">
<table class="table table-responsive table-hover">
<thead>
<th>NO.</th>
<th>身份证号</th>
<th>姓名</th>
<th>性别</th>
<th>任务单编号</th>
</thead>
<tbody>
<tr ng-repeat="item in personInfo">
<td>{{$index + 1}}</td>
<td>{{item.idCard}}</td>
<td>{{item.name}}</td>
<td ng-if="item.sex==1">男</td>
<td ng-if="item.sex==2">女</td>
<td>{{item.taskId}}</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmAdd()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/js/app.js
View file @ a1e87882
...@@ -23,7 +23,7 @@ angular.module('AvatarCheck', [ ...@@ -23,7 +23,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.analysisLog', 'AvatarCheck.analysisLog',
'AvatarCheck.packageLog', 'AvatarCheck.packageLog',
'AvatarCheck.tagPrint', 'AvatarCheck.tagPrint',
'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('!');
$routeProvider.otherwise({redirectTo: '/createTaskList'}); $routeProvider.otherwise({redirectTo: '/createTaskList'});
......
src/main/resources/static/js/service.js
View file @ a1e87882
...@@ -30,7 +30,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -30,7 +30,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
} }
}) })
.service('HttpService', function ($http, $rootScope, MessageService, localStorageService, ngDialog) { .service('HttpService', function ($http, $rootScope, MessageService, localStorageService, ngDialog,$filter) {
return { return {
doPostAndGetData:function(data,success){ doPostAndGetData:function(data,success){
var body = JSON.stringify(data); var body = JSON.stringify(data);
...@@ -264,9 +264,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -264,9 +264,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
$http({ $http({
method: 'GET', method: 'GET',
url: "../LogApi/selectByAnalysisLogCount"+urlTimeStamp(), url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
params:{ params:{
fileName:oldPackageName, fileName:oldPackageName,
analysisTime:date analysisTime:date
...@@ -279,6 +282,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -279,6 +282,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(oldPackageName,date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(), url: "../LogApi/selectByAnalysisLog"+urlTimeStamp(),
...@@ -431,6 +438,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -431,6 +438,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
getPersonInfo:function(idCardArr,success){
var body = JSON.stringify(idCardArr);
$http({
method: 'POST',
url: "../FailedCardApi/selectInfoByCardId",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
addFailedCard:function(data,succuss){
var body = JSON.stringify(idCardArr);
$http({
method: 'POST',
url: "../FailedCardApi/selectInfoByCardId",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.html
View file @ a1e87882
...@@ -23,28 +23,28 @@ ...@@ -23,28 +23,28 @@
身份证号: 身份证号:
</td> </td>
<td> <td>
<input type="text" placeholder="请填写身份证号" style="height: 34px;"> <input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;">
</td> </td>
<td> <td>
废证原因: 废证原因:
</td> </td>
<td> <td>
<input type="text" placeholder="请填写废证原因" style="height: 34px;"> <input type="text" placeholder="请填写废证原因" class="{{$index}}" style="height: 34px;">
</td> </td>
<td> <td>
废证类型: 废证类型:
</td> </td>
<td> <td>
<select class="form-control select2" id="state"> <select class="form-control select2 {{$index}}" id="state">
<option value="">芯片废</option> <option value="1">芯片废</option>
<option value="">压废</option> <option value="2">压废</option>
<option value="">膜废</option> <option value="3">膜废</option>
</select> </select>
</td> </td>
</tr> </tr>
</table> </table>
<div ng-if="arr.length>0" style="text-align: right;"> <div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button> <button class="btn btn-primary" ng-click="addFailed()">添加</button>
<button class="btn btn-danger" ng-click="cancelAdd()">取消</button> <button class="btn btn-danger" ng-click="cancelAdd()">取消</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ a1e87882
...@@ -22,4 +22,50 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http']) ...@@ -22,4 +22,50 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.cancelAdd =function(){ $scope.cancelAdd =function(){
$scope.arr = []; $scope.arr = [];
} }
$scope.addFailed = function(){
var array = [];
for(var i=0;i<$scope.arr.length;i++){
for (var j=0;j<$("."+i).length;j++){
array.push($("."+i)[j].value)
}
}
var result = [];
for (var i = 0, j = array.length; i < j; i += 3) {
result.push(array.slice(i, i + 3));
}
var list=[];
for (var i=0;i<result.length;i++){
var json = {};
json.idCard=result[i][0];
json.reason=result[i][1];
json.failedType=result[i][2];
list.push(json)
}
console.log(list)
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].idCard);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
console.log($scope.personInfo)
})
$scope.confirmAdd = function(){
HttpService.addFailedCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
console.log($scope.cancelAdd)
})
}
}]
});
}
}); });
\ No newline at end of file
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ a1e87882
...@@ -23,17 +23,20 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -23,17 +23,20 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$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.getAnalyseLog = function(){ $scope.getAnalyseLog = 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)
}) // })
console.log($scope.oldPackageName,document.getElementById("datepicker").value)
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/createTaskList/createTaskList.html
View file @ a1e87882
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="createTaskList(type.typeCode)">创建任务单</button> <button class="btn btn-primary" ng-click="createTaskList(type.typeCode)">创建任务单</button>
<button class="btn btn-primary">下发任务单</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ a1e87882
...@@ -152,10 +152,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -152,10 +152,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
date:$('#datepicker').val(), date:$('#datepicker').val(),
name:$rootScope.loginData.name, name:$rootScope.loginData.name,
countyList:arr, countyList:arr,
groupList:groupList groupList:groupList,
tag:0
} }
HttpService.createTask(map,function(data){ HttpService.createTask(map,function(data){
console.log(data); MessageService.showAlert("创建成功")
$scope.searchCurrent();
}) })
} }
......
src/main/resources/static/views/receitp/receitp.html
View file @ a1e87882
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
交接单 <div class="row">
</div> <!-- /.col -->
</div> <div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<strong>交接单</strong>
<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/>
<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>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="table-responsive mailbox-messages">
<table class="table table-hover postTable ">
<thead>
<tr>
<th><input type="checkbox" class="icheckbox_flat-blue"></th>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>数量</th>
<th>打印卸载</th>
<th>电质检</th>
<th>复核日期</th>
<th>复核人姓名</th>
</tr>
</thead>
<tbody>
<tr ng-click="showDetail(1)" style="background-color: #eee">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td></td>
<td>11002</td>
<td style="color: #3c8dbc">通州分局</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr ng-click="showDetail(1)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>1</td>
<td>110021</td>
<td>西集派出所</td>
<td>2</td>
<td>2</td>
<td>0</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>2</td>
<td>110021</td>
<td>马驹桥派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>3</td>
<td>110021</td>
<td>次渠派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>4</td>
<td>110021</td>
<td>梨园派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(1)" style="background-color: #eee">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td></td>
<td>11003</td>
<td style="color: #3c8dbc">房山分局</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr ng-click="showDetail(1)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>1</td>
<td>110031</td>
<td>城关派出所</td>
<td>2</td>
<td>2</td>
<td>0</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>2</td>
<td>110031</td>
<td>石楼派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>3</td>
<td>110023</td>
<td>琉璃河派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
<tr ng-click="showDetail(2)">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td>4</td>
<td>110034</td>
<td>良乡派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td>2019-03-06 16:30</td>
<td>安浩</td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
<div class="box-footer">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">生成交接单</button>
</div>
</div>
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
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