首页统计及其BUG

assets/js/config.router.js

@@ -318,7 +318,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                     label: 'chart'
                 }
             }).state('app.desk.chart', {
-                url: '/chart',
+                url: '/chart/:tab',
                 templateUrl: "assets/views/desk/chart.html",
                 resolve: loadSequence('jquery-sparkline', 'ui.grid', 'moment', 'angularPrint', 'angularFileUpload', 'ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'chartCtrl'),
                 // resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'moment', 'mwl.calendar', 'ui.grid', 'chartCtrl'),
@@ -495,7 +495,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                     label: 'Incident'
                 }
             }).state('app.incident.list', {
-                url: '/list/{model}',
+                url: '/list/{model}/:tab/:state/:date',
                 templateUrl: "assets/views/incident/list.html",
                 resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'moment', 'angularPrint', 'angularFileUpload', 'ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'incidentCtrl'),
                 title: 'incident.LIST',

assets/js/controllers/dashboard/newdash.js

@@ -1759,7 +1759,17 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
         // setInterval(function() {
         //     getinternetknow({ "user": 23 });
         // }, 10000);
-
+        // 当前登录用户
+        console.log($rootScope.user);
+        // 判断首页统计页面是否显示
+        if($rootScope.user.role.length){
+            $scope.isShowTj = $rootScope.user.role.some(function(v){
+                return v.rolecode === "incident-category-manager" || v.rolecode === "incident manager";
+            })
+        }else{
+            $scope.isShowTj = false;
+        }
+        
         // 首页统计数据（新）
         $scope.managerIndexInfo = {};
         $scope.getDataIndex = function(){
@@ -1796,5 +1806,9 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
             });
         }
         $scope.getDataIndex();
+        // 跳转
+        $scope.goTo = function(url,data){
+            $state.go(url,data);
+        }
     }
 ]);

assets/js/controllers/desk/chartCtrl.js

@@ -736,15 +736,28 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     $scope.timer = $interval(function () {
         $scope.refreshData2('expand-right', $scope.fileData);
     }, $rootScope.refreshTime);
-    $scope.searchstate = 1650;
+    
+    console.log($state.params);
+    if($state.params.tab){
+        if($state.params.tab == '-1'){
+            $scope.searchstate = '';
+            $scope.fileData.wxincident = {};
+        }else{
+            $scope.searchstate = $state.params.tab;
+            $scope.fileData.wxincident.serviceState.id = $scope.searchstate;
+        }
+    }else{
+        //默认未转换
+        $scope.searchstate = 1650;
+        if (sessionStorage.getItem('jry_data')) {
+            $scope.searchstate = sessionStorage.getItem('jry_data');
+            $scope.fileData.wxincident.serviceState.id = sessionStorage.getItem('jry_data');
+        }
+    }
     $scope.$on('$destroy', function () {
         sessionStorage.setItem('jry_data', $scope.searchstate);
         $interval.cancel($scope.timer)
     });
