呼叫中心手动加状态

assets/js/controllers/customform/customformCtrl.js

@@ -14997,19 +14997,19 @@ appFormly.config(function config(formlyConfigProvider) {
       "SweetAlert",
       function ($scope, $rootScope, api_text, SweetAlert) {
         $scope.dialout = function (teleno) {
-          var gid = "@0";
-          var telephone = "9" + teleno;
+          // var gid = "@0";
+          // var telephone = "9" + teleno;
           $rootScope.callout = 2;
-          var agcount = tlwsa.tlaGetagentcount();
-          var agcountFlag = false;
-          console.log(teleno)
-          // 查询当前话机是否签入
-          for (var i = 0; i < agcount; i++) {
-            if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
-              agcountFlag = true;
-            }
-          }
-          if (agcountFlag) {
+          // var agcount = tlwsa.tlaGetagentcount();
+          // var agcountFlag = false;
+          // console.log(teleno)
+          // // 查询当前话机是否签入
+          // for (var i = 0; i < agcount; i++) {
+          //   if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
+          //     agcountFlag = true;
+          //   }
+          // }
+          if (localStorage.getItem('phoneNumber')) {
             var caller = localStorage.getItem('phoneNumber');//呼叫人
             console.log(sessionStorage.getItem('phones'))
             var phones = JSON.parse(sessionStorage.getItem('phones'));

assets/js/controllers/desk/calllogCtrl.js

@@ -136,11 +136,10 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
         }
     }
     $scope.isHuibo=function(data){
-        if(data.callerIdNumber != $rootScope.phoneNumber){
-            return true
-        }else{
-            return false
-        }
+        var phones = JSON.parse(sessionStorage.getItem('phones'));
+        console.log(phones,data.callerIdNumber)
+        var isHuajihao = phones.length?phones.some(v=>v == data.callerIdNumber):false;
+        return !isHuajihao;
     }
     $scope.chuli=false;
     for(var i=0;i<loginUser.menu.length;i++){
@@ -342,16 +341,16 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
         //     });
         // }
         // $rootScope.dial(data.callerIdNumber)
-        var agcount = tlwsa.tlaGetagentcount();
-          var agcountFlag = false;
-          console.log(data.callerIdNumber)
-          // 查询当前话机是否签入
-          for (var i = 0; i < agcount; i++) {
-            if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
-              agcountFlag = true;
-            }
-          }
-          if (agcountFlag) {
+        // var agcount = tlwsa.tlaGetagentcount();
+        //   var agcountFlag = false;
+        //   console.log(data.callerIdNumber)
+        //   // 查询当前话机是否签入
+        //   for (var i = 0; i < agcount; i++) {
+        //     if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
+        //       agcountFlag = true;
+        //     }
+        //   }
+          if (localStorage.getItem('phoneNumber')) {
             var caller = localStorage.getItem('phoneNumber');//呼叫人
             console.log(sessionStorage.getItem('phones'))
             var phones = JSON.parse(sessionStorage.getItem('phones'));

assets/js/controllers/desk/recordCtrl.js

@@ -320,43 +320,44 @@ app.controller('recordCtrl', ["$scope", "i18nService", "$rootScope", "$state", "
             backdrop: "static",
             templateUrl: 'assets/views/incident/tpl/audio.html',
             controller: function($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
-                $rootScope.setbusy();
-                $scope.datasurl = "";
-                $http({
-                    url: callIp + "/recording/recording?recordId=" + data.id,
-                    method: 'GET',
-                    headers: {},
-                }).success(function(data, status, headers, config) {
-                    $scope.data = {
-                        "name": "视频",
-                        "url": $sce.trustAsResourceUrl("http://" + data.rrpath)
-                    };
-                    $scope.datasurl = data.rrpath;
-                }).error(function(data, status, headers, config) {});
-                $scope.download = function(contentId, filename) {
-                    $http({
-                        url: "http://" + $scope.datasurl,
-                        method: 'GET',
-                        headers: {
-                            'Content-type': 'application/octet-stream',
-                        },
-                        responseType: 'arraybuffer'
-                    }).success(function(data, status, headers, config) {
-                        var file = new Blob([data], {
-                            type: 'application/octet-stream'
-                        });
-                        //trick to download store a file having its URL
-                        var fileURL = URL.createObjectURL(file);
-                        var a = document.createElement('a');
-                        a.href = fileURL;
-                        a.target = '_blank';
-                        a.download = filename;
-                        document.body.appendChild(a);
-                        a.click();
-                    }).error(function(data, status, headers, config) {
-                        // console.log(data);
-                    });
-                }
+                $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recFileName);
+                // $rootScope.setbusy();
+                // $scope.datasurl = "";
+                // $http({
+                //     url: callIp + "/recording/recording?recordId=" + data.id,
+                //     method: 'GET',
+                //     headers: {},
+                // }).success(function(data, status, headers, config) {
+                //     $scope.data = {
+                //         "name": "视频",
+                //         "url": $sce.trustAsResourceUrl("http://" + data.rrpath)
+                //     };
+                //     $scope.datasurl = data.rrpath;
+                // }).error(function(data, status, headers, config) {});
+                // $scope.download = function(contentId, filename) {
+                //     $http({
+                //         url: "http://" + $scope.datasurl,
+                //         method: 'GET',
+                //         headers: {
+                //             'Content-type': 'application/octet-stream',
+                //         },
+                //         responseType: 'arraybuffer'
+                //     }).success(function(data, status, headers, config) {
+                //         var file = new Blob([data], {
+                //             type: 'application/octet-stream'
+                //         });
+                //         //trick to download store a file having its URL
+                //         var fileURL = URL.createObjectURL(file);
+                //         var a = document.createElement('a');
+                //         a.href = fileURL;
+                //         a.target = '_blank';
+                //         a.download = filename;
+                //         document.body.appendChild(a);
+                //         a.click();
+                //     }).error(function(data, status, headers, config) {
+                //         // console.log(data);
+                //     });
+                // }
                 $scope.cancel = function() {
                     $modalInstance.dismiss('cancel');
                 };
@@ -373,23 +374,42 @@ app.controller('recordCtrl', ["$scope", "i18nService", "$rootScope", "$state", "
     };
     /*--------- call --------- */
     $scope.recordcallid = function(data) {
-        var telephone = '9' + data.ano;
+        // var telephone = '9' + data.ano;
         $rootScope.callout = 2;
-        if ($rootScope.takes) {
-            api_text.dialout($rootScope.takes, "@0", telephone).then(function(data) {
-                if (data.errno == 0) {
-                    $rootScope.status = 6;
-                    $scope.oldRecord(data);
-                }
-            })
-        } else {
+        // if ($rootScope.takes) {
+        //     api_text.dialout($rootScope.takes, "@0", telephone).then(function(data) {
+        //         if (data.errno == 0) {
+        //             $rootScope.status = 6;
+        //             $scope.oldRecord(data);
+        //         }
+        //     })
+        // } else {
+        //     SweetAlert.swal({
+        //         title: "呼叫失败",
+        //         text: "请先签入呼叫中心!",
+        //         type: "error",
+        //         confirmButtonColor: "#DD6B55"
+        //     });
+        // }
+        if (localStorage.getItem('phoneNumber')) {
+            var caller = localStorage.getItem('phoneNumber');//呼叫人
+            console.log(sessionStorage.getItem('phones'))
+            var phones = JSON.parse(sessionStorage.getItem('phones'));
+            var isHuajihao = phones.length?phones.some(v=>v == data.ano):false;
+            console.log(isHuajihao)
+            if(isHuajihao){
+              tlwsa.tlaCallagc(data.ano);//呼叫坐席
+            }else{
+              tlwsa.tlaCallout(data.ano, caller, 0);//呼叫外线
+            }
+          } else {
             SweetAlert.swal({
-                title: "呼叫失败",
-                text: "请先签入呼叫中心!",
-                type: "error",
-                confirmButtonColor: "#DD6B55"
+              title: "呼叫失败",
+              text: "请先签入呼叫中心!",
+              type: "error",
+              confirmButtonColor: "#DD6B55",
             });
-        }
+          }
     };
     /*--------- old record --------- */
     $scope.oldRecord = function(data) {
@@ -585,6 +605,12 @@ app.controller('Recordoperator', ['$rootScope', '$http', '$scope', '$modal', fun
     // } else {
     //     $scope.isvalid = false;
     // }
+    $scope.isHuibo = (function(){
+        var phones = JSON.parse(sessionStorage.getItem('phones'));
+        console.log(phones,$scope.item.ano)
+        var isHuajihao = phones.length?phones.some(v=>v == $scope.item.ano):false;
+        return !isHuajihao;
+    })()
     $scope.weishouli=false;
     $scope.yishouli=false;
     $scope.bushouli=false;
@@ -639,7 +665,7 @@ app.directive('recordoperator', function() {
             // '<a ng-click="record()"  ng-show="{{isvalid}}&&{{handle}}" class="luyinfont">有效</a>' +
             // '<a ng-click="record()"  ng-show="{{novalid}}&&{{handle}}" class="luyinfont">无效</a>' +
             '<a ng-click="recordcall()" ng-show="(weishouli||yishouli)&&chuli" class="bianjifont">回放</a>' +
-            '<a ng-click="recordcallid()" ng-show="(weishouli||yishouli)&&chuli" class="bianjifont">回拨</a>' +
+            '<a ng-click="recordcallid()" ng-show="(weishouli||yishouli)&&chuli&&isHuibo" class="bianjifont">回拨</a>' +
             '<a ng-click="toIncident()"  ng-show="yishouli" class="bianjifont">查看事件</a>' +
             '</div>'
     };

assets/js/controllers/mainCtrl.js

@@ -49,20 +49,30 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       console.log(event, toState, toParams, fromState, fromParams, 'cao')
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
         fromState.name) {
-        $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
-        //进入页面强制示忙
-        if (tlwsa) {
-          tlwsa.tlaForceacw($rootScope.phoneNumber);
+        console.log($rootScope.jry_state);
+        $scope.isShixian = false;
+        if($rootScope.jry_state == 'shixian'){
+          $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
+          //进入页面强制示忙
+          if (tlwsa) {
+            // tlwsa.tlaForceacw($rootScope.phoneNumber);
+            setTimeout(()=>{
+              tlwsa.tlaAcw();
+            },0)
+          }
         }
       }
       if ((fromState.name == 'app.incident.chart' || fromState.name == 'app.incident.editor') &&
         toState.name != 'app.incident.chart' && toState.name != 'app.incident.editor'
       ) {
-        $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
+        console.log($rootScope.jry_state);
+        // $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
         //进入页面强制示闲
-        if (tlwsa) {
-          tlwsa.tlaForcewca($rootScope.phoneNumber);
-        }
+        $scope.isShixian = true;
+        // if (tlwsa) {
+        //   // tlwsa.tlaForcewca($rootScope.phoneNumber);
+        //   tlwsa.tlaWca();
+        // }
       }
       if (isEmpty($auth.retrieveData('auth_headers'))) {
         // if (toState.name != "login.signin" && toState.name != "echart") {
@@ -1292,21 +1302,39 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_extnNumberObj.jry_extnNumber = angular.copy(res[0]);//绑定分机对象
         $rootScope.jry_extnNumberObj.tel1 = angular.copy(res[0]);//目的号码对象
         $rootScope.jry_extnNumberObj.tel2 = angular.copy(res[0]);//转接坐席对象
+        $rootScope.preState = '';//最近一次示忙还是示闲的状态
         //连接
         tlwsa.tlaOpen(websocket_url);
-        // 获取状态
-        $scope.getState = function () {
+        // 强制示忙
+        $scope.qShimang = function(state){
           if (location.href.includes('app/incident/editor') || location.href.includes('app/incident/chart')) {
             //进入页面,强制示忙
-            tlwsa.tlaForceacw($rootScope.phoneNumber);
+            // tlwsa.tlaForceacw($rootScope.phoneNumber);
+            setTimeout(()=>{
+              tlwsa.tlaAcw();
+            },0)
+          }else{
+            $scope.getState(state);
           }
-          var agcount = tlwsa.tlaGetagentcount();
-          var flag = true;
-          for (var i = 0; i < agcount; i++) {
-            if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
-              flag = false;
-              var state = Number(tlwsa.tlaGetagentstate(i));
-              console.log(state);
+        }
+        // 获取状态
+        $scope.getState = function (state) {
+          // if (location.href.includes('app/incident/editor') || location.href.includes('app/incident/chart')) {
+          //   if(state != 2&&state != 0){
+          //     //进入页面,强制示忙
+          //     // tlwsa.tlaForceacw($rootScope.phoneNumber);
+          //     setTimeout(()=>{
+          //       tlwsa.tlaAcw();
+          //     },3000)
+          //   }
+          // }
+          // var agcount = tlwsa.tlaGetagentcount();
+          // var flag = true;
+          // for (var i = 0; i < agcount; i++) {
+            // if (tlwsa.tlaGetagentwid(i) == $rootScope.phoneNumber) {
+              // flag = false;
+              // var state = Number(tlwsa.tlaGetagentstate(i));
+              // console.log(state);
               switch (state) {
                 case 0:
                   $rootScope.jry_state = 'weiqianru';
@@ -1330,25 +1358,26 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                   $rootScope.jry_state = 'zhengzaizhuanyi';
                   break;
               }
-            }
-            console.log('agnet No. ' + i + ' workid is ' + tlwsa.tlaGetagentwid(i) + ' state is ' + tlwsa.tlaGetagentstate(i) + '  ' + getStateInfo(tlwsa.tlaGetagentstate(i)))
-          }
-          if (flag) {
-            $rootScope.jry_state = 'weiqianru';
-          }
+            // }
+            // console.log('agnet No. ' + i + ' workid is ' + tlwsa.tlaGetagentwid(i) + ' state is ' + tlwsa.tlaGetagentstate(i) + '  ' + getStateInfo(tlwsa.tlaGetagentstate(i)))
+          // }
+          // if (flag) {
+          //   $rootScope.jry_state = 'weiqianru';
+          // }
         }
         // 状态回调函数
-        TLWSA.onStatechange = onstatechange;
-        function onstatechange() {
-          console.log('事件:状态变化----------------------------------------------------');
-          $scope.getState();
-        }
+        // TLWSA.onStatechange = onstatechange;
+        // function onstatechange() {
+        //   console.log('事件:状态变化----------------------------------------------------');
+        //   $scope.getState();
+        // }
         //连接呼叫中心回调函数
         TLWSA.onOpenreturn = onopenreturn;
         function onopenreturn(err) {
           err = Number(err);
           if (!err) {
             console.log('呼叫中心连接成功-----seimin');
+            $scope.getState(0);
             $.toaster({
               priority: 'info',
               title: '操作',
@@ -1361,13 +1390,13 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             }
           } else {
             console.log('呼叫中心连接失败-----seimin');
+            $scope.getState(0);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼叫中心连接失败'
             });
           }
-
         }
         //绑定分机回调函数
         TLWSA.onSetphonenumberreturn = onsetphonenumberreturn;
@@ -1380,14 +1409,11 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               title: '操作',
               message: '绑定分机成功'
             });
-            // $rootScope.jry_state = 'shixian';
             localStorage.setItem('phoneNumber', $rootScope.phoneNumber);
-            if (location.href.includes('app/incident/editor') || location.href.includes('app/incident/chart')) {
-              //进入页面,强制示忙
-              tlwsa.tlaForceacw($rootScope.phoneNumber);
-            }
+            $scope.qShimang(1);
           } else {
             console.log('绑定分机失败-----seimin');
+            $scope.getState(0);
             $.toaster({
               priority: 'info',
               title: '操作',
@@ -1396,52 +1422,52 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           }
         }
         //强制示忙回调函数
-        TLWSA.onAcw = onacw;
-        function onacw(err) {
-          err = Number(err);
-          if (!err) {
-            // $rootScope.jry_state = 'shimang';
-            console.log('强制示忙成功-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '示忙成功'
-            });
-          } else {
-            console.log('强制示忙失败-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '示忙失败'
-            });
-          }
-        }
-        //强制示闲回调函数
-        TLWSA.onWca = onwca;
-        function onwca(err) {
-          console.log(err)
-          err = Number(err);
-          if (!err) {
-            // $rootScope.jry_state = 'shixian';
-            console.log('强制示闲成功-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '示闲成功'
-            });
-          } else {
-            console.log('强制示闲失败-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '示闲失败'
-            });
-          }
-        }
+        // TLWSA.onAcw = onacw;
+        // function onacw(err) {
+        //   err = Number(err);
+        //   if (!err) {
+        //     console.log('强制示忙成功-----seimin');
+        //     $scope.getState(2);
+        //     $.toaster({
+        //       priority: 'info',
+        //       title: '操作',
+        //       message: '示忙成功'
+        //     });
+        //   } else {
+        //     console.log('强制示忙失败-----seimin');
+        //     $.toaster({
+        //       priority: 'info',
+        //       title: '操作',
+        //       message: '示忙失败'
+        //     });
+        //   }
+        // }
+        // //强制示闲回调函数
+        // TLWSA.onWca = onwca;
+        // function onwca(err) {
+        //   console.log(err)
+        //   err = Number(err);
+        //   if (!err) {
+        //     console.log('强制示闲成功-----seimin');
+        //     $scope.getState(1);
+        //     $.toaster({
+        //       priority: 'info',
+        //       title: '操作',
+        //       message: '示闲成功'
+        //     });
+        //   } else {
+        //     console.log('强制示闲失败-----seimin');
+        //     $.toaster({
+        //       priority: 'info',
+        //       title: '操作',
+        //       message: '示闲失败'
+        //     });
+        //   }
+        // }
         //与服务器网络连接中断回调函数
         TLWSA.onClosed = onclosed;
         function onclosed() {
-          $rootScope.jry_state = 'weiqianru';
+          $scope.getState(0);
           console.log('与服务器网络连接中断-----seimin');
           $.toaster({
             priority: 'info',
@@ -1484,7 +1510,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               message: '签入失败'
             });
           }
-          tlwsa.tlaSubscribestateinfo(2);
+          // tlwsa.tlaSubscribestateinfo(2);
         }
         // 强制签出回调函数
         TLWSA.onKillreturn = onkillreturn;
@@ -1492,6 +1518,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('强制签出成功-----seimin');
+            $scope.getState(0);
             // $.toaster({
             //   priority: 'info',
             //   title: '操作',
@@ -1518,12 +1545,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('签出成功-----seimin');
+            $scope.getState(0);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '签出成功'
             });
-            // $rootScope.jry_state = 'weiqianru';
             localStorage.removeItem('phoneNumber');
           } else {
             console.log('签出失败-----seimin');
@@ -1540,19 +1567,25 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('示忙成功-----seimin');
+            if (location.href.includes('app/incident/editor') || location.href.includes('app/incident/chart')) {
+              $scope.isShixian = false;
+            }else{
+              $scope.isShixian = true;
+            }
+            $scope.getState(2);
+            $rootScope.preState = 2;
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '示忙成功'
             });
-            // $rootScope.jry_state = 'shimang';
           } else {
             console.log('示忙失败-----seimin');
-            $.toaster({
-              priority: 'info',
-              title: '操作',
-              message: '示忙失败'
-            });
+            // $.toaster({
+            //   priority: 'info',
+            //   title: '操作',
+            //   message: '示忙失败'
+            // });
           }
         }
         //示闲回调函数
