浏览代码

播放录音示忙示闲bugfix

seimin 6 月之前
父节点
当前提交
6daa063556

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

@@ -85,7 +85,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
85
             cellTemplate: '<div>' +
85
             cellTemplate: '<div>' +
86
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.transferTime(row.entity.overTime)}}</div>' +
86
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.transferTime(row.entity.overTime)}}</div>' +
87
                 '</div>'
87
                 '</div>'
88
-        } , 
88
+        } ,
89
         {
89
         {
90
             name: 'duration',
90
             name: 'duration',
91
             displayName: '通话时长(秒)',
91
             displayName: '通话时长(秒)',
@@ -101,7 +101,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
101
             cellTemplate: '<div>' +
101
             cellTemplate: '<div>' +
102
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.translateone(row.entity.isAnswered)}}</div>' +
102
                 '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{grid.appScope.translateone(row.entity.isAnswered)}}</div>' +
103
                 '</div>'
103
                 '</div>'
104
-        }, 
104
+        },
105
         // {
105
         // {
106
         //     name: 'routedDN',
106
         //     name: 'routedDN',
107
         //     displayName: '座席工号',
107
         //     displayName: '座席工号',
@@ -129,7 +129,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
129
             cellTemplate: '<div class="links cl-effect-1 pull-left ui-grid-cell-contents">' +
129
             cellTemplate: '<div class="links cl-effect-1 pull-left ui-grid-cell-contents">' +
130
             '<a ng-click="grid.appScope.recordcall(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.yijieFn(row.entity)" class="bianjifont">通话录音</a>' +
130
             '<a ng-click="grid.appScope.recordcall(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.yijieFn(row.entity)" class="bianjifont">通话录音</a>' +
131
             '<a ng-click="grid.appScope.recordcallid(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.isHuibo(row.entity)" class="bianjifont">回拨</a>' +
131
             '<a ng-click="grid.appScope.recordcallid(row.entity)" ng-show="grid.appScope.chuli&&grid.appScope.isHuibo(row.entity)" class="bianjifont">回拨</a>' +
132
-                 '</div>' 
132
+                 '</div>'
133
 
133
 
134
         },
134
         },
135
     ];
135
     ];
@@ -256,7 +256,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
256
             templateUrl: 'assets/views/incident/tpl/audio.html',
256
             templateUrl: 'assets/views/incident/tpl/audio.html',
257
             controller: function($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
257
             controller: function($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
258
                 $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recordingFileName);
258
                 $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recordingFileName);
259
-                $rootScope.setbusy();
259
+                // $rootScope.setbusy();
260
                 // $scope.datasurl = "";
260
                 // $scope.datasurl = "";
261
                 // $http({
261
                 // $http({
262
                 //     url: callIp + "/recording/recording?recordId=" + data.id,
262
                 //     url: callIp + "/recording/recording?recordId=" + data.id,
@@ -304,7 +304,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
304
         modalInstance.result.then(function(result) {
304
         modalInstance.result.then(function(result) {
305
             // $rootScope.setidle();
305
             // $rootScope.setidle();
306
         }, function(reason) {
306
         }, function(reason) {
307
-            $rootScope.setidle();
307
+            // $rootScope.setidle();
308
         });
308
         });
309
     };
309
     };
310
     $scope.fileData={
310
     $scope.fileData={
@@ -326,7 +326,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
326
         $scope.jsearchkeys={};
326
         $scope.jsearchkeys={};
327
         $scope.refreshData('expand-right',$scope.fileData);
327
         $scope.refreshData('expand-right',$scope.fileData);
328
     }
328
     }
329
-    
329
+
330
     $scope.recordcallid = function(data) {
330
     $scope.recordcallid = function(data) {
331
         // var telephone = '9' + data.ano;
331
         // var telephone = '9' + data.ano;
332
         // $rootScope.callout = 2;
332
         // $rootScope.callout = 2;

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

@@ -652,7 +652,7 @@ app.controller("recordCtrl", [
652
           api_playservice
652
           api_playservice
653
         ) {
653
         ) {
654
           $scope.audioUrl = $sce.trustAsResourceUrl(callIp + data.recFileName);
654
           $scope.audioUrl = $sce.trustAsResourceUrl(callIp + data.recFileName);
655
-          $rootScope.setbusy();
655
+          // $rootScope.setbusy();
656
           // $scope.datasurl = "";
656
           // $scope.datasurl = "";
657
           // $http({
657
           // $http({
658
           //     url: callIp + "/recording/recording?recordId=" + data.id,
658
           //     url: callIp + "/recording/recording?recordId=" + data.id,
@@ -700,7 +700,7 @@ app.controller("recordCtrl", [
700
           // $rootScope.setidle();
700
           // $rootScope.setidle();
701
         },
701
         },
702
         function (reason) {
702
         function (reason) {
703
-          $rootScope.setidle();
703
+          // $rootScope.setidle();
704
         }
704
         }
705
       );
705
       );
706
     };
706
     };