-    if (sessionStorage.getItem('jry_data')) {
-        $scope.searchstate = sessionStorage.getItem('jry_data');
-        $scope.fileData.wxincident.serviceState.id = sessionStorage.getItem('jry_data');
-    }
     $scope.refreshData('expand-right', $scope.fileData);
 }]);
 app.controller('Wechatoperator', ['$rootScope', '$http', '$scope', '$modal', function ($rootScope, $http, $scope, $modal) {

assets/js/controllers/incident/incidentCtrl.js

@@ -4,6 +4,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     //保存报修主体
     $scope.repairMain = JSON.parse(sessionStorage.getItem("repair_main"));
     // ----------------分割线 start-----------------
+    console.log($state)
     // 故障地点下拉
     // $scope.addressModel = '';//文本输入内容
     $scope.address_arr = [];//故障地点所有数据
@@ -900,15 +901,15 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         }
         // $scope.gridOptions.paginationCurrentPage = 1;
         if (item.acceptDate) {
-            item.acceptDate = moment(item.acceptDate).format('YYYY-MM-DD HH:mm:ss');
+            item.acceptDate = moment(item.acceptDate).format('YYYY-MM-DD 00:00:00');
         }
         if (item.acceptDateEnd) {
-            // item.acceptDateEnd = moment(item.acceptDateEnd).format('YYYY-MM-DD HH:mm:ss');
+            // item.acceptDateEnd = moment(item.acceptDateEnd).format('YYYY-MM-DD 00:00:00');
             item.acceptDateEnd = moment(item.acceptDateEnd).format('YYYY-MM-DD 23:59:59')
         }
         // if (parameters) {
         //     angular.extend(fildata, { 'idx': 0, 'sum': $scope.gridOptions.paginationPageSize })
-        //     angular.extend(fildata.incident, { 'acceptDate': moment(parameters.paramDateFrom).format('YYYY-MM-DD HH:mm:ss'), 'acceptDateEnd': moment(parameters.paramDateTo).format('YYYY-MM-DD 23:59:59') })
+        //     angular.extend(fildata.incident, { 'acceptDate': moment(parameters.paramDateFrom).format('YYYY-MM-DD 00:00:00'), 'acceptDateEnd': moment(parameters.paramDateTo).format('YYYY-MM-DD 23:59:59') })
         // }
         
         var transitiondata = angular.copy(item);
@@ -2459,7 +2460,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
 
     // }
     //事件类型筛选
-    $scope.searchstate = 'todo';
+    console.log($state);
+    if($state.params.tab){
+        $scope.searchstate = $state.params.tab;
+    }else{
+        $scope.searchstate = 'todo';//baba
+    }
     $scope.onChange = function (searchType) {
         // console.log(defaultFilterData,'fanbu')
         if(defaultFilterData.incident){
@@ -2530,7 +2536,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     filterData.searchType = $scope.searchType;
                 }
                 $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                $scope.searchstate = filterData.searchType;
+                if($state.params.tab){
+                    $scope.searchstate = $state.params.tab;
+                    filterData.searchType = $state.params.tab;
+                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
+                }else{
+                    $scope.searchstate = filterData.searchType;
+                }
+                if($state.params.date == 'today'){
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date();
+                    $scope.searchkeys.acceptDateEnd = new Date();
+                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.state){
+                    $scope.searchkeys.acceptDate = null;
+                    $scope.searchkeys.acceptDateEnd = null;
+                    var obj = $scope.state.find(function(v){return $state.params.state == v.id});
+                    $scope.othcode = {state:obj};
+                    filterData.incident = {statusId: $state.params.state};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
                 if (filterData.incident && filterData.incident.category) {
                     delete filterData.incident.category
                 }
@@ -2542,6 +2569,28 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         $scope.searchstate = 'overDate';
                     }
                 }
+                if($state.params.tab){
+                    $scope.searchstate = $state.params.tab;
+                    filterData.searchType = $state.params.tab;
+                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
+                }else{
+                    $scope.searchstate = filterData.searchType;
+                }
+                if($state.params.date == 'today'){
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date();
+                    $scope.searchkeys.acceptDateEnd = new Date();
+                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.state){
+                    $scope.searchkeys.acceptDate = null;
+                    $scope.searchkeys.acceptDateEnd = null;
+                    var obj = $scope.state.find(function(v){return $state.params.state == v.id});
+                    $scope.othcode = {state:obj};
+                    filterData.incident = {statusId: $state.params.state};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
             }
         }
         // if (angular.isDefined($scope.searchTypes)) {
@@ -2609,7 +2658,29 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     filterData.searchType = $scope.searchType;
                 }
                 $scope.gridOptions.paginationCurrentPage = 1 + filterData.idx;
