修改页面

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

 <div class="ui-dialog-title" >
-    请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 制证包
+    请选择格口文件，解析 {{upDate}} 上传的 {{upCount}} 个制证包
 </div>
 <div class="ui-dialog-content">
     <table class="table table-hover" >

src/main/resources/static/index.html

@@ -161,7 +161,7 @@
         <strong>北京制证辅助平台</strong>
     </footer>
 </div>
-<div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;">
+<div ng-if="loginData.login == false" class="wrapper" style=background-image:url(newTheme/dist/img/download.jpg);background-repeat:repeat;height:100%;">
     <div style="min-height: 500px;" ng-view></div>
 </div>
 

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

@@ -209,7 +209,7 @@ angular.module('AvatarCheck', [
                 var check = idx.split("+");
                 var json={};
                 json.acceptNo=check[0];
-                json.cardType=check[2];
+                json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
                 json.countyCode=check[1];
                 json.name=$rootScope.loginData.name;
                 console.log(json)
@@ -229,7 +229,7 @@ angular.module('AvatarCheck', [
                 console.log(idx,check)
                 var json={};
                 json.acceptNo=check[0];
-                json.cardType=check[2];
+                json.cardType=$scope.searchResult.workOrderDate[0].CARD_TYPE_ID;
                 json.countyCode=check[1];
                 json.name=$rootScope.loginData.name;
                 console.log(json)

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

@@ -71,7 +71,7 @@
                       </thead>
                       <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
                       <tr>
-                        <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
+                        <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" name="{{task.countyValidCount}}" ng-click="updateSelection($event,task)"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                         <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                         <td class="mailbox-subject">{{task.groupList.length}}</td>
@@ -84,6 +84,7 @@
                     </table>
                     <!-- /.table -->
                     <div class="box-footer" style="text-align: right;">
+                          <h4>已选择数量：{{cardsTotal}}</h4>
                           <button class="btn btn-primary" ng-click="createTaskList(type.typeCode)">创建任务单</button>
                     </div>
                   </div>

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

@@ -154,22 +154,18 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
             if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
         };
         //更新某一列数据的选择
-        var temp = 0;
         $rootScope.cardsTotal = 0;
         $scope.updateSelection = function ($event, task) {
             var checkbox = $event.target;
             var action = (checkbox.checked ? 'add' : 'remove');
             updateSelected(action, task);
 
+            $rootScope.cardsTotal=0;
             var sum = 0;
-            var checks = document.getElementsByClassName("checkOneBox");
-            for (var i=0;i<checks.length;i++){
-                if (checks[i].checked) {
-                    sum += parseInt(checks[i].value);
-                }
+            for (var i = 0; i < $scope.selected.length; i++) {
+                sum += parseInt($scope.selected[i].countyValidCount);
             }
-            $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
-            temp = sum;
+            $rootScope.cardsTotal = $rootScope.cardsTotal + sum;
 
         };
         //全选操作
@@ -180,21 +176,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 var contact = task[i];
                 updateSelected(action, contact);
             }
-
-
-            if(checkbox.checked){
-                var sum = 0;
-                var checks = document.getElementsByClassName("checkOneBox");
-                for (var i = 0; i < checks.length; i++) {
-                    sum += parseInt(checks[i].value);
-                }
-                $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
-                temp = sum;
-
-            }else{
-                $rootScope.cardsTotal =0;
-                temp = 0;
+            $rootScope.cardsTotal=0;
+            var sum = 0;
+            for (var i = 0; i < $scope.selected.length; i++) {
+                sum += parseInt($scope.selected[i].countyValidCount);
             }
+            $rootScope.cardsTotal = $rootScope.cardsTotal + sum;
         };
         $scope.isSelected = function (task) {
             return $scope.selected.indexOf(task) >= 0;
@@ -204,7 +191,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
         };
 
         $scope.createTaskList = function(typeCode){
-            if($scope.selected.length>0){
+            if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
                 var arr = [];
                 for (var i=0;i<$scope.selected.length;i++){
                     var json = {

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

@@ -47,7 +47,7 @@
               </thead>
               <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
               <tr>
-                <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
+                <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount}}" ng-click="updateSelection($event,task)"></td>
                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                 <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                 <td class="mailbox-subject">{{task.groupList.length}}</td>

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

@@ -26,14 +26,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
         $scope.isHistory=0;
         $scope.searchTaskList = function(){
-            var date=$('#datepicker').val();
-            if(date==''){
-                date=$scope.choseDate;
-            }
-            HttpService.getHasDistributeCount(date,function (data) {
-                $scope.distributedCount = data;
-                console.log(data)
-            })
             $scope.isHistory=0;
             HttpService.getTaskListByProcess(function(data){
                 $scope.cycleSheetData = data;

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

-<div class="login-box">
-  <div class="login-logo">
-    <h3>北京制证辅助平台</h3>
+<div class="login-box" style="width: 570px;" >
+  <!--<img src="../../bj.jpg">-->
+  <div class="login-logo" style="color: ivory;">
+    <h3 style="font-weight: 600;">北京市公安局居民身份证制证辅助平台</h3>
   </div>
   <!-- /.login-logo -->
-  <div class="login-box-body" style="border-radius: 4px;">
+  <div class="login-box-body" style="border-radius: 4px;background: rgba(0,0,0,0.4);">
     <p class="login-box-msg">用户登录</p>
 
     <form name="form">
@@ -22,7 +23,9 @@
       <div class="row">
         <!-- /.col -->
         <div class="col-xs-4 col-lg-offset-4">
-          <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled='form.$invalid' ng-click="doLogin()">登录</button>
+          <button type="submit"style="color: ivory;"
+                  class="btn btn-primary btn-block btn-flat"
+                   ng-click="doLogin()">登录</button>
         </div>
         <!-- /.col -->
       </div>
@@ -30,4 +33,10 @@
 
   </div>
   <!-- /.login-box-body -->
+  <div style=" color: ivory;
+        margin-top: 10px;
+        margin-left: 5px; ">
+    Powered by
+    <a href="http://www.yingxininfo.net/" style="color:  orangered;">1.0.1.110
+      </a> - 北京盈信信息科技有限公司提供技术支持服务</div>
 </div>
\ No newline at end of file

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

@@ -47,14 +47,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
 
         $scope.isHistory=0;
         $scope.searchTaskList = function(){
-            var date=$('#datepicker').val();
-            if(date==''){
-                date=$scope.choseDate;
-            }
-            HttpService.getHasDistributeCount(date,function (data) {
-                $scope.distributedCount = data;
-                console.log(data)
-            })
             $scope.isHistory=0;
             HttpService.getTaskListByProcess(function(data){
                 $scope.cycleSheetData = data;