+ 26 - 26
assets/js/controllers/incident/incidentCtrl.js

@@ -828,7 +828,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
828
         //             api_bpm_data.fetchDataList('incidentcategory',postData).then(function(data){
828
         //             api_bpm_data.fetchDataList('incidentcategory',postData).then(function(data){
829
         //                 console.log(data)
829
         //                 console.log(data)
830
         //                     var myData = Restangular.stripRestangular(data);
830
         //                     var myData = Restangular.stripRestangular(data);
831
-        //                     $scope.propTypeOptions = myData[2].form.fields;   
831
+        //                     $scope.propTypeOptions = myData[2].form.fields;
832
         //                     // console.log($scope.propTypeOptions)
832
         //                     // console.log($scope.propTypeOptions)
833
         //             });
833
         //             });
834
         //         }
834
         //         }
@@ -865,7 +865,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
865
         if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
865
         if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
866
             $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
866
             $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
867
         }
867
         }
868
-        
868
+
869
         if ($scope.searchkeys.acceptDate) {
869
         if ($scope.searchkeys.acceptDate) {
870
             $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
870
             $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
871
         }
871
         }
@@ -923,7 +923,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
923
             item.statusId = undefined;
923
             item.statusId = undefined;
924
         }
924
         }
925
         console.log(item)
925
         console.log(item)
926
-        
926
+
927
         var fildata = {};
927
         var fildata = {};
928
         if (sessionStorage.searchincident) {
928
         if (sessionStorage.searchincident) {
929
             fildata = JSON.parse(sessionStorage.getItem("searchincident"));
929
             fildata = JSON.parse(sessionStorage.getItem("searchincident"));
@@ -948,7 +948,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
948
         //     angular.extend(fildata, { 'idx': 0, 'sum': $scope.gridOptions.paginationPageSize })
948
         //     angular.extend(fildata, { 'idx': 0, 'sum': $scope.gridOptions.paginationPageSize })
949
         //     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') })
949
         //     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') })
950
         // }
950
         // }
951
-        
951
+
952
         var transitiondata = angular.copy(item);
952
         var transitiondata = angular.copy(item);
953
         angular.extend(fildata.incident, transitiondata)
953
         angular.extend(fildata.incident, transitiondata)
954
         sessionStorage['searchincident'] = JSON.stringify(fildata);
954
         sessionStorage['searchincident'] = JSON.stringify(fildata);
@@ -956,7 +956,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
956
         fildata.assignee = loginUser.id;
956
         fildata.assignee = loginUser.id;
957
         // seimin
957
         // seimin
958
         if($scope.searchstate === 'all_del'){
958
         if($scope.searchstate === 'all_del'){
959
-            fildata.searchType = 'all'; 
959
+            fildata.searchType = 'all';
960
         }else{
960
         }else{
961
             fildata.searchType = $scope.searchstate;
961
             fildata.searchType = $scope.searchstate;
962
         }
962
         }
@@ -1011,7 +1011,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1011
                 $scope.requester = data.list
1011
                 $scope.requester = data.list
1012
             });
1012
             });
1013
         }
1013
         }
1014
-        
1014
+
1015
     }
1015
     }
1016
     getRequester();
1016
     getRequester();
1017
 
1017
 
@@ -1171,7 +1171,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1171
             backdrop: "static",
1171
             backdrop: "static",
1172
             templateUrl: 'assets/views/incident/tpl/audio.html',
1172
             templateUrl: 'assets/views/incident/tpl/audio.html',
1173
             controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
1173
             controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
1174
-                $rootScope.setbusy();
1174
+                // $rootScope.setbusy();
1175
                 $scope.audioUrl = "";
1175
                 $scope.audioUrl = "";
1176
                 $http({
1176
                 $http({
1177
                     url: "http://192.168.77.57:8088/recording/recording?callID=" + data.callID,
1177
                     url: "http://192.168.77.57:8088/recording/recording?callID=" + data.callID,
@@ -1219,7 +1219,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1219
         modalInstance.result.then(function (result) {
1219
         modalInstance.result.then(function (result) {
1220
             // $rootScope.setidle();
1220
             // $rootScope.setidle();
1221
         }, function (reason) {
1221
         }, function (reason) {
1222
-            $rootScope.setidle();
1222
+            // $rootScope.setidle();
1223
         });
1223
         });
1224
     };
1224
     };
1225
     $scope.jry_paging = "";
1225
     $scope.jry_paging = "";
@@ -1313,7 +1313,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1313
                 filtersData.assignee = loginUser.id;
1313
                 filtersData.assignee = loginUser.id;
1314
                 $scope.refreshData('expand-right', filtersData);
1314
                 $scope.refreshData('expand-right', filtersData);
1315
             }
1315
             }
