新增页面

src/main/resources/static/index.html

@@ -93,17 +93,17 @@
                         <span class="sr-only">Toggle navigation</span>
                     </a>
                 </li>
-                <li class="sidebar no-padding navbar-left" style="width: 377px;margin-left:27px;height: auto;">
-                    <form style="height: 37px;margin: 6px 5px;">
+                <li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;">
+                    <form style="margin-top: 6px;">
                         <div class="input-group input-group-sm">
-                            <input type="text" class="form-control" ng-model="searchInput">
+                            <input type="text" class="form-control input-sm bg-light no-border padder" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
                             <span class="input-group-btn">
-                                <button type="button"ng-click="doSearch(searchInput)" class="btn btn-info btn-flat"> Go </button>
+                                <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>
+                                 </button>
                             </span>
                         </div>
                     </form>
-
-
                 </li>
             </ul>
 

src/main/resources/static/js/service.js

@@ -173,7 +173,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
 
             },
-            selectXmlPackage:function(date,success){
+            selectXmlPackageCount:function(date,success){
                 $http({
                     method: 'GET',
                     url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
@@ -184,13 +184,54 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectPostPackage:function(fileName,state,success){
+            selectXmlPackage:function(date,currentPage,itemsPerPage,success){
                 $http({
                     method: 'GET',
-                    url: "../selectExcelApi/selectExcel"+urlTimeStamp(),
+                    url: "../importXML/queryPersonXML"+urlTimeStamp(),
+                    params:{
+                        importDate:date,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectPostPackageCount:function(fileName,state,date,success){
+                if(angular.isUndefined(fileName)){
+                    fileName='';
+                }
+                if(angular.isUndefined(state)){
+                    state=-1;
+                }
+                $http({
+                    method: 'GET',
+                    url: "../ReadExcel/queryPersonPostCount"+urlTimeStamp(),
+                    params:{
+                        fileName:fileName,
+                        analysisState:state,
+                        uploadDate:date
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectPostPackage:function(fileName,state,currentPage,itemsPerPage,date,success){
+                if(angular.isUndefined(fileName)){
+                    fileName='';
+                }
+                if(angular.isUndefined(state)){
+                    state=-1;
+                }
+                $http({
+                    method: 'GET',
+                    url: "../ReadExcel/queryPersonPost"+urlTimeStamp(),
                     params:{
                         fileName:fileName,
-                        state:state
+                        analysisState:state,
+                        currPage:currentPage,
+                        pageSize:itemsPerPage,
+                        uploadDate:date
                     }
                 }).then(function successCallback(response) {
                     success(response.data)

src/main/resources/static/views/excelAndSearch/excelAndSearch.html

@@ -82,6 +82,18 @@
         <div class="box-primary" style="padding: 15px;padding-top: 0;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
+                    <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="datepicker3"  readonly/>
+                      </div>
+                    </td>
                    <td>文件名称:</td>
                    <td>
                         <input type="text" class="form-control" ng-model="fileName" placeholder="文件名称">
@@ -91,7 +103,9 @@
                     </td>
                     <td>
                         <select class="form-control select2" id="state" ng-model="state">
-                            <option value="{{state.stateCode}}" ng-repeat="state in [{stateName:'已解析',stateCode:1},{stateName:'未解析',stateCode:0}] track by $index">{{state.stateName}}</option>
+                            <option value="">--请选择解析状态--</option>
+                            <option value="1">已解析</option>
+                            <option value="0">未解析</option>
                         </select>
                     </td>
                     <td>

src/main/resources/static/views/excelAndSearch/excelAndSearch.js

@@ -35,15 +35,17 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             todayBtn: 1,
             autoclose: 1
         });
+        $('#datepicker3').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyyMMdd',
+            todayBtn: 1,
+            autoclose: 1
+        });
 
         $scope.choseDate = $filter("date")(new Date(), "yyyyMMdd");
 
-        $scope.paginationConf = {
-            currentPage: 1,
-            itemsPerPage: 10,
-            perPageOptions: [10, 20, 30, 40, 50]
-        };
-        $scope.paginationConf.totalItems = 50;
+
 
         $scope.uploadExcel = function () {
             console.log($("#datepicker1").val())
@@ -65,9 +67,20 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             }
         }
 
+        $scope.paginationConf = {
+            currentPage: 1,
+            itemsPerPage: 10,
+            perPageOptions: [10, 20, 30, 40, 50]
+        };
+
+
         $scope.getPostPackage = function(){
-            console.log($scope.fileName,$scope.state)
-            HttpService.selectPostPackage($scope.fileName,$scope.state,function(data){
+            console.log($scope.fileName,$scope.state,$("#datepicker3").val())
+            HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) {
+                $scope.paginationConf.totalItems = data;
+                console.log(data)
+            })
+            HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){
                 $scope.postPackageData = data;
                 console.log($scope.postPackageData)
             })

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js

@@ -30,12 +30,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
         
         $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;
+
 
         $scope.analysis = function (uploadDate,packageCount) {
 
@@ -68,13 +63,27 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             }
         }
 
+        $scope.paginationConf = {
+            currentPage: 1,
+            itemsPerPage: 10,
+            perPageOptions: [10, 20, 30, 40, 50]
+        };
+
         $scope.getXmlPackage = function(){
             console.log($("#datepicker").val())
-            HttpService.selectXmlPackage($("#datepicker").val(),function(data){
+            HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){
+                $scope.paginationConf.totalItems = 50;
+            })
+            HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
                 $scope.xmlPackageData = data;
                 console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
             })
         }
 
+
+        // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
+
+
     });