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

src/main/resources/static/index.html

@@ -106,7 +106,7 @@
 
                 </li>
             </ul>
-            <div class="pull-right" style="font-size:1.8em;line-height: 50px;color: #fff;font-family:'黑体';padding:0 20px;">北京制证辅助平台</div>
+
             <!--导航右边-->
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
@@ -191,7 +191,7 @@
 
                     <li class="dropdown user">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                          <span class="hidden-xs">{{loginData.name}}</span>
+                          <span class="hidden-xs">当前用户:{{loginData.name}}</span>
                         </a>
                         <ul class="dropdown-menu">
                           <li style="padding: 5px;">
@@ -199,6 +199,13 @@
                           </li>
                         </ul>
                       </li>
+
+                    <li class="dropdown user user-menu">
+                          <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 0;">
+                            <img src="newTheme/dist/img/logo.jpg" class="user-image" alt="User Image">
+                            <span style="font-size: 1.7em;">北京制证辅助平台</span>
+                          </a>
+                    </li>
                 </ul>
             </div>
 
@@ -216,7 +223,7 @@
 
                 <li ng-repeat="menu in menuList | orderBy:'id'" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus(menu.url)">
                     <a href="#!{{menu.url}}">
-                        <i class="fa fa-file-code-o"></i>
+                        <i class="{{icons[$index]}}"></i>
                         <span ng-bind="menu.name"></span>
                     </a>
                 </li>

src/main/resources/static/js/app.js

@@ -47,6 +47,26 @@ angular.module('AvatarCheck', [
             $location.path("/login");
         }
         if($rootScope.loginData.login == true){
+            $scope.icons = [
+                "glyphicon glyphicon-list icon text-primary",
+                "fa fa-file icon text-info",
+                "glyphicon glyphicon-briefcase icon text-danger",
+                "glyphicon glyphicon-th-large icon text-success",
+                "glyphicon glyphicon-stats icon text-primary-dker",
+                "glyphicon glyphicon-list icon text-primary",
+                "fa fa-file icon text-info",
+                "glyphicon glyphicon-briefcase icon text-danger",
+                "glyphicon glyphicon-th-large icon text-success",
+                "glyphicon glyphicon-stats icon text-primary-dker",
+                "glyphicon glyphicon-list icon text-primary",
+                "fa fa-file icon text-info",
+                "glyphicon glyphicon-briefcase icon text-danger",
+                "glyphicon glyphicon-th-large icon text-success",
+                "glyphicon glyphicon-stats icon text-primary-dker",
+                "glyphicon glyphicon-briefcase icon text-danger",
+                "glyphicon glyphicon-th-large icon text-success",
+                "glyphicon glyphicon-stats icon text-primary-dker"
+            ]
             $rootScope.menuList = $rootScope.loginData.roleList[0].permissions;
             console.log($scope.menuList)
         }

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

@@ -174,11 +174,15 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
 
             },
             selectXmlPackage:function(date,state,success){
+                if(angular.isUndefined(state)){
+                    state=-1;
+                }
+                console.log(date,state)
                 $http({
                     method: 'GET',
-                    url: "../selectXMLApi/selectXml"+urlTimeStamp(),
+                    url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
                     params:{
-                        date:date,
+                        importDate:date,
                         state:state
                     }
                 }).then(function successCallback(response) {

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

@@ -4,7 +4,8 @@
         vertical-align: middle!important;
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header with-border">废证添加</strong>
         <div class="box-primary">
@@ -50,3 +51,4 @@
         </div>
     </div>
 </div>
+</div>
\ No newline at end of file

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

@@ -7,7 +7,8 @@
    .cl:after{display:block;clear:both;content:"";visibility:hidden;height:0}
    .cl{zoom:1}
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header with-border">余证添加</strong>
         <div class="box-primary">
@@ -31,3 +32,4 @@
         </div>
     </div>
 </div>
+</div>
\ No newline at end of file

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

@@ -24,7 +24,8 @@
             zoom: 1
         }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header with-border">解析日志</strong>
         <div class="box-primary" style="padding: 15px;padding-top: 0;">
@@ -85,3 +86,4 @@
         </div>
     </div>
 </div>
+</div>

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

@@ -27,7 +27,8 @@
         zoom: 1
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">制证信息打包</strong>
         <div class="box-info">
@@ -123,3 +124,4 @@
             </div>
         </div>
 </div>
+</div>
\ No newline at end of file

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

@@ -27,7 +27,8 @@
         zoom: 1
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">制证信息打包</strong>
         <div class="box-info">
@@ -136,3 +137,4 @@
             </div>
         </div>
 </div>
+</div>
\ No newline at end of file

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

-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -71,3 +72,4 @@
   </div>
   <!-- /.row -->
 </div>
+</div>
\ No newline at end of file

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

-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -72,3 +73,4 @@
   </div>
   <!-- /.row -->
 </div>
+</div>
\ No newline at end of file

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

@@ -27,7 +27,8 @@
         zoom: 1
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">格口文件上传</strong>
         <div class="box-primary">
@@ -139,4 +140,5 @@
         </div>
     </div>
 </div>
+</div>
 

src/main/resources/static/views/historyCards/historyBack.html

@@ -4,7 +4,8 @@
         vertical-align: middle!important;
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
         <div class="box box-primary">
         <strong class="box-header with-border">回迁证添加</strong>
             <form style="padding-left: 15px;">
@@ -51,3 +52,4 @@
             </div>
         </div>
 </div>
+</div>
\ No newline at end of file

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

@@ -6,7 +6,7 @@
   <div class="login-box-body" style="border-radius: 4px;">
     <p class="login-box-msg">用户登录</p>
 
-    <form>
+    <form name="form">
         <div class="text-danger wrapper text-center" ng-show="authError" style="margin-bottom: 5px;">
             {{authError}}
         </div>

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

@@ -24,7 +24,8 @@
             zoom: 1
         }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header with-border">打包日志</strong>
         <div class="box-primary" style="padding: 15px;padding-top: 0;">
@@ -91,3 +92,4 @@
         </div>
     </div>
 </div>
+</div>
\ No newline at end of file

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

-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
 交接单
 </div>
+</div>
 

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

 <div class="content row">
-<div class="col-md-12" style="margin-top:20px;">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header">
             查询结果
@@ -143,4 +143,5 @@
 
     </div>
 
-</div></div>
\ No newline at end of file
+</div>
+</div>
\ No newline at end of file

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

@@ -11,8 +11,8 @@
     }
   
 </style>
