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

src/main/resources/static/index.html

@@ -120,7 +120,7 @@
                         </a>
                       </li>
                     <li class="dropdown user user-menu">
-                          <a  ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0">退出当前用户</a>
+                          <a  ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0"><i class="glyphicon glyphicon-off"></i>退出当前用户</a>
                     </li>
                 </ul>
             </div>

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

@@ -551,6 +551,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
                     params:{
                         process:$rootScope.loginData.roleList[0].process-1,
+                        workGroup:$rootScope.loginData.workGroup,
                         date:date
                     }
                 }).then(function successCallback(response) {
@@ -564,6 +565,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),
                     params:{
                         process:$rootScope.loginData.roleList[0].process,
+                        workGroup:$rootScope.loginData.workGroup,
                         date:date
                     }
                 }).then(function successCallback(response) {
@@ -666,7 +668,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            getFjTaskListByProcess:function(success){
+            getDxrTaskListByProcess:function(success){
                 $http({
                     method: 'GET',
                     url: "../TaskList/queryByCountyAtAuxiliaryState3"+urlTimeStamp(),
@@ -678,6 +680,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            getFjTaskListByProcess:function(success){
+                $http({
+                    method: 'GET',
+                    url: "../TaskList/queryByCountyAtAuxiliaryState4"+urlTimeStamp(),
+                    params:{
+                        process:$rootScope.loginData.roleList[0].process
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
             getPingTaskListByProcess:function(success) {
                 $http({
                     method: 'GET',

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

@@ -420,7 +420,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         $scope.searchTaskList = function(){
             $scope.selected = [];
             $scope.isHistory=0;
-            HttpService.getFjTaskListByProcess(function(data){
+            HttpService.getDxrTaskListByProcess(function(data){
                 $scope.cycleSheetData = data;
                 for(var i=0;i<$scope.cycleSheetData.length;i++){
                     if(i==$scope.currentTab){