@@ -1561,12 +1594,13 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('示闲成功-----seimin');
+            $scope.getState(1);
+            $rootScope.preState = 1;
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '示闲成功'
             });
-            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('示闲失败-----seimin');
             $.toaster({
@@ -1582,12 +1616,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼叫成功,请摘机-----seimin');
+            $scope.getState(6);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼叫成功,请摘机'
             });
-            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('呼叫失败-----seimin');
             $.toaster({
@@ -1605,20 +1639,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           var err = Number(jso.err);
           if (!err) {
             console.log('呼叫被接听成功-----seimin');
+            $scope.getState(5);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼叫被接听成功'
             });
-            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('呼叫被接听失败-----seimin');
+            $scope.qShimang(1);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼叫被接听失败'
             });
-            // $rootScope.jry_state = 'shixian';
           }
         }
         //挂断回调函数
@@ -1627,12 +1661,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           console.log(jso);//lmm
           if (jso) {
             console.log('挂断成功-----seimin');
+            $scope.qShimang($rootScope.preState);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '挂断成功'
             });
-            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('挂断失败-----seimin');
             $.toaster({
@@ -1650,12 +1684,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           $rootScope.sockid = jso.crs;//来电的话机id
           if (jso) {
             console.log('呼入坐席成功，请摘机-----seimin');
+            $scope.getState(3);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼入坐席成功，请摘机'
             });
-            // $rootScope.jry_state = 'laidian';
             console.log('来电了！电话号码是【' + $rootScope.callInPhoneNumber + '】');
           } else {
             console.log('呼入坐席失败-----seimin');
@@ -1672,13 +1706,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼入摘机应答成功-----seimin');
+            $scope.getState(5);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼入摘机应答成功'
             });
