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

src/main/resources/static/index.html

@@ -191,7 +191,8 @@
 
                     <li class="dropdown user">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                          <span class="hidden-xs">当前用户:{{loginData.name}}</span>
+                          <i class="glyphicon glyphicon-user"></i>
+                          <span class="hidden-xs">{{loginData.name}}</span>
                         </a>
                         <ul class="dropdown-menu">
                           <li style="padding: 5px;">
@@ -199,7 +200,6 @@
                           </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">

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

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

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

@@ -91,9 +91,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.html

@@ -34,7 +34,7 @@
         <div class="box-primary">
              <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
-                    <td width="10%">选择XML文件：</td>
+                    <td width="15%">选择XML文件：</td>
                     <td colspan="2" width="35%">
                          <input type="file"
                                 id="id_file_photo_for_check"
@@ -53,8 +53,8 @@
         <div class="box-primary" style="padding: 15px;padding-top: 0;">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
-                   <td>XML导入时间:</td>
-                   <td>
+                   <td width="15%">XML导入时间:</td>
+                   <td colspan="2" width="35%">
                          <div class="input-group date" style="width: 65%">
                                <div class="input-group-addon">
                                  <i class="fa fa-calendar"></i>
@@ -62,15 +62,7 @@
                                <input type="text"  class="form-control pull-right" ng-model="choseDate" id="datepicker"  readonly/>
                          </div>
                    </td>
-                    <td>
-                        状态
-                    </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>
-                        </select>
-                    </td>
-                    <td>
+                    <td style="text-align: left;">
                          <button class="btn btn-primary" ng-click="getXmlPackage()">查询</button>
                     </td>
               </tr>

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

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