Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 453156f7 authored by suichenguang's avatar suichenguang
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 8cdcbd80 5c1c7095
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 54 deletions
src/main/resources/static/dialogs/analysisDialog.html
View file @ 453156f7
<div class="ui-dialog-title" > <div class="ui-dialog-title" >
请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 制证包 请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 个制证包
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<table class="table table-hover" > <table class="table table-hover" >
......
src/main/resources/static/index.html
View file @ 453156f7
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<strong>北京制证辅助平台</strong> <strong>北京制证辅助平台</strong>
</footer> </footer>
</div> </div>
<div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;"> <div ng-if="loginData.login == false" class="wrapper" style=background-image:url(newTheme/dist/img/download.jpg);background-repeat:repeat;height:100%;">
<div style="min-height: 500px;" ng-view></div> <div style="min-height: 500px;" ng-view></div>
</div> </div>
......
src/main/resources/static/js/app.js
View file @ 453156f7
...@@ -209,7 +209,7 @@ angular.module('AvatarCheck', [ ...@@ -209,7 +209,7 @@ angular.module('AvatarCheck', [
var check = idx.split("+"); var check = idx.split("+");
var json={}; var json={};
json.acceptNo=check[0]; json.acceptNo=check[0];
json.cardType=check[2]; json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
json.countyCode=check[1]; json.countyCode=check[1];
json.name=$rootScope.loginData.name; json.name=$rootScope.loginData.name;
console.log(json) console.log(json)
...@@ -229,7 +229,7 @@ angular.module('AvatarCheck', [ ...@@ -229,7 +229,7 @@ angular.module('AvatarCheck', [
console.log(idx,check) console.log(idx,check)
var json={}; var json={};
json.acceptNo=check[0]; json.acceptNo=check[0];
json.cardType=check[2]; json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
json.countyCode=check[1]; json.countyCode=check[1];
json.name=$rootScope.loginData.name; json.name=$rootScope.loginData.name;
console.log(json) console.log(json)
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 453156f7
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</thead> </thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
<tr> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" name="{{task.countyValidCount}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td> <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-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<h4>已选择数量：{{cardsTotal+groupCardsTotal}}</h4>
<button class="btn btn-primary" ng-click="createTaskList(type.typeCode)">创建任务单</button> <button class="btn btn-primary" ng-click="createTaskList(type.typeCode)">创建任务单</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 453156f7
...@@ -101,7 +101,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -101,7 +101,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
// }] // }]
// }); // });
// } // }
$rootScope.selectedGroup = []; $rootScope.selectedGroup = [];
$scope.getPoliceList = function(groupList){ $scope.getPoliceList = function(groupList){
ngDialog.open({ ngDialog.open({
...@@ -111,6 +110,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -111,6 +110,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
closeByDocument:false, closeByDocument:false,
controller: ['$scope', 'HttpService',function ($scope) { controller: ['$scope', 'HttpService',function ($scope) {
$scope.policeList=groupList; $scope.policeList=groupList;
$rootScope.groupCardsTotal = 0;
//创建变量用来保存选中结果 //创建变量用来保存选中结果
var updateSelected = function (action, task) { var updateSelected = function (action, task) {
if (action === 'add' &&$rootScope.selectedGroup.indexOf(task) === -1) { if (action === 'add' &&$rootScope.selectedGroup.indexOf(task) === -1) {
...@@ -119,12 +119,17 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -119,12 +119,17 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
if (action === 'remove' && $rootScope.selectedGroup.indexOf(task) !== -1) $rootScope.selectedGroup.splice($rootScope.selectedGroup.indexOf(task), 1); if (action === 'remove' && $rootScope.selectedGroup.indexOf(task) !== -1) $rootScope.selectedGroup.splice($rootScope.selectedGroup.indexOf(task), 1);
}; };
//更新某一列数据的选择 //更新某一列数据的选择
var temp = 0;
$rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) { $scope.updateSelection = function ($event, task) {
var checkbox = $event.target; var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove'); var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task); updateSelected(action, task);
$rootScope.groupCardsTotal=0
var sum = 0;
for (var i = 0; i < $scope.selectedGroup.length; i++) {
sum += parseInt($scope.selectedGroup[i].VALID_COUNT);
}
$rootScope.groupCardsTotal = $rootScope.groupCardsTotal + sum ;
}; };
//全选操作 //全选操作
$scope.selectAll = function (task,$event) { $scope.selectAll = function (task,$event) {
...@@ -133,7 +138,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -133,7 +138,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
for (var i = 0; i < task.length; i++) { for (var i = 0; i < task.length; i++) {
var contact = task[i]; var contact = task[i];
updateSelected(action, contact); updateSelected(action, contact);
$rootScope.groupCardsTotal=0
}
var sum = 0;
for (var i = 0; i < $scope.selectedGroup.length; i++) {
sum += parseInt($scope.selectedGroup[i].VALID_COUNT);
} }
$rootScope.groupCardsTotal = $rootScope.groupCardsTotal + sum ;
}; };
$scope.isSelected = function (task) { $scope.isSelected = function (task) {
return $rootScope.selectedGroup.indexOf(task) >= 0; return $rootScope.selectedGroup.indexOf(task) >= 0;
...@@ -154,22 +167,19 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -154,22 +167,19 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1); if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
}; };
//更新某一列数据的选择 //更新某一列数据的选择
var temp = 0;
$rootScope.cardsTotal = 0; $rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) { $scope.updateSelection = function ($event, task) {
var checkbox = $event.target; var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove'); var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task); updateSelected(action, task);
$rootScope.cardsTotal=0;
var sum = 0; var sum = 0;
var checks = document.getElementsByClassName("checkOneBox"); for (var i = 0; i < $scope.selected.length; i++) {
for (var i=0;i<checks.length;i++){ sum += parseInt($scope.selected[i].countyValidCount);
if (checks[i].checked) {
sum += parseInt(checks[i].value);
} }
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp; $rootScope.cardsTotal = $rootScope.cardsTotal + sum ;
temp = sum;
}; };
//全选操作 //全选操作
...@@ -180,21 +190,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -180,21 +190,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
var contact = task[i]; var contact = task[i];
updateSelected(action, contact); updateSelected(action, contact);
} }
$rootScope.cardsTotal=0;
if(checkbox.checked){
var sum = 0; var sum = 0;
var checks = document.getElementsByClassName("checkOneBox"); for (var i = 0; i < $scope.selected.length; i++) {
for (var i = 0; i < checks.length; i++) { sum += parseInt($scope.selected[i].countyValidCount);
sum += parseInt(checks[i].value);
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
temp = sum;
}else{
$rootScope.cardsTotal =0;
temp = 0;
} }
$rootScope.cardsTotal = $rootScope.cardsTotal + sum;
}; };
$scope.isSelected = function (task) { $scope.isSelected = function (task) {
return $scope.selected.indexOf(task) >= 0; return $scope.selected.indexOf(task) >= 0;
...@@ -204,7 +205,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -204,7 +205,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
}; };
$scope.createTaskList = function(typeCode){ $scope.createTaskList = function(typeCode){
if($scope.selected.length>0){ if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
var arr = []; var arr = [];
for (var i=0;i<$scope.selected.length;i++){ for (var i=0;i<$scope.selected.length;i++){
var json = { var json = {
...@@ -213,13 +214,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -213,13 +214,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
} }
arr.push(json); arr.push(json);
} }
var groupList = []; var groupList = [];
for (var i=0;i<$scope.selectedGroup.length;i++){
groupList.push($scope.selectedGroup[i].GROUP_NO)
}
var map = { var map = {
date:$('#datepicker').val(), date:$('#datepicker').val(),
name:$rootScope.loginData.name, name:$rootScope.loginData.name,
countyList:arr, countyList:arr,
groupList:$rootScope.selectedGroup groupList:groupList
} }
console.log(map) console.log(map)
HttpService.createTask(map,function(data){ HttpService.createTask(map,function(data){
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 453156f7
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</thead> </thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
<tr> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount}}" ng-click="updateSelection($event,task)"></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.countyName}}</a></td> <td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 453156f7
...@@ -26,14 +26,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -26,14 +26,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
......
src/main/resources/static/views/login/login.html
View file @ 453156f7
<div class="login-box"> <div class="login-box" style="width: 570px;" >
<div class="login-logo"> <!--<img src="../../bj.jpg">-->
<h3>北京制证辅助平台</h3> <div class="login-logo" style="color: ivory;">
<h3 style="font-weight: 600;">北京市公安局居民身份证制证辅助平台</h3>
</div> </div>
<!-- /.login-logo --> <!-- /.login-logo -->
<div class="login-box-body" style="border-radius: 4px;"> <div class="login-box-body" style="border-radius: 4px;background: rgba(0,0,0,0.4);">
<p class="login-box-msg">用户登录</p> <p class="login-box-msg">用户登录</p>
<form name="form"> <form name="form">
...@@ -22,7 +23,9 @@ ...@@ -22,7 +23,9 @@
<div class="row"> <div class="row">
<!-- /.col --> <!-- /.col -->
<div class="col-xs-4 col-lg-offset-4"> <div class="col-xs-4 col-lg-offset-4">
<button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled='form.$invalid' ng-click="doLogin()">登录</button> <button type="submit"style="color: ivory;"
class="btn btn-primary btn-block btn-flat"
ng-click="doLogin()">登录</button>
</div> </div>
<!-- /.col --> <!-- /.col -->
</div> </div>
...@@ -30,4 +33,10 @@ ...@@ -30,4 +33,10 @@
</div> </div>
<!-- /.login-box-body --> <!-- /.login-box-body -->
<div style=" color: ivory;
margin-top: 10px;
margin-left: 5px; ">
Powered by
<a href="http://www.yingxininfo.net/" style="color: orangered;">1.0.1.110
</a> - 北京盈信信息科技有限公司提供技术支持服务</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/task/task.js
View file @ 453156f7
...@@ -47,14 +47,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -47,14 +47,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
var date=$('#datepicker').val();
if(date==''){
date=$scope.choseDate;
}
HttpService.getHasDistributeCount(date,function (data) {
$scope.distributedCount = data;
console.log(data)
})
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListByProcess(function(data){ HttpService.getTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
......
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