1316
-            // $scope.refreshData('expand-right', {"assignee":$rootScope.user.id, "candidateGroups":$rootScope.user.group[0].id, "idx":newPage-1,"sum":pageSize});                                            
1316
+            // $scope.refreshData('expand-right', {"assignee":$rootScope.user.id, "candidateGroups":$rootScope.user.group[0].id, "idx":newPage-1,"sum":pageSize});
1317
         });
1317
         });
1318
 
1318
 
1319
         // gridApi.selection.on.rowSelectionChanged($scope, function(data) {
1319
         // gridApi.selection.on.rowSelectionChanged($scope, function(data) {
@@ -1529,7 +1529,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1529
                 // {name:"处理结果",value:data.handleResult}];
1529
                 // {name:"处理结果",value:data.handleResult}];
1530
                 // {name:"用户评价",value:''},
1530
                 // {name:"用户评价",value:''},
1531
                 // {name:"满意度",value:''},
1531
                 // {name:"满意度",value:''},
1532
-                // {name:"用户签字",value:''}];                                                                         
1532
+                // {name:"用户签字",value:''}];
1533
                 $scope.cancel = function () {
1533
                 $scope.cancel = function () {
1534
                     $modalInstance.dismiss('cancel');
1534
                     $modalInstance.dismiss('cancel');
1535
                 };
1535
                 };
@@ -1713,7 +1713,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1713
                         filtersData.idx = newPage - 1;
1713
                         filtersData.idx = newPage - 1;
1714
                         filtersData.sum = pageSize;
1714
                         filtersData.sum = pageSize;
1715
                         $scope.loadData(filtersData);
1715
                         $scope.loadData(filtersData);
1716
-                        // $scope.loadData({"idx":newPage-1,"sum":pageSize});                                            
1716
+                        // $scope.loadData({"idx":newPage-1,"sum":pageSize});
1717
                     });
1717
                     });
