Browse Source

呼叫中心修改

seimin 2 years ago
parent
commit
a99832b399

+ 1 - 1
assets/js/controllers/customform/customformCtrl.js

@@ -14720,7 +14720,7 @@ appFormly.config(function config(formlyConfigProvider) {
14720 14720
           }
14721 14721
           event.preventDefault();
14722 14722
           //提示
14723
-          alert('复制成功');
14723
+          // alert('复制成功');
14724 14724
         }
14725 14725
         if (angular.isDefined($stateParams.model) && $stateParams.model != "") {
14726 14726
           var paramsModel = JSON.parse($stateParams.model)

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

@@ -251,7 +251,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
251 251
             templateUrl: 'assets/views/incident/tpl/audio.html',
252 252
             controller: function($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
253 253
                 $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recordingFileName);
254
-                // $rootScope.setbusy();
254
+                $rootScope.setbusy();
255 255
                 // $scope.datasurl = "";
256 256
                 // $http({
257 257
                 //     url: callIp + "/recording/recording?recordId=" + data.id,

+ 1 - 1
assets/js/controllers/desk/recordCtrl.js

@@ -596,7 +596,7 @@ app.controller("recordCtrl", [
596 596
           api_playservice
597 597
         ) {
598 598
           $scope.audioUrl = $sce.trustAsResourceUrl(callIp + data.recFileName);
599
-          // $rootScope.setbusy();
599
+          $rootScope.setbusy();
600 600
           // $scope.datasurl = "";
601 601
           // $http({
602 602
           //     url: callIp + "/recording/recording?recordId=" + data.id,

+ 25 - 14
assets/js/controllers/mainCtrl.js

@@ -117,9 +117,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
117 117
         //         $rootScope.setidle();
118 118
         //     }
119 119
         // }
120
-        if (toState.name != "app.incident.editor" && toState.name != "app.incident.title") {
121
-          if(fromState.name == "app.incident.editor" || fromState.name == "app.incident.title"){
122
-            if ($scope.login && $rootScope.statecall == 2 && !$rootScope.busy) {
120
+        if (toState.name != "app.incident.editor" && toState.name != "app.incident.title" && toState.name != "app.incident.chart") {
121
+          if(fromState.name == "app.incident.editor" || fromState.name == "app.incident.title" || fromState.name == "app.incident.chart"){
122
+            // if ($scope.login && $rootScope.statecall == 2 && !$rootScope.busy) {
123
+            if ($scope.login  && !$rootScope.busy) {
123 124
               $rootScope.setidle();
124 125
             }
125 126
           } 
@@ -1002,9 +1003,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1002 1003
                                                 $rootScope.callout = 0;
1003 1004
                                             });
1004 1005
                                             // console.log("挂机");
1005
-                                            if ($rootScope.statecall == 1 && !$rootScope.isSetidle) {
1006
-                                                $rootScope.setbusy();
1007
-                                            }
1006
+                                            // if ($rootScope.statecall == 1 && !$rootScope.isSetidle) {
1007
+                                            //     $rootScope.setbusy();
1008
+                                            // }
1008 1009
                                         } else if (mydata.status && mydata.status != '1' && $rootScope.statecall != 2 && $rootScope.callout == 1) { //摘机
1009 1010
                                             $rootScope.status = 6
1010 1011
                                             $rootScope.statuscall = 3;
@@ -1321,7 +1322,14 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1321 1322
                                             })
1322 1323
                                         }
1323 1324
                                     }
1324
-                                }
1325
+                                } 
1326
+                                // else if(mydata.evttype == 'allbusy' && mydata.status == 'false'){
1327
+                                //   if(location.href.includes('app/incident/list') || location.href.includes('app/incident/editor') || location.href.includes('app/incident/title')){
1328
+                                //     $scope.setbusy();
1329
+                                //   }else{
1330
+                                //     $scope.setidle();
1331
+                                //   }
1332
+                                // }
1325 1333
                             }
1326 1334
                         };
1327 1335
                         var heartCheck = {
@@ -1364,13 +1372,14 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
1364 1372
 
1365 1373
         })
1366 1374
     }
1367
-    setInterval(function() {
1368
-        if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1369
-            $rootScope.setidle();
1370
-        } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && $rootScope.statuscall != 0) {
1371
-            $rootScope.setbusy();
1372
-        }
1373
-    }, 3000);
1375
+    // 牛逼
1376
+    // setInterval(function() {
1377
+    //     if ($scope.login && $rootScope.statuscall == 1 && $rootScope.statecall == 1) {
1378
+    //         $rootScope.setidle();
1379
+    //     } else if ($scope.login && $rootScope.statuscall != 3 && $rootScope.statecall == 2 && $rootScope.statuscall != 0) {
1380
+    //         $rootScope.setbusy();
1381
+    //     }
1382
+    // }, 3000);
1374 1383
     // 华科呼叫中心 end
1375 1384
 
1376 1385
     //话机呼叫中心--开始
@@ -3098,6 +3107,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
3098 3107
       // console.log(' userid='+JSON.stringify( userid));
3099 3108
       //单点登录
3100 3109
       if (localStorage.getItem('isSSo') === '1') {
3110
+        $scope.runNumber = [];
3101 3111
         sessionStorage.clear();
3102 3112
         localStorage.clear();
3103 3113
         location.href = 'http://' + location.hostname + '/pc_logout.jsp'
@@ -3105,6 +3115,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
3105 3115
         $auth.signOut()
3106 3116
           .then(function (resp) {
3107 3117
             // $auth.deleteData('auth_headers')
3118
+            $scope.runNumber = [];
3108 3119
             sessionStorage.clear();
3109 3120
             localStorage.clear();
3110 3121
             console.log($rootScope.isHk,'hk');