异地证暂时注释机器包解析按钮功能

src/main/resources/static/dialogs/analysisMachineDialog.html

+<div class="ui-dialog-title" >
+    请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 个制证包
+</div>
+<div class="ui-dialog-content">
+    <table class="table table-hover" >
+        <thead>
+        <tr>
+            <th>NO.</th>
+            <th>上传时间</th>
+            <th>格口文件名</th>
+            <th>数量</th>
+            <th>状态</th>
+            <th>制证类型</th>
+            <th>操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr ng-repeat="item in resultData">
+            <td>{{$index+1}}</td>
+            <td>{{item.UPLOAD_DATE|myDateFilter}}</td>
+            <td>{{item.FILE_NAME}}</td>
+            <td>{{item.COUNT}}</td>
+            <td ><span ng-if="item.STATE==1">已解析</span></td>
+            <td>
+                <select class="form-control" id="cardType">
+                    <option value="">全部</option>
+                    <option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option>
+                </select>
+            <td>
+                <button class="btn btn-soundcloud" ng-click="UpdateIdcard(item.FILE_ID)">清除标记</button>
+                <button class="btn btn-info" ng-click="analyseMachinePackage(item.FILE_ID)">解析</button>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+<div style="text-align: center;">
+    <p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
+    <button class="btn btn-success" style="width: 70%"  ng-click="closeThisDialog()">关闭</button>
+</div>
\ No newline at end of file

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

@@ -398,6 +398,31 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            analyseMachineData:function(date,success){
+                console.log(date)
+                $http({
+                    method: 'GET',
+                    url: "../LogApi/selectsMachineAcceptAnalysisData"+urlTimeStamp(),
+                    params:{
+                        uploadDate:date
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            analysisMachineAcceptListData:function(fileId,printDate,cardType,success){
+                $http({
+                    method: 'GET',
+                    url: "../LogApi/analysisMachineAcceptList"+urlTimeStamp(),
+                    params:{
+                        printDate:printDate,
+                        fileId:fileId,
+                        cardType:cardType
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             selectMachinePackageCount:function(fileName,state,date,success){
                 if(angular.isUndefined(fileName)){
                     fileName='';

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

@@ -107,6 +107,7 @@
                             <button class="btn btn-primary" ng-click="analysis(item.date,item.packageCount)">解析</button>
                             <button class="btn btn-danger" ng-click="deleteDataById(item.date,item.packageCount)">删除</button>
                             <button class="btn btn-primary" ng-click="check(item.date)">检查</button>
+                            <!--<button class="btn btn-info" ng-click="analysisMachineAcceptList(item)">解析机器受理包</button>-->
                         </td>
                     </tr>
                     </tbody>

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

@@ -185,5 +185,53 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             });
         }
 
+        // $scope.analysisMachineAcceptList = function(item) {
+        //     ngDialog.open({
+        //         template: 'dialogs/analysisMachineDialog.html' + urlTimeStamp(),
+        //         width: 950,
+        //         cache: false,
+        //         closeByDocument:false,
+        //         controller: ['$scope','HttpService', function ($scope,HttpService) {
+        //
+        //             HttpService.getTypeList(function(data) {
+        //                 $scope.typeList = data;
+        //                 console.log($scope.typeList)
+        //             });
+        //
+        //             $scope.wrongMsg = -1;
+        //             $scope.upDate =item.date;
+        //             $scope.upCount=item.packageCount;
+        //             HttpService.analyseMachineData($("#dateGrid").val(), function (data) {
+        //                 $scope.resultData = data;
+        //                 console.log(data)
+        //             })
+        //             $scope.analyseMachinePackage=function(fileid){
+        //                 var cardType = $("#cardType").val();
+        //                 console.log(fileid,item.date,cardType)
+        //                 HttpService.analysisMachineAcceptListData(fileid,item.date,cardType,function(data){
+        //                     if(data){
+        //                         $scope.wrongMsg = "解析完成"
+        //                         // $scope.closeThisDialog();
+        //                         // MessageService.showAlert("解析完成")
+        //                         getData();
+        //                     }else{
+        //                         $scope.wrongMsg = "解析失败"
+        //                     }
+        //                 })
+        //             }
+        //             $scope.UpdateIdcard=function(fileid){
+        //                 HttpService.analyseToUpdateIdcard(fileid,function(data){
+        //                     if(data){
+        //                         $scope.wrongMsg = "清除标记成功"
+        //                         getData();
+        //                     }else{
+        //                         $scope.wrongMsg = "清除标记失败"
+        //                     }
+        //                 })
+        //             }
+        //         }]
+        //     });
+        // }
+
     });