Skip to content

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

更新页面

parent 84287c32
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 44 deletions
src/main/resources/static/index.html
View file @ f7b9d3ef
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<!-- Logo --> <!-- Logo -->
<a href="index.html" class="logo" style="line-height: 50px;"> <a href="index.html" class="logo" style="line-height: 50px;">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><span>{{loginData.name}}</span></span> <span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<span class="logo-lg"><span>{{loginData.roleList[0].role}}</span></span> <span class="logo-lg"><span>{{loginData.roleList[0].role}}</span></span>
</a> </a>
...@@ -94,9 +94,9 @@ ...@@ -94,9 +94,9 @@
</a> </a>
</li> </li>
<li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;"> <li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;">
<form style="margin-top: 6px;"> <form style="margin-top: 6px;" name="form">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="text" class="form-control input-sm bg-light no-border padder" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id..."> <input type="text" class="form-control input-sm bg-light no-border padder" ng-keyup="enterEvent($event,searchInput)" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="button" style="height: 35px;background-color: #fff;border-left:0;outline:none;" ng-click="doSearch(searchInput)" class="btn btn-sm bg-light"> <button type="button" style="height: 35px;background-color: #fff;border-left:0;outline:none;" ng-click="doSearch(searchInput)" class="btn btn-sm bg-light">
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
</ul> </ul>
</li> </li>
<li class="dropdown user user-menu"> <li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 0;"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 11px;">
<img src="newTheme/dist/img/logo.jpg" class="user-image" alt="User Image"> <img src="newTheme/dist/img/logo.jpg" class="user-image" alt="User Image">
<span style="font-size: 1.7em;">北京制证辅助平台</span> <span style="font-size: 1.7em;">北京制证辅助平台</span>
</a> </a>
......
src/main/resources/static/js/app.js
View file @ f7b9d3ef
...@@ -156,13 +156,18 @@ angular.module('AvatarCheck', [ ...@@ -156,13 +156,18 @@ angular.module('AvatarCheck', [
} }
$scope.doSearch = function (searchInput) { $scope.doSearch = function (searchInput) {
console.log(searchInput) if(angular.isUndefined(searchInput)){
// HttpService.searchCards(searchInput, function (data) { $location.path("/searchCard");
// $scope.alertMsg = "请输入要查询的受理号/身份证号/任务单id";
// }) }else{
$rootScope.searchResult = '查询结果'; console.log(searchInput,"//")
$location.path("/searchCard"); HttpService.searchCards(searchInput, function (data) {
} $rootScope.searchResult = data;
console.log($rootScope.searchResult)
})
$location.path("/searchCard");
}
};
$scope.logout = function(){ $scope.logout = function(){
HttpService.logout(function(data) { HttpService.logout(function(data) {
...@@ -170,9 +175,13 @@ angular.module('AvatarCheck', [ ...@@ -170,9 +175,13 @@ angular.module('AvatarCheck', [
$location.path('/login') $location.path('/login')
$rootScope.loginData = {userid:'用户未登录', login:false}; $rootScope.loginData = {userid:'用户未登录', login:false};
}); });
}
$scope.enterEvent = function(e,search) {
console.log(search)
var keycode = window.event?e.keyCode:e.which;
if(keycode==13){
$scope.doSearch(search)
}
} }
}); });
......
src/main/resources/static/js/service.js
View file @ f7b9d3ef
...@@ -134,10 +134,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -134,10 +134,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
searchCards: function (value, success) { searchCards: function (searchInput, success) {
$http({ $http({
method: 'GET', method: 'GET',
url: url url:"../specialCardInfo/selectByCard",
params:{
id:searchInput
}
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
...@@ -153,10 +156,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -153,10 +156,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
uploadExcelFile:function(startDate,endDate,fd,success){ uploadExcelFile:function(date1,date2,fd,success){
$http({ $http({
method: 'POST', method: 'GET',
url: "../ReadExcel/ReadPersonPost", url: "../ReadExcel/ReadPersonPost?formStartTime="+date1+"&formDeadLine="+date2,
data: fd, data: fd,
headers: {'Content-Type': undefined}, headers: {'Content-Type': undefined},
transformRequest: angular.identity transformRequest: angular.identity
...@@ -307,6 +310,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -307,6 +310,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
selectTagPrintData:function(idCard,success){
$http({
method: 'GET',
url: "../tagPrint/selectTagPrintData"+urlTimeStamp(),
params:{
idCard:idCard
}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ f7b9d3ef
...@@ -24,43 +24,40 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -24,43 +24,40 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
$('#datepicker1').datetimepicker({ $('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
format: 'yyyyMMdd', format: 'yyyy-MM-dd',
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
format: 'yyyyMMdd', format: 'yyyy-MM-dd',
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker3').datetimepicker({ $('#datepicker3').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
format: 'yyyyMMdd', format: 'yyyy-MM-dd',
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyyMMdd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
console.log($("#datepicker1").val())
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;
fd.append("formStartTime",$("#datepicker1").val());
fd.append("formDeadline",$("#datepicker2").val());
for(var i in files){
fd.append('file', files[i]);
}
if(angular.isUndefined(files)){ if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...") MessageService.showAlert("请选择上传的文件...")
}else{ }else{
fd.append('file', files); fd.append("formStartTime",$("#datepicker1").val());
fd.append("formDeadline",$("#datepicker2").val());
for(var i in files){
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) console.log("导入项目的返回结果：",data)
}) })
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ f7b9d3ef
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
查询结果 查询结果
</strong> </strong>
<div class="box-info" style="padding:0px 10px 7px 10px;"> <div class="box-info" style="padding:0px 10px 7px 10px;">
<h4 ng-if="alertMsg">{{alertMsg}}</h4>
<div class="panel panel-info"> <!--任务单-->
<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">
任务单 任务单
...@@ -43,8 +44,8 @@ ...@@ -43,8 +44,8 @@
</table> </table>
</div> </div>
</div> </div>
<!--受理库-->
<div class="panel panel-info"> <div class="panel panel-info" ng-if="searchResult.ACCdata.length>0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
受理库 受理库
...@@ -91,7 +92,8 @@ ...@@ -91,7 +92,8 @@
<button class="btn btn-danger">退证</button> <button class="btn btn-danger">退证</button>
</div> </div>
</div> </div>
<div class="panel panel-info"> <!--制证库-->
<div class="panel panel-info" ng-if="searchResult.PRODData.length>0">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
制证库 制证库
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ f7b9d3ef
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<div class="box-info" style="padding: 15px;padding-top: 0;"> <div class="box-info" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td width="10%">身份证号:</td> <td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
<td colspan="2" width="35%"> <td colspan="2" width="35%">
<input type="text" class="form-control" placeholder="身份证号"/> <input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
</td> </td>
<td style="text-align: left;"> <td style="text-align: left;">
<button class="btn btn-primary">查询</button> <button class="btn btn-primary" ng-click="searchTagPrintData()">查询</button>
<button class="btn btn-primary">证件读取</button> <button class="btn btn-primary">证件读取</button>
</td> </td>
</tr> </tr>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ f7b9d3ef
...@@ -1051,6 +1051,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -1051,6 +1051,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
} }
$scope.searchTagPrintData = function(){
HttpService.selectTagPrintData($scope.idCard,function(data){
$scope.tagPrintData =data;
})
}
}); });
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ f7b9d3ef
...@@ -49,14 +49,12 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -49,14 +49,12 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.uploadXml = 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){
fd.append('file', files[i]);
}
if(angular.isUndefined(files)){ if(angular.isUndefined(files)){
MessageService.showAlert("请选择上传的文件...") MessageService.showAlert("请选择上传的文件...")
}else{ }else{
fd.append('file', files); for(var i in files){
fd.append('file', files[i]);
}
HttpService.uploadPackage(fd,function (data) { HttpService.uploadPackage(fd,function (data) {
console.log("导入项目的返回结果：",data) console.log("导入项目的返回结果：",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