Ver código fonte

呼叫中心语法错误修复和添加拨打电话

seimin 2 anos atrás
pai
commit
9ec2d8c30e

+ 5 - 0
assets/js/controllers/incident/incidentCtrl.js

@@ -855,6 +855,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
855
         if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
855
         if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
856
             $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
856
             $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
857
         }
857
         }
858
+        
858
         if ($scope.searchkeys.acceptDate) {
859
         if ($scope.searchkeys.acceptDate) {
859
             $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
860
             $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
860
         }
861
         }
@@ -2682,6 +2683,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2682
     console.log($state);
2683
     console.log($state);
2683
     if($state.params.tab){
2684
     if($state.params.tab){
2684
         $scope.searchstate = $state.params.tab;
2685
         $scope.searchstate = $state.params.tab;
2686
+    }else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
2687
+        $scope.searchstate = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
2685
     }else{
2688
     }else{
2686
         $scope.searchstate = 'all';
2689
         $scope.searchstate = 'all';
2687
     }
2690
     }
@@ -2774,6 +2777,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2774
                     $scope.searchstate = $state.params.tab;
2777
                     $scope.searchstate = $state.params.tab;
2775
                     filterData.searchType = $state.params.tab;
2778
                     filterData.searchType = $state.params.tab;
2776
                     sessionStorage.setItem('searchincident',JSON.stringify(filterData));
2779
                     sessionStorage.setItem('searchincident',JSON.stringify(filterData));
2780
+                }else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
2781
+                    $scope.searchstate = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
2777
                 }else{
2782
                 }else{
2778
                     $scope.searchstate = filterData.searchType;
2783
                     $scope.searchstate = filterData.searchType;
2779
                 }
2784
                 }

+ 2 - 2
assets/js/controllers/mainCtrl.js

@@ -1365,8 +1365,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1365
     setInterval(function() {
1365
     setInterval(function() {
1366
         if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1366
         if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1367
             $rootScope.setidle();
1367
             $rootScope.setidle();
1368
-        } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && statuscall != 0) {
1369
-            $rootScope.setbusy
1368
+        } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && $rootScope.statuscall != 0) {
1369
+            $rootScope.setbusy();
1370
         }
1370
         }
1371
     }, 3000);
1371
     }, 3000);
1372
     // 华科呼叫中心 end
1372
     // 华科呼叫中心 end