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

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

@@ -153,6 +153,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             uploadPackage:function(fd,success){
+                console.log(fd)
                 $http({
                     method: 'POST',
                     url: "../importXML/getXMLToCheck",
@@ -184,6 +185,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
 
             },
             selectXmlPackageCount:function(date,success){
+                if(date==''){
+                    date=$filter("date")(new Date(), "yyyy-MM-dd");
+                }
                 $http({
                     method: 'GET',
                     url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
@@ -195,6 +199,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             selectXmlPackage:function(date,currentPage,itemsPerPage,success){
+                if(date==''){
+                    date=$filter("date")(new Date(), "yyyy-MM-dd");
+                }
+                console.log(date,currentPage,itemsPerPage)
                 $http({
                     method: 'GET',
                     url: "../importXML/queryPersonXML"+urlTimeStamp(),
@@ -372,7 +380,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(date==""){
                     date=$filter("date")(new Date(), "yyyy-MM-dd");
                 }
-                console.log(newPackageName,idCard,date,county)
+                console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
                 $http({
                     method: 'GET',
                     url: "../LogApi/selectNewFilesLog"+urlTimeStamp(),
@@ -413,6 +421,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             getTaskListToCreate:function(date,success){
+                if(date==''){
+                    date=$filter("date")(new Date(), "yyyy-MM-dd");
+                }
                 console.log($rootScope.loginData.roleList[0].process,date)
                 $http({
                     method: 'GET',

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

@@ -41,9 +41,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
         }
         $scope.searchCurrent();
 
-        var reGet = function () {
-            $scope.searchCurrent();
-        }
 
         $scope.currentTab = 0;
         $scope.func = function (index) {
@@ -163,8 +160,8 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 console.log(map)
                 HttpService.createTask(map,function(data){
                     MessageService.showAlert("创建成功")
-                    console.log(reGet)
-                    reGet();
+                    console.log($scope.searchCurrent)
+                    $scope.searchCurrent();
                 })
             }else{
                 MessageService.showAlert("请选择创建任务单的组")

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

@@ -14,7 +14,6 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
 
         HttpService.getCountyListData(function(data) {
             $scope.countyList = data;
-            console.log($scope.countyList)
         })
         //Date picker
         $('#datepicker').datetimepicker({
@@ -35,14 +34,12 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
 
         $scope.getPackageLog = function(){
             HttpService.selectPackageLogCount($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function (data) {
-                console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
                 $scope.paginationConf.totalItems = data;
-                console.log($scope.paginationConf.totalItems)
+                console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
             })
             HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
-                console.log($scope.newPackageName,$scope.idCard,$('#datepicker').val())
                 $scope.packageLogData = data;
-                console.log($scope.packageLogData)
+                console.log($scope.packageLogData,"$scope.packageLogData")
             })
         }
 

src/main/resources/static/views/task/taskListPushing.html

@@ -101,8 +101,8 @@
               </div>
              </div>
              <div ng-if="cycleSheetData.length==0">
-             <h4>暂无数据</h4>
-        </div>
+                <h4>暂无数据</h4>
+            </div>
           <!-- /.mail-box-messages -->
         </div>
         <!-- /.box-body -->

src/main/resources/static/views/task/taskListSorting.html

@@ -104,6 +104,9 @@
               </div>
               <!-- /.mail-box-messages -->
              </div>
+             <div ng-if="cycleSheetData.length==0">
+                 <h4>暂无数据</h4>
+             </div>
         </div>
         <!-- /.box-body -->
       </div>

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

@@ -94,12 +94,12 @@
                     </tr>
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;">
-                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
-                </div>
                 <div class="box-body" ng-if="xmlPackageData.length==0">
                     <h4>暂无记录。</h4>
                 </div>
+                <div ng-if="xmlPackageData.length>0">
+                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                </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/xmlAndSearch/xmlAndSearch.js

@@ -84,17 +84,15 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             perPageOptions: [10, 20, 30, 40, 50]
         };
         $scope.getXmlPackage = function(){
-            console.log($("#datepicker").val())
             HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){
                 $scope.paginationConf.totalItems = data.respData.string;
+                console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
             })
             HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
                 $scope.xmlPackageData = data.respData;
-                console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
+                console.log($scope.xmlPackageData,"$scope.xmlPackageData")
             })
         }
-
-
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
         $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);