Skip to content

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

修改页面

parent 95eec7be
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 68 deletions
src/main/resources/static/js/service.js
View file @ 0dc40341
...@@ -350,10 +350,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -350,10 +350,6 @@ 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/selectAnalysisLogCount"+urlTimeStamp(), url: "../LogApi/selectAnalysisLogCount"+urlTimeStamp(),
...@@ -369,10 +365,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -369,10 +365,6 @@ 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(),
...@@ -429,12 +421,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -429,12 +421,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(idCard)){ if(angular.isUndefined(idCard)){
idCard=''; idCard='';
} }
if(angular.isUndefined(county)){ if(county==''){
county = -1; county = -1;
} }
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county) console.log(newPackageName,idCard,date,county)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -456,12 +445,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -456,12 +445,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(idCard)){ if(angular.isUndefined(idCard)){
idCard=''; idCard='';
} }
if(angular.isUndefined(county)){ if(county==''){
county = -1; county = -1;
} }
if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage) console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
$http({ $http({
method: 'GET', method: 'GET',
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 0dc40341
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" ng-value="choseDate" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td> <td>
...@@ -68,11 +69,11 @@ ...@@ -68,11 +69,11 @@
<tbody> <tbody>
<tr ng-repeat="item in analyseLog"> <tr ng-repeat="item in analyseLog">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.RECORD_NUMBER}}</td> <td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.FORM_START_TIME | myDateFilter}}</td> <td>{{item.FORM_START_TIME | myDateFilter}}</td>
<td>{{item.FORM_DEADLINE | myDateFilter}}</td> <td>{{item.FORM_DEADLINE | myDateFilter}}</td>
<td>{{item.FILE_NAME}}</td> <td>{{item.FILE_NAME}}</td>
<td>{{item.ANALYSIS_DATE}}</td> <td>{{item.ANALYSIS_DATE | myDateFilter}}</td>
<td>{{item.RECORD_NUMBER}}</td> <td>{{item.RECORD_NUMBER}}</td>
<td>{{item.PUCOUNT}}</td> <td>{{item.PUCOUNT}}</td>
<td>{{item.YOUCOUNT}}</td> <td>{{item.YOUCOUNT}}</td>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ 0dc40341
...@@ -11,7 +11,6 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -11,7 +11,6 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
.controller('analysisLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) { .controller('analysisLogCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//Date picker //Date picker
$('#datepicker').datetimepicker({ $('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -20,8 +19,11 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -20,8 +19,11 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
...@@ -33,12 +35,10 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -33,12 +35,10 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$scope.getAnalyseLog = function(){ $scope.getAnalyseLog = function(){
HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) { HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems) console.log($scope.paginationConf.totalItems)
}) })
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){
console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
$scope.analyseLog = data; $scope.analyseLog = data;
console.log($scope.analyseLog) console.log($scope.analyseLog)
}) })
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 0dc40341
...@@ -70,7 +70,8 @@ ...@@ -70,7 +70,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td></td> <td></td>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ 0dc40341
...@@ -27,9 +27,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -27,9 +27,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); //清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
itemsPerPage: 10, itemsPerPage: 10,
...@@ -61,10 +62,6 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -61,10 +62,6 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(angular.isUndefined(packageType)){ if(angular.isUndefined(packageType)){
packageType=''; packageType='';
} }
if (date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg, HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) { typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total; $scope.paginationConf.totalItems=data.total;
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 0dc40341
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker1" readonly/> <input type="text" class="form-control pull-right" id="datepicker1" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d1"></span></span>
</div> </div>
</td> </td>
<td>-</td> <td>-</td>
...@@ -64,7 +65,8 @@ ...@@ -64,7 +65,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" class="form-control pull-right" id="datepicker2" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d2"></span></span>
</div> </div>
</td> </td>
<td colspan="2"> <td colspan="2">
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 0dc40341
...@@ -27,6 +27,10 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -27,6 +27,10 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".d1").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker //Date picker
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -35,16 +39,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -35,16 +39,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//Date picker //清除的代码
$('#datepicker3').datetimepicker({ $(".d2").click(function(){
minView: "month", //选择日期后，不会再跳转去选择时分秒 $($($(this).parent()).prev()).val("");
language: 'zh-CN', })
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
...@@ -64,22 +63,21 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -64,22 +63,21 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(angular.isUndefined($scope.pcs_name)){ if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name=''; $scope.pcs_name='';
} }
if(startDate==''){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
startDate=$filter("date")(new Date(), "yyyy-MM-dd"); MessageService.showAlert("请选择起始日期和结束日期")
} }else{
if(endDate==''){ console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
endDate=$filter("date")(new Date(), "yyyy-MM-dd"); HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count")
})
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data;
console.log($scope.xmlDatas)
})
} }
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count")
})
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data;
console.log($scope.xmlDatas)
})
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doXmlQuery);
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 0dc40341
...@@ -52,14 +52,16 @@ ...@@ -52,14 +52,16 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td>上传地区:</td> <td>上传地区:</td>
<td> <td>
<select class="form-control select2" id="print" ng-model="county"> <select class="form-control select2" id="county">
<option ng-repeat="item in countyList" value="item.countycode">{{item.countyname}}</option> <option value="">--请选择地区--</option>
</select> <option ng-repeat="item in countyList" value="{{item.countyCode}}">{{item.countyname}}</option>
</select>
</td> </td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td> <td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
</tr> </tr>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ 0dc40341
...@@ -23,8 +23,10 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -23,8 +23,10 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
...@@ -33,14 +35,15 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -33,14 +35,15 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
}; };
$scope.getPackageLog = function(){ $scope.getPackageLog = function(){
HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) { var county = $("#county").val();
HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,function (data) {
$scope.paginationConf.totalItems = data; $scope.paginationConf.totalItems = data;
console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems") console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
}) })
if($scope.paginationConf.currentPage==0){ if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 $scope.paginationConf.currentPage=1
} }
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
$scope.packageLogData = data; $scope.packageLogData = data;
console.log($scope.packageLogData,"$scope.packageLogData") console.log($scope.packageLogData,"$scope.packageLogData")
}) })
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 0dc40341
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td colspan="4"> <td colspan="4">
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 0dc40341
...@@ -20,7 +20,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -20,7 +20,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$('.select2').select2(); $('.select2').select2();
//Initialize Select2 Elements //Initialize Select2 Elements
...@@ -99,7 +102,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -99,7 +102,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
json.getToCounty=[]; json.getToCounty=[];
} }
if($("#datepicker").val()==''){ if($("#datepicker").val()==''){
json.uploadDate = $filter("date")(new Date(), "yyyy-MM-dd"); json.uploadDate = '';
}else{ }else{
json.uploadDate = $("#datepicker").val(); json.uploadDate = $("#datepicker").val();
} }
...@@ -159,7 +162,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -159,7 +162,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
url = url + 'djx=&'; url = url + 'djx=&';
} }
if ($("#datepicker").val() == '') { if ($("#datepicker").val() == '') {
url = url + 'uploadDate=' + $scope.choseDate + '&'; url = url + 'uploadDate=&';
} }
if ($("#datepicker").val() != '') { if ($("#datepicker").val() != '') {
url = url + 'uploadDate=' + $("#datepicker").val() + '&'; url = url + 'uploadDate=' + $("#datepicker").val() + '&';
......
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