seimin 2 роки тому
батько
коміт
8bfb01722d

+ 2 - 2
assets/js/controllers/desk/calllogCtrl.js

@@ -142,7 +142,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
142 142
     }
143 143
     $scope.isHuibo=function(data){
144 144
         var phones = JSON.parse(sessionStorage.getItem('phones'));
145
-        console.log(phones,data.callerIdNumber)
145
+        // console.log(phones,data.callerIdNumber)
146 146
         var isHuajihao = phones && phones.length?phones.some(v=>v == data.callerIdNumber):false;
147 147
         return !isHuajihao;
148 148
     }
@@ -371,7 +371,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
371 371
             $rootScope.toggle('off-sidebar');
372 372
           }else if(localStorage.getItem('hk_phone')){
373 373
             var gid = "@0"
374
-            var telephone = '9' + data.ano
374
+            var telephone = '9' + data.destinationNumber
375 375
             $rootScope.callout = 2;
376 376
             if ($rootScope.takes) {
377 377
                 api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {

+ 32 - 12
assets/js/controllers/mainCtrl.js

@@ -928,11 +928,13 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
928 928
         }else if(phone == 1507) {
929 929
             $scope.group = 2002;
930 930
         }
931
+        $rootScope.isMask = true;
931 932
         api_text.start(phone, $rootScope.user.id).then(function(data) {
932 933
             var token = data.token;
933 934
             $rootScope.takes = token;
934
-            api_text.logout($rootScope.takes, $rootScope.user.id).then(function(data) { if (data.errno == 0) {} });
935
-            api_text.login($scope.group, token, $rootScope.user.id).then(function(data) {
935
+            api_text.logout($rootScope.takes, $rootScope.user.id).then(function(data) { 
936
+              api_text.login($scope.group, token, $rootScope.user.id).then(function(data) {
937
+                $rootScope.isMask = false;
936 938
                 if (data.errno == 0) {
937 939
                     localStorage.setItem('hk_phone',phone);
938 940
                     $rootScope.setidle();
@@ -1421,17 +1423,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1421 1423
                     });
1422 1424
                 }
1423 1425
             })
1424
-
1426
+          });
1425 1427
         })
1426 1428
     }
1427 1429
     // 牛逼
1428
-    // setInterval(function() {
1429
-    //     if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1430
-    //         $rootScope.setidle();
1431
-    //     } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && $rootScope.statuscall != 0) {
1432
-    //         $rootScope.setbusy();
1433
-    //     }
1434
-    // }, 3000);
1430
+    setInterval(function() {
1431
+        if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1432
+            $rootScope.setidle(true);
1433
+        } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && $rootScope.statuscall != 0) {
1434
+            $rootScope.setbusy(true);
1435
+        }
1436
+    }, 5000);
1435 1437
     // 华科呼叫中心 end
1436 1438
 
1437 1439
     //话机呼叫中心--开始
@@ -2742,7 +2744,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
2742 2744
       reashdata();
2743 2745
     }
2744 2746
     $rootScope.end = function (callback) {
2747
+      $rootScope.isMask = true;
2745 2748
       api_text.logout($rootScope.takes, $rootScope.user.id).then(function (data) {
2749
+        $rootScope.isMask = false;
2746 2750
         if (data.errno == 0) {
2747 2751
           localStorage.removeItem('hk_phone');
2748 2752
           api_text.exit($rootScope.takes).then(function (data) {
@@ -2773,7 +2777,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
2773 2777
         // telephone = '*01' + teleno + '*';
2774 2778
         telephone = teleno;
2775 2779
       }
2780
+      $rootScope.isMask = true;
2776 2781
       api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
2782
+        $rootScope.isMask = false;
2777 2783
         if (data.errno == 0) {
2778 2784
           // $rootScope.statuscall = 3;
2779 2785
           $rootScope.callout = true;
@@ -2782,8 +2788,14 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
2782 2788
       })
2783 2789
     }
2784 2790
     // $scope.busy=false;
2785
-    $rootScope.setbusy = function () {
2791
+    $rootScope.setbusy = function (flag) {
2792
+      if(!flag){
2793
+        $rootScope.isMask = true;
2794
+      }
2786 2795
       api_text.setbusy($rootScope.takes).then(function (data) {
2796
+        if(!flag){
2797
+          $rootScope.isMask = false;
2798
+        }
2787 2799
         if (data.errno == 0) {
2788 2800
           $rootScope.statecall = 2;
2789 2801
           $scope.busy = true;
@@ -2791,8 +2803,14 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
2791 2803
         }
2792 2804
       })
2793 2805
     }
2794
-    $rootScope.setidle = function () {
2806
+    $rootScope.setidle = function (flag) {
2807
+      if(!flag){
2808
+        $rootScope.isMask = true;
2809
+      }
2795 2810
       api_text.setidle($rootScope.takes).then(function (data) {
2811
+        if(!flag){
2812
+          $rootScope.isMask = false;
2813
+        }
2796 2814
         if (data.errno == 0) {
2797 2815
           $rootScope.statecall = 1;
2798 2816
           $scope.busy = false;
@@ -2801,7 +2819,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
2801 2819
       })
2802 2820
     }
2803 2821
     $rootScope.inittrans = function (telephone) {
2822
+      $rootScope.isMask = true;
2804 2823
       api_text.inittrans(telephone, $rootScope.takes).then(function (data) {
2824
+        $rootScope.isMask = false;
2805 2825
         if (data.errno == 0) {
2806 2826
           // $scope.status=9
2807 2827