1718
                     gridApi.selection.on.rowSelectionChanged($scope, function (scope) {
1718
                     gridApi.selection.on.rowSelectionChanged($scope, function (scope) {
1719
                         scope.grid.appScope.selected.items[0] = scope.entity;
1719
                         scope.grid.appScope.selected.items[0] = scope.entity;
@@ -1816,7 +1816,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1816
     // };
1816
     // };
1817
 
1817
 
1818
     /*
1818
     /*
1819
-      appScopeProvider: { 
1819
+      appScopeProvider: {
1820
           onDblClick : function(row) {
1820
           onDblClick : function(row) {
1821
              var url = '//google.com';
1821
              var url = '//google.com';
1822
              $window.open(url, "_blank", "height=600,width=800,toolbar=no,location=no,menubar=no,titlebar=no");
1822
              $window.open(url, "_blank", "height=600,width=800,toolbar=no,location=no,menubar=no,titlebar=no");
@@ -2322,7 +2322,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2322
                     $scope.assignGroup = item.id;
2322
                     $scope.assignGroup = item.id;
2323
                     $scope.getUsers(item.id)
2323
                     $scope.getUsers(item.id)
2324
                 }
2324
                 }
2325
-                
2325
+
2326
                 $scope.ok = function () {
2326
                 $scope.ok = function () {
2327
                     if (!$scope.assignUser){
2327
                     if (!$scope.assignUser){
2328
                         Alert.swal({
2328
                         Alert.swal({
@@ -2409,7 +2409,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2409
             }
2409
             }
2410
         });
2410
         });
2411
     }
2411
     }
2412
-    
2412
+
2413
     // 新增发送短信弹窗
2413
     // 新增发送短信弹窗
2414
     $scope.toSms = function (model) {
2414
     $scope.toSms = function (model) {
2415
         console.log(model)
2415
         console.log(model)
@@ -2457,7 +2457,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2457
                 $scope.group = [];
2457
                 $scope.group = [];
2458
                 $scope.getUsers();
2458
                 $scope.getUsers();
2459
                 $scope.getGroups();
2459
                 $scope.getGroups();
2460
-                
2460
+
2461
                 $scope.ok = function () {
2461
                 $scope.ok = function () {
2462
                     if ($scope.userOrGroup == 1 && !$scope.sms.assignUser){
2462
                     if ($scope.userOrGroup == 1 && !$scope.sms.assignUser){
2463
                         Alert.swal({
2463
                         Alert.swal({
@@ -2568,7 +2568,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2568
                             if (data.errno == 0) {
2568
                             if (data.errno == 0) {
2569
                                 $rootScope.status = 6;
2569
                                 $rootScope.status = 6;
2570
                                 $scope.telephone = telephone;
2570
                                 $scope.telephone = telephone;
2571
-                                
2571
+
2572
                             }else{
2572
                             }else{
2573
                                 $scope.callId = undefined;
2573
                                 $scope.callId = undefined;
2574
                             }
2574
                             }
@@ -2625,7 +2625,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2625
                             }
2625
                             }
2626
                         });
2626
                         });
2627
                     });
2627
                     });
2628
-                    
2628
+
2629
                 }
2629
                 }
2630
 
2630
 
2631
                 $scope.cancel = function () {
2631
                 $scope.cancel = function () {
@@ -2864,7 +2864,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2864
         //     }
2864
         //     }
2865
         // }
2865
         // }
2866
         // // -----------seimin-------------
2866
         // // -----------seimin-------------
2867
-        
2867
+
2868
         // $scope.refreshData('expand-right', defaultFilterData);
2868
         // $scope.refreshData('expand-right', defaultFilterData);
2869
         // $interval.cancel($scope.timer);
2869
         // $interval.cancel($scope.timer);
2870
         // $scope.timer = $interval(function () {
2870
         // $scope.timer = $interval(function () {
@@ -3015,7 +3015,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
3015
         //$scope.callsPending++;
3015
         //$scope.callsPending++;
3016
         $scope.memoryfilterData = filterData;
3016
         $scope.memoryfilterData = filterData;
3017
         $scope.gridOptions['sum'] = filterData.sum;
3017
         $scope.gridOptions['sum'] = filterData.sum;
3018
-        
3018
+
3019
         api_bpm_domain.fetchtask(pdKey, filterData).then(function (data) {
3019
         api_bpm_domain.fetchtask(pdKey, filterData).then(function (data) {
3020
             if (data.data) {
3020
             if (data.data) {
3021
                 // if(filterData.searchType == 'all'){
3021
                 // if(filterData.searchType == 'all'){
@@ -3037,7 +3037,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
3037
                 });
3037
                 });
3038
             }
3038
             }
3039
             $scope.ldloading[style.replace('-', '_')] = false;
3039
             $scope.ldloading[style.replace('-', '_')] = false;
3040
-            
3040
+
3041
         }, function () {
3041
         }, function () {
3042
             $scope.ldloading[style.replace('-', '_')] = false;
3042
             $scope.ldloading[style.replace('-', '_')] = false;
3043
         });
3043
         });
@@ -3148,7 +3148,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
3148
         // }
3148
         // }
3149
         $scope.refreshData('expand-right');
3149
         $scope.refreshData('expand-right');
3150
     }
3150
     }
3151
-    
3151
+
3152
     $scope.timer = $interval(function () {
3152
     $scope.timer = $interval(function () {
3153
         $scope.jry_refresh()
3153
         $scope.jry_refresh()
3154
     }, $rootScope.refreshTime);
3154
     }, $rootScope.refreshTime);
@@ -3279,7 +3279,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
3279
         } else {
3279
         } else {
3280
             return false
3280
             return false
3281
         }
3281
         }
3282
-        // }   
3282
+        // }
3283
     }
3283
     }
3284
     $scope.coordination = function () {
3284
     $scope.coordination = function () {
3285
         $scope.colobject.grid.appScope.coordination($scope.item);
3285
         $scope.colobject.grid.appScope.coordination($scope.item);
@@ -3387,16 +3387,16 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
3387
     //       $scope.data={
3387
     //       $scope.data={
3388
     //           "name":"视频",
3388
     //           "name":"视频",
3389
     //           "url":"http://192.168.3.69:8088/recording/recording?callID="+$rootScope.callid
3389
     //           "url":"http://192.168.3.69:8088/recording/recording?callID="+$rootScope.callid
3390
-    //       };  
3390
+    //       };
3391
     //       $scope.data.url = $sce.trustAsResourceUrl($scope.data.url);
3391
     //       $scope.data.url = $sce.trustAsResourceUrl($scope.data.url);
3392
 
3392
 
3393
     //         // $scope.audiourl={url:$sce.trustAsResourceUrl("http://192.168.3.69:8088/recording/recording?callID=218147232")};
3393
     //         // $scope.audiourl={url:$sce.trustAsResourceUrl("http://192.168.3.69:8088/recording/recording?callID=218147232")};
3394
 
3394
 
3395
     //         $scope.cancel = function() {
3395
     //         $scope.cancel = function() {
3396
     //                 $modalInstance.dismiss('cancel');
3396
     //                 $modalInstance.dismiss('cancel');
3397
-    //             };       
3398
-    //             $modalInstance.close();  
3399
-    //       } 
3397
+    //             };
3398
+    //             $modalInstance.close();
3399
+    //       }
3400
     //     });
3400
     //     });
3401
     // };
3401
     // };
3402
 
3402