首页上下班情况联动

assets/js/config.router.js

@@ -505,7 +505,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                     label: 'incident list'
                 }
             }).state('app.working.history', {
-                url: '/history',
+                url: '/history/:tab/:state',
                 templateUrl: "assets/views/working/list.html",
                 resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'moment', 'angularPrint', 'angularFileUpload', 'ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'workingHistoryFormCtr'),
                 title: 'incident.LIST',

assets/js/controllers/working/workingHistoryFormCtr.js

@@ -1,6 +1,7 @@
 'use strict';
 
-app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_user_data", function ($scope, moment, SweetAlert, api_user_data) {
+app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "$state", "api_user_data", function ($scope, moment, SweetAlert, $state, api_user_data) {
+  console.log($state.params)
   //上班记录状态
   $scope.statesOn = [
     { name: '全部', value: '0' },
@@ -15,10 +16,26 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
     { name: '未打卡', value: '4' }
   ];
   // 查询条件
-  $scope.searchkeys = {
-    state: $scope.statesOn[0],
-    date: moment().format('YYYY-MM-DD')
+  if ($state.params.state) {
+    var stateItem = $scope.statesOn.find(v => v.value == $state.params.state);
+    if (stateItem) {
+      $scope.searchkeys = {
+        state: stateItem,
+        date: moment().format('YYYY-MM-DD')
+      }
+    } else {
+      $scope.searchkeys = {
+        state: $scope.statesOn[0],
+        date: moment().format('YYYY-MM-DD')
+      }
+    }
+  } else {
+    $scope.searchkeys = {
+      state: $scope.statesOn[0],
+      date: moment().format('YYYY-MM-DD')
+    }
   }
+
   // 查询的重置条件
   $scope.resetSearchkeys = {
     state: $scope.statesOn[0],
@@ -97,7 +114,11 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
     }
   ];
   //默认选择上班记录
-  $scope.searchstate = 'on';
+  if ($state.params.tab) {
+    $scope.searchstate = $state.params.tab;
+  } else {
+    $scope.searchstate = 'on';
+  }
   $scope.states = $scope.statesOn;
   // 切换tab
   $scope.onChange = function (searchType) {
@@ -121,7 +142,7 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
     $scope.startOpened = !$scope.startOpened;
   };
   // 选择日期
-  $scope.changeDate = function(){
+  $scope.changeDate = function () {
     $scope.searchkeys.date = moment($scope.searchkeys.date).format('YYYY-MM-DD');
   }
   // 重置
@@ -130,7 +151,7 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
     $scope.refreshData();
   }
   //处理过滤数据
-  $scope.stateChange = function(data){
+  $scope.stateChange = function (data) {
     var arr = [];
     //过滤上班记录或下班记录
     if ($scope.searchstate === "on") {
@@ -145,7 +166,7 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
       //实到
       let arr1 = arr.filter(v => v.extra2 == "迟到");
       let arr2 = arr.filter(v => v.extra2 == "正常");
-      $scope.myData = [...arr1,...arr2];
+      $scope.myData = [...arr1, ...arr2];
     } else if ($scope.searchkeys.state.value === "2") {
       //迟到
       $scope.myData = arr.filter(v => v.extra2 == "迟到");
@@ -154,19 +175,19 @@ app.controller('workingHistoryFormCtr', ["$scope", "moment", "SweetAlert", "api_
       $scope.myData = arr.filter(v => v.extra2 == "早退");
     } else if ($scope.searchkeys.state.value === "4") {
       //未打卡
-      if($scope.searchstate === 'on'){
+      if ($scope.searchstate === 'on') {
         // 上班
         $scope.myData = angular.copy($scope.itemsSaveNoOn);
-      }else if($scope.searchstate === 'off'){
+      } else if ($scope.searchstate === 'off') {
         // 下班
         $scope.myData = angular.copy($scope.itemsSaveNoOff);
       }
     } else if ($scope.searchkeys.state.value === "0") {
       //全部
-      if($scope.searchstate === 'on'){
+      if ($scope.searchstate === 'on') {
         // 上班
         $scope.myData = angular.copy(arr.concat($scope.itemsSaveNoOn));
-      }else if($scope.searchstate === 'off'){
+      } else if ($scope.searchstate === 'off') {
         // 下班
         $scope.myData = angular.copy(arr.concat($scope.itemsSaveNoOff));
       }

assets/views/dashboard/newdash.html

@@ -282,10 +282,10 @@
                         <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',state:'1544'})">{{managerIndexInfo.doingOrders}}</strong></div>
                     </div>
                     <div class="know-text-group_block fr">
-                        <div class="know-text-group_item fl">今日应到运维人员：<strong>{{managerIndexInfo.usersCount}}</strong></div>
-                        <div class="know-text-group_item fl">实到：<strong>{{managerIndexInfo.onlineCount}}</strong></div>
-                        <div class="know-text-group_item fl">迟到：<strong>{{managerIndexInfo.errorOnlineCount}}</strong></div>
-                        <div class="know-text-group_item fl">未打卡：<strong>{{managerIndexInfo.unOnlineCount}}</strong></div>
+                        <div class="know-text-group_item fl">今日应到运维人员：<strong class="know-text-group_strong" ng-click="goTo('app.working.history',{tab:'on',state:0})">{{managerIndexInfo.usersCount}}</strong></div>
+                        <div class="know-text-group_item fl">实到：<strong class="know-text-group_strong" ng-click="goTo('app.working.history',{tab:'on',state:1})">{{managerIndexInfo.onlineCount}}</strong></div>
+                        <div class="know-text-group_item fl">迟到：<strong class="know-text-group_strong" ng-click="goTo('app.working.history',{tab:'on',state:2})">{{managerIndexInfo.errorOnlineCount}}</strong></div>
+                        <div class="know-text-group_item fl">未打卡：<strong class="know-text-group_strong" ng-click="goTo('app.working.history',{tab:'on',state:4})">{{managerIndexInfo.unOnlineCount}}</strong></div>
                     </div>
                 </div>
                 <div class="know-text-group clearfix">