新增新包日志接口

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

@@ -297,7 +297,30 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            // selectPackageLogCount:
+            selectPackageLogCount:function (newPackageName,idCard,date,county,success) {
+                if(angular.isUndefined(newPackageName)){
+                    newPackageName='';
+                }
+                if(angular.isUndefined(idCard)){
+                    idCard='';
+                }
+                if(angular.isUndefined(county)){
+                    county = -1;
+                }
+                console.log(newPackageName,idCard,date,county)
+                $http({
+                    method: 'GET',
+                    url: "../LogApi/selectNewFileLogCount"+urlTimeStamp(),
+                    params:{
+                        newFileName:newPackageName,
+                        cardId:idCard,
+                        createDate:date,
+                        uploadCountyCode:county
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             selectPackageLog:function(newPackageName,idCard,date,county,currentPage,itemsPerPage,success){
                 if(angular.isUndefined(newPackageName)){
                     newPackageName='';

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

@@ -30,7 +30,7 @@
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
-        <strong class="box-header">制证信息打包</strong>
+        <strong class="box-header">制证信息管理</strong>
         <div class="box-info">
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
@@ -133,7 +133,7 @@
                     <div style="padding-left: 27%;" ng-if="xmlDatas">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>
-                <h3 ng-if="postData.length==0">暂无记录。</h3>
+                <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

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

@@ -143,7 +143,7 @@
             <div style="padding-left: 27%;" >
                 <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
             </div>
-            <h3 ng-if="postPackageData.length==0">暂无记录。</h3>
+            <div class="box-body" ng-if="postPackageData.length==0"><h4>暂无记录</h4></div>
             <div class="row" style="padding:0 25px;" ng-if="postMsgDetail.length>0">
                 <div class="col-md-11"></div>
                 <div class="col-md-1" style="text-align: right;">

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

@@ -66,7 +66,7 @@
 
               </tr>
            </table>
-            <table class="table table-bordered table-hover postTable" ng-if="packageLogData">
+            <table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0">
                     <thead>
                     <tr>
                         <th>NO.</th>
@@ -80,17 +80,20 @@
                     <tbody>
                     <tr ng-repeat="item in packageLogData">
                         <td>{{$index+1}}</td>
-                        <td>{{item.newPackageName}}</td>
-                        <td>{{item.createDate}}</td>
-                        <td>{{item.cardCount}}</td>
-                        <td>{{item.readCountyCode}}</td>
-                        <td>{{item.readCountyName}}</td>
+                        <td>{{item.NEW_FILE_NAME}}</td>
+                        <td>{{item.CREATE_DATE  | myDateFilter}}</td>
+                        <td>{{item.RECORD_NUMBER}}</td>
+                        <td>{{item.DWDM}}</td>
+                        <td>{{item.DWMC}}</td>
                     </tr>
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;" ng-if="packageLogData">
-                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
-                </div>
+            <div ng-if="packageLogData.length==0" class="box-body">
+                 <h4>暂无数据</h4>
+            </div>
+            <div style="padding-left: 27%;" ng-if="packageLogData.length>0">
+                <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+            </div>
         </div>
     </div>
 </div>

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

@@ -35,7 +35,8 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
 
         $scope.getPackageLog = function(){
             HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
-                $scope.paginationConf.totalItems = data.totalCount;
+                console.log(data)
+                $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)
             })
             HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){

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

@@ -119,7 +119,7 @@
                     <div style="padding-left: 27%;">
                         <tm-pagination ng-if="show" conf="paginationConf" class="ul"></tm-pagination>
                     </div>
-                <h3 ng-if="postData.length==0">暂无记录。</h3>
+                <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

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

@@ -97,7 +97,9 @@
                 <div style="padding-left: 27%;">
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
-                <h3 ng-if="xmlPackageData.length==0">暂无记录。</h3>
+                <div class="box-body" ng-if="xmlPackageData.length==0">
+                    <h4>暂无记录。</h4>
+                </div>
                 <div class="row" style="padding:0 25px;" ng-if="postMsgDetail.length>0">
                     <div class="col-md-11"></div>
                     <div class="col-md-1" style="text-align: right;">