-            // $rootScope.jry_state = 'tonghuazhong';
-            //根据电话号码反查报修人
+            //根据电话号码反查报修人,如果是坐席号码，则不用
+            console.log(sessionStorage.getItem('phones'));
+            var phones = JSON.parse(sessionStorage.getItem('phones'));
+            var isHuajihao = phones.length?phones.some(v=>v == teleno):false;
+            if(isHuajihao){
+              return;
+            }
             var postData = { "idx": 0, "sum": 10, "requester": { hjzxPhone: $rootScope.callInPhoneNumber } };
             api_user_data.fetchDataList('requester', postData).then(function (result) {
               if (result.status == 200) {
@@ -1768,12 +1808,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼入未摘机应答成功-----seimin');
+            $scope.getState(1);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '呼入未摘机应答成功'
             });
-            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('呼入未摘机应答失败-----seimin');
             $.toaster({
@@ -1789,12 +1829,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('转接坐席开始成功-----seimin');
+            $scope.getState(7);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '转接坐席开始成功'
             });
-            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('转接坐席开始失败-----seimin');
             $.toaster({
@@ -1810,12 +1850,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('转接坐席结果成功-----seimin');
+            $scope.getState(1);
             $.toaster({
               priority: 'info',
               title: '操作',
               message: '转接坐席结果成功'
             });
-            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('转接坐席结果失败-----seimin');
             $.toaster({
@@ -1854,7 +1894,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         }
       })
     }
-    $rootScope.jry_state = "weiqianru";
+    $rootScope.jry_state = 'weiqianru';
     window.addEventListener('load', function () {
       if ($rootScope.isFuwutai) {
         $rootScope.getExtnDirect();//seiminHj----1

assets/views/partials/off-sidebar2.html

@@ -8,7 +8,7 @@
       <div class="users-list fontsizes-14">
         <div style="padding: 0 15px;" class="col-xs-12" ng-if="jry_state!='weiqianru'&&jry_state!='laidian'&&jry_state!='tonghuazhong'">
           <input type="button" ng-if="jry_state=='shixian'" style="margin-left: 8px;" value="示忙" ng-click="jry_shimang()" class="jry_btn">
-          <input type="button" ng-if="jry_state=='shimang'" style="margin-left: 8px;" value="示闲" ng-click="jry_shixian()" class="jry_btn">
+          <input type="button" ng-if="jry_state=='shimang'&&isShixian" style="margin-left: 8px;" value="示闲" ng-click="jry_shixian()" class="jry_btn">
           <input type="button" style="margin-left:8px;" value="签出" ng-click="jry_qianchu()" class="jry_btn">
         </div>
         <div ng-if="jry_state=='weiqianru'" class="row form-group fontcolor-two" style="margin-top:30px" id="updata">

assets/views/partials/top-navbar.html

@@ -91,12 +91,12 @@
                         class="fontcolor-six fontsizes-14">来电</span> </div>
                 <!-- 示忙  -->
                 <div ng-if="jry_state=='shimang'" class="margin-top-15">
-                    <img src="assets/images/setbusy.gif" ng-click="jry_shixian()" class="image-widthh-34"><span
+                    <img src="assets/images/setbusy.gif" class="image-widthh-34"><span
                         class="round setbusycolor fontsizes-14">●</span><span
                         class="fontcolor-six fontsizes-14">示忙</span> </div>
                 <!-- 示闲  -->
                 <div ng-if="jry_state=='shixian'" class="margin-top-15">
-                    <img src="assets/images/link.gif" ng-click="jry_shimang()" class="image-widthh-34"><span
+                    <img src="assets/images/link.gif" class="image-widthh-34"><span
                         class="round linkcolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示闲</span>
                 </div>
                 <!--通话中  -->