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

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

@@ -26,7 +26,7 @@
                    </td>
                     <td style="text-align: left;">
                         <button class="btn btn-primary" ng-click="searchTagPrintData()">查询</button>
-                        <button class="btn btn-primary">证件读取</button>
+                        <button class="btn btn-primary" ng-click="subSomething()">证件读取</button>
                     </td>
               </tr>
            </table>

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

@@ -71,6 +71,59 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             })
         }
 
+        var postParam={
+            idCard:''
+        }
+
+        var doQueryByIdCard = function(idcard){
+            console.log(idcard)
+            HttpService.selectTagPrintData(idcard,function(data){
+                console.log(data)
+                if(data){
+                    getPoliceListDataNotChecked();
+                }else{
+                    MessageService.showAlert("生成交接单失败")
+                    getPoliceListDataNotChecked();
+                }
+
+            })
+        }
+        $scope.subSomething = function () {
+            $scope.show = false;
+            var flag = 0;
+            if (document.getElementById("aaa").OpenComm(1001) == 1) {
+                flag = 1;
+                //alert(i);
+            }
+            else {
+                for (var i = 1; i < 3; i++) {
+                    if (document.getElementById("aaa").OpenComm(i) == 1) {
+                        flag = 1;
+                        //alert(i);
+                        break;
+                    }
+                    if (flag != 1) {
+                        alert("打开端口失败");
+
+                    }
+                }
+            }
+
+            if (flag == 1) {
+                if (document.getElementById("aaa").Authen() == 1) {
+                    var ret = document.getElementById("aaa").ReadCardPath("c:\\", 1);
+                    if (ret == 1 || ret == 3) {
+                        postParam.idCard = document.getElementById("aaa").sIDNo;
+                        doQueryByIdCard(postParam.idCard)
+                    }
+                }
+                else {
+                    alert("找卡错误,请重新放卡!");
+                }
+            }
+            aaa.EndComm();
+        }
+
 
         $scope.PreviewMytableRotate = function(){
             var LODOP = getLodop();