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

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

 <style>
-    form input{
-        border:0;
-        color:black;
-        font-weight: bold;
-        margin-left: 10px;
-    }
     .postTable th, .postTable td {
         text-align: center;
         vertical-align: middle!important;
@@ -25,7 +19,7 @@
                        <input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
                    </td>
                     <td style="text-align: left;">
-                        <button class="btn btn-primary" ng-click="searchTagPrintData()">查询</button>
+                        <button class="btn btn-primary search" ng-click="searchTagPrintData()">查询</button>
                         <button class="btn btn-primary" ng-click="subSomething()">证件读取</button>
                     </td>
               </tr>

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

@@ -35,8 +35,10 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
         }
 
         var getDetailListById = function (id) {
+            console.log(id)
             HttpService.getPoliceCardsList(id,function(data) {
                 $scope.json.policeCardsList = data;
+                console.log("---------",$scope.json.policeCardsList)
                 for (var i=0;i<$scope.json.policeCardsList.length;i++){
                     if($scope.json.policeCardsList[i].CARD_ID==$scope.idCard){
                         $scope.json.policeCardsList[i].styleClass = "bg-danger"
@@ -82,14 +84,16 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
 
         var doQueryByIdCard = function(idcard){
             HttpService.selectTagPrintData(idcard,function(data){
+                $(".search").removeAttr("disabled");
                 console.log(data)
                 if(data.state==1){
                     $scope.json.isShow=true;
                     getPoliceListDataNotChecked();
                     getDetailListById(data.id)
                 }else if(data.state==2){
-                    if(data.checkName==$rootScope.loginData.name){
+                    if(data.checkName===$rootScope.loginData.name){
                         $scope.json.isShow=true;
+                        getDetailListById(data.id)
                         for (var i=0;i<$scope.json.policeCardsList.length;i++){
                             if($scope.json.policeCardsList[i].CARD_ID==idcard&&$scope.json.policeCardsList[i].styleClass==''){
                                 $scope.json.policeCardsList[i].styleClass = "bg-danger"
@@ -106,7 +110,9 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                 }
             })
         }
+
         $scope.searchTagPrintData = function(){
+            $(".search").prop("disabled","true");
             doQueryByIdCard($scope.idCard)
         }
         $scope.subSomething = function () {