-
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary">
         <strong class="box-header with-border" style="padding-bottom:0px">居民身份证阅读信息</strong>
         <div class="box-info">
@@ -107,6 +107,7 @@
         </div>
     </div>
 </div>
+</div>
 
 <div style="display: none;" >
     <div id="div1">

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

-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -77,4 +78,5 @@
   </div>
   <!-- /.row -->
 </div>
+</div>
 

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

-
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
   <div class="row">
     <!-- /.col -->
     <div class="col-md-12">
@@ -89,4 +89,5 @@
   </div>
   <!-- /.row -->
 </div>
+</div>
 

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

-    <!-- /.col -->
+<div class="content row">
       <div class="col-md-12" style="margin-top:20px;">
       <div class="box box-primary">
         <div class="box-header with-border">
@@ -78,5 +78,6 @@
     </div>
     <!-- /.col -->
   <!-- /.row -->
+  </div>
 
 

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

-
+<div class="content row">
     <!-- /.col -->
-<div class="col-md-12" style="margin-top:20px;">
+    <div class="col-md-12" style="margin-top:20px;">
 <div class="box box-primary">
         <div class="box-header with-border">
           <strong>任务单详情</strong>
@@ -72,6 +72,7 @@
         </div>
       </div>
       <!-- /. box -->
+</div>
 </div>
     <!-- /.col -->
 

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

@@ -27,7 +27,8 @@
         zoom: 1
     }
 </style>
-<div class="col-md-12" style="margin-top:20px;">
+<div class="content row">
+    <div class="col-md-12" style="margin-top:20px;">
     <div class="box box-primary" >
         <strong class="box-header">快递单信息管理</strong>
         <div class="box-info">
@@ -122,3 +123,4 @@
             </div>
         </div>
 </div>
+</div>
\ No newline at end of file

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

@@ -67,9 +67,7 @@
                     </td>
                     <td>
                         <select class="form-control select2" id="state" ng-model="state">
-                            <option value="">--请选择解析状态--</option>
-                            <option value="1">已解析</option>
-                            <option value="-1">未解析</option>
+                            <option value="{{state.stateCode}}" ng-repeat="state in [{stateName:'已解析',stateCode:1},{stateName:'未解析',stateCode:0}] track by $index">{{state.stateName}}</option>
                         </select>
                     </td>
                     <td>

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

@@ -72,7 +72,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             console.log($("#datepicker").val(),$scope.state)
             HttpService.selectXmlPackage($("#datepicker").val(),$scope.state,function(data){
                 $scope.xmlPackageData = data;
-                console.log($scope.xmlPackageData)
+                console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
             })
         }