-                $scope.searchstate = filterData.searchType;
+                // $scope.searchstate = filterData.searchType;
+                if($state.params.tab){
+                    $scope.searchstate = $state.params.tab;
+                    filterData.searchType = $state.params.tab;
+                    sessionStorage.setItem('searchincident',JSON.stringify(filterData));
+                }else{
+                    $scope.searchstate = filterData.searchType;
+                }
+                if($state.params.date == 'today'){
+                    $scope.othcode = {};
+                    $scope.searchkeys.acceptDate = new Date();
+                    $scope.searchkeys.acceptDateEnd = new Date();
+                    filterData.incident = {acceptDate:moment().format('YYYY-MM-DD 00:00:00'),acceptDateEnd:moment().format('YYYY-MM-DD 23:59:59')};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
+                if($state.params.state){
+                    $scope.searchkeys.acceptDate = null;
+                    $scope.searchkeys.acceptDateEnd = null;
+                    var obj = $scope.state.find(function(v){return $state.params.state == v.id});
+                    $scope.othcode = {state:obj};
+                    filterData.incident = {statusId: $state.params.state};
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
                 if (filterData.incident && filterData.incident.category) {
                     delete filterData.incident.category
                 }

assets/views/dashboard/newdash.html

@@ -23,6 +23,11 @@
     .know-text-group .know-text-group_item{
         margin-left: 16px;
     }
+
+    .know-text-group .know-text-group_item .know-text-group_strong:hover{
+        text-decoration: underline;
+        cursor: pointer;
+    }
     
     .know-text-group-div {
         display: inline-block;
@@ -228,7 +233,7 @@
 <div ng-style="bodyheight">
     <div ng-controller="newDashCtrl" class="">
         <div class="listbote dashheadcolor margin-top-15">
-            <div class="list-controls clearfix">
+            <div class="list-controls clearfix" ng-if="isShowTj">
                 <!-- <div class="know-text-group"> -->
                     <!-- <div class="know-text-group-div pointfont center" ng-click="gowechart()" ng-if="thisuserrole=='admin'||thisuserrole=='center'">
                         <span class="know-text-color"><i class="icon  iconfontsmall icon-baozhangzhuanhuan ashy"></i>移动端报障</span>
@@ -271,30 +276,30 @@
                 <!-- </div> -->
                 <div class="know-text-group clearfix">
                     <div class="know-text-group_block fl">
-                        <div class="know-text-group_item fl">当日应到人数：<strong>{{managerIndexInfo.usersCount}}</strong></div>
+                        <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>
                     <div class="know-text-group_block fr">
-                        <div class="know-text-group_item fl">当日工单情况<strong></strong></div>
-                        <div class="know-text-group_item fl">建单数：<strong>{{managerIndexInfo.createOrders}}</strong></div>
-                        <div class="know-text-group_item fl">待接单数：<strong>{{managerIndexInfo.waitOrders}}</strong></div>
-                        <div class="know-text-group_item fl">处理中：<strong>{{managerIndexInfo.doingOrders}}</strong></div>
+                        <div class="know-text-group_item fl">实时工单情况<strong></strong></div>
+                        <div class="know-text-group_item fl">今日建单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
+                        <div class="know-text-group_item fl">所有待接单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',state:'1543'})">{{managerIndexInfo.waitOrders}}</strong></div>
+                        <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>
                 <div class="know-text-group clearfix">
                     <div class="know-text-group_block fl">
-                        <div class="know-text-group_item fl">当日请求<strong></strong></div>
-                        <div class="know-text-group_item fl">web/微信：<strong>{{fetchWebList.req_total}}</strong></div>
-                        <div class="know-text-group_item fl">建单数：<strong>{{fetchWebList.req_trans}}</strong></div>
-                        <div class="know-text-group_item fl">不受理数：<strong>{{fetchWebList.req_reject}}</strong></div>
+                        <div class="know-text-group_item fl">今日请求<strong></strong></div>
+                        <div class="know-text-group_item fl">web/微信：<strong class="know-text-group_strong" ng-click="goTo('app.desk.chart',{tab:-1})">{{fetchWebList.req_total}}</strong></div>
+                        <div class="know-text-group_item fl">转换建单数：<strong class="know-text-group_strong" ng-click="goTo('app.desk.chart',{tab:1651})">{{fetchWebList.req_trans}}</strong></div>
+                        <div class="know-text-group_item fl">不受理数：<strong class="know-text-group_strong" ng-click="goTo('app.desk.chart',{tab:1652})">{{fetchWebList.req_reject}}</strong></div>
                     </div>
                     <div class="know-text-group_block fr">
-                        <div class="know-text-group_item fl">当日请求<strong></strong></div>
-                        <div class="know-text-group_item fl">当日来电数：<strong>{{fetchDhtjList.req_total}}</strong></div>
-                        <div class="know-text-group_item fl">接听数：<strong>{{fetchDhtjList.req_answer}}</strong></div>
-                        <div class="know-text-group_item fl">建单数：<strong>{{fetchDhtjList.p_total}}</strong></div>
+                        <div class="know-text-group_item fl">今日请求<strong></strong></div>
+                        <div class="know-text-group_item fl">今日来电数：<strong class="know-text-group_strong" ng-click="goTo('app.desk.calllog',{})">{{fetchDhtjList.req_total}}</strong></div>
+                        <div class="know-text-group_item fl">接听数：<strong class="know-text-group_strong" ng-click="goTo('app.desk.calllog',{})">{{fetchDhtjList.req_answer}}</strong></div>
+                        <div class="know-text-group_item fl">转换建单数：<strong class="know-text-group_strong" ng-click="goTo('app.desk.calllog',{})">{{fetchDhtjList.p_total}}</strong></div>
                     </div>
                 </div>
             </div>