呼叫中心修复

assets/js/controllers/mainCtrl.js

@@ -44,9 +44,10 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     // $win.on('beforeunload', function() { return $state.go("login.signin"); });
     // $auth.deleteData('auth_headers')
     // }
+    // 监听路由
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
       console.log(event, toState, toParams, fromState, fromParams,'cao')
-      if((toState.name == 'app.incident.editor'||toState.name == 'app.incident.editor')&&
+      if((toState.name == 'app.incident.chart'||toState.name == 'app.incident.editor')&&
       fromState.name){
         $rootScope.phoneNumber = localStorage.getItem('phoneNumber');
         //进入页面强制示忙
@@ -54,8 +55,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           tlwsa.tlaForceacw($rootScope.phoneNumber);
         }
       }
-      if((fromState.name == 'app.incident.editor'||fromState.name == 'app.incident.editor')&&
-      toState.name != 'app.incident.editor'&&toState.name != 'app.incident.editor'
+      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');
         //进入页面强制示闲
@@ -1292,6 +1293,55 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         $rootScope.jry_extnNumberObj.tel2 = angular.copy(res[0]);//转接坐席对象
         //连接
         tlwsa.tlaOpen(websocket_url);
+        // 获取状态
+        $scope.getState = function(){
+          if(location.href.includes('app/incident/editor')||location.href.includes('app/incident/chart')){
+            //进入页面,强制示忙
+            tlwsa.tlaForceacw($rootScope.phoneNumber);
+          }
+          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';
+                  break;
+                case 1:
+                  $rootScope.jry_state = 'shixian';
+                  break;
+                case 2:
+                  $rootScope.jry_state = 'shimang';
+                  break;
+                case 3:
+                  $rootScope.jry_state = 'laidian';
+                  break;
+                case 5:
+                  $rootScope.jry_state = 'tonghuazhong';
+                  break;
+                case 6:
+                  $rootScope.jry_state = 'zhengzaiwaihu';
+                  break;
+                case 7:
+                  $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';
+          }
+        }
+        // 状态回调函数
+        TLWSA.onStatechange=onstatechange;
+        function onstatechange(){
+          console.log('事件:状态变化----------------------------------------------------');
+          $scope.getState();
+        }
         //连接呼叫中心回调函数
         TLWSA.onOpenreturn = onopenreturn;
         function onopenreturn(err) {
@@ -1311,7 +1361,13 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             }
           } else {
             console.log('呼叫中心连接失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼叫中心连接失败'
+            });
           }
+          
         }
         //绑定分机回调函数
         TLWSA.onSetphonenumberreturn = onsetphonenumberreturn;
@@ -1319,7 +1375,12 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('绑定分机成功-----seimin');
-            $rootScope.jry_state = 'shixian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '绑定分机成功'
+            });
+            // $rootScope.jry_state = 'shixian';
             localStorage.setItem('phoneNumber', $rootScope.phoneNumber);
             if(location.href.includes('app/incident/editor')||location.href.includes('app/incident/chart')){
               //进入页面,强制示忙
@@ -1327,6 +1388,11 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             }
           } else {
             console.log('绑定分机失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '绑定分机失败'
+            });
           }
         }
         //强制示忙回调函数
@@ -1334,10 +1400,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         function onacw(err) {
           err = Number(err);
           if (!err) {
-            $rootScope.jry_state = 'shimang';
+            // $rootScope.jry_state = 'shimang';
             console.log('强制示忙成功-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示忙成功'
+            });
           }else{
             console.log('强制示忙失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示忙失败'
+            });
           }
         }
         //强制示闲回调函数
@@ -1346,10 +1422,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           console.log(err)
           err = Number(err);
           if (!err) {
-            $rootScope.jry_state = 'shixian';
+            // $rootScope.jry_state = 'shixian';
             console.log('强制示闲成功-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示闲成功'
+            });
           }else{
             console.log('强制示闲失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示闲失败'
+            });
           }
         }
         //与服务器网络连接中断回调函数
@@ -1375,13 +1461,24 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('签入成功-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '签入成功'
+            });
             setTimeout(function () {
               console.log('开始绑定分机【' + $rootScope.phoneNumber + '】-----seimin');
               tlwsa.tlaSetphonenumber($rootScope.phoneNumber);
             }, 0)
           } else {
             console.log('签入失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '签入失败'
+            });
           }
+          tlwsa.tlaSubscribestateinfo(2);
         }
         // 签出回调函数
         TLWSA.onLogoffreturn = onlogoffreturn;
@@ -1389,10 +1486,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('签出成功-----seimin');
-            $rootScope.jry_state = 'weiqianru';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '签出成功'
+            });
+            // $rootScope.jry_state = 'weiqianru';
             localStorage.removeItem('phoneNumber');
           } else {
             console.log('签出失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '签出失败'
+            });
           }
         }
         //示忙回调函数
@@ -1401,9 +1508,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('示忙成功-----seimin');
-            $rootScope.jry_state = 'shimang';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示忙成功'
+            });
+            // $rootScope.jry_state = 'shimang';
           } else {
             console.log('示忙失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示忙失败'
+            });
           }
         }
         //示闲回调函数
@@ -1412,9 +1529,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('示闲成功-----seimin');
-            $rootScope.jry_state = 'shixian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示闲成功'
+            });
+            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('示闲失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '示闲失败'
+            });
           }
         }
         //呼叫坐席回调函数
@@ -1423,13 +1550,18 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼叫坐席成功,请摘机-----seimin');
-            $rootScope.jry_state = 'tonghuazhong';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼叫坐席成功,请摘机'
+            });
+            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('呼叫坐席失败-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '呼叫失败'
+              message: '呼叫坐席失败'
             });
           }
         }
@@ -1441,21 +1573,41 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           var err = Number(jso.err);
           if (!err) {
             console.log('呼叫坐席被接听成功-----seimin');
-            $rootScope.jry_state = 'tonghuazhong';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼叫坐席被接听成功'
+            });
+            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('呼叫坐席被接听失败-----seimin');
-            $rootScope.jry_state = 'shixian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼叫坐席被接听失败'
+            });
+            // $rootScope.jry_state = 'shixian';
           }
         }
-        //被挂断回调函数
+        //挂断回调函数
         TLWSA.onCallend = oncallend;
         function oncallend(jso) {
           console.log(jso);//lmm
           if (jso) {
-            console.log('被挂断成功-----seimin');
-            $rootScope.jry_state = 'shixian';
+            console.log('挂断成功-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '挂断成功'
+            });
+            // $rootScope.jry_state = 'shixian';
           } else {
-            console.log('被挂断失败-----seimin');
+            console.log('挂断失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '挂断失败'
+            });
           }
         }
         //呼入回调函数
@@ -1465,10 +1617,20 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           $rootScope.callInPhoneNumber = jso.caller;//来电的电话
           if (jso) {
             console.log('呼入坐席成功，请摘机-----seimin');
-            $rootScope.jry_state = 'laidian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入坐席成功，请摘机'
+            });
+            // $rootScope.jry_state = 'laidian';
             console.log('来电了！电话号码是【' + $rootScope.callInPhoneNumber + '】');
           } else {
             console.log('呼入坐席失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入坐席失败'
+            });
           }
         }
         //呼入摘机应答回调函数
@@ -1477,9 +1639,14 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼入摘机应答成功-----seimin');
-            $rootScope.jry_state = 'tonghuazhong';
-            //根据电话号码反查报修人hjzxPhone
-            var postData = { "idx": 0, "sum": 10, "requester": { mphone: $rootScope.callInPhoneNumber } };
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入摘机应答成功'
+            });
+            // $rootScope.jry_state = 'tonghuazhong';
+            //根据电话号码反查报修人
+            var postData = { "idx": 0, "sum": 10, "requester": { hjzxPhone: $rootScope.callInPhoneNumber } };
             api_user_data.fetchDataList('requester', postData).then(function (result) {
               if (result.status == 200) {
                 console.log(result.list);
@@ -1552,6 +1719,11 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             })
           } else {
             console.log('呼入摘机应答失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入摘机应答失败'
+            });
           }
         }
         //呼入未摘机应答回调函数
@@ -1560,9 +1732,19 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('呼入未摘机应答成功-----seimin');
-            $rootScope.jry_state = 'shixian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入未摘机应答成功'
+            });
+            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('呼入未摘机应答失败-----seimin');
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '呼入未摘机应答失败'
+            });
           }
         }
         //转接坐席开始回调函数
@@ -1571,13 +1753,18 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('转接坐席开始成功-----seimin');
-            $rootScope.jry_state = 'tonghuazhong';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '转接坐席开始成功'
+            });
+            // $rootScope.jry_state = 'tonghuazhong';
           } else {
             console.log('转接坐席开始失败-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '转接失败'
+              message: '转接坐席开始失败'
             });
           }
         }
@@ -1587,13 +1774,18 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
           err = Number(err);
           if (!err) {
             console.log('转接坐席结果成功-----seimin');
-            $rootScope.jry_state = 'shixian';
+            $.toaster({
+              priority: 'info',
+              title: '操作',
+              message: '转接坐席结果成功'
+            });
+            // $rootScope.jry_state = 'shixian';
           } else {
             console.log('转接坐席结果失败-----seimin');
             $.toaster({
               priority: 'info',
               title: '操作',
-              message: '转接失败'
+              message: '转接坐席结果失败'
             });
           }
         }

assets/js/directives/ola_api2.js

@@ -95,7 +95,7 @@ TLWSA.onHardwarefail=onhardwarefail;
 TLWSA.onConferencememberstate=onconferencememberstate;
 TLWSA.onSlaveserverfail=onslaveserverfail; //备用服务器故障 例如硬件故障或者中继失步
 TLWSA.onSwitchtoslaveserver=onswitchtoslaveserver;
-TLWSA.onStatechange=onstatechange;
+// TLWSA.onStatechange=onstatechange;
 TLWSA.onMyStatechange=onmystatechange;
 //应答回调
 // function onopenreturn(err)
@@ -332,11 +332,11 @@ function onqueue(crs,caller,callee,data)
 {
     console.log('事件:外线进入队列，crs,caller,callee,data= '+crs+' '+caller+' '+callee+' '+data)
 }
-function onstatechange()
-{
-	console.log('事件:状态变化----------------------------------------------------');
-	queryAgentState();
-}
+// function onstatechange()
+// {
+// 	console.log('事件:状态变化----------------------------------------------------');
+// 	queryAgentState();
+// }
 function onmystatechange(jso)
 {
 	console.log('事件:状态变化----------------------------------------------------');

assets/views/dashboard/newdash.html

@@ -275,13 +275,13 @@
                     </div> -->
                 <!-- </div> -->
                 <div class="know-text-group clearfix">
-                    <div class="know-text-group_block fr" style="font-size: 16px;">
+                    <div class="know-text-group_block fl" style="font-size: 16px;">
                         <div class="know-text-group_item fl">实时工单情况<strong></strong></div>
                         <div class="know-text-group_item fl">今日建单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',date:'today'})">{{managerIndexInfo.createOrders}}</strong></div>
                         <div class="know-text-group_item fl">所有待接单数：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',state:'1543'})">{{managerIndexInfo.waitOrders}}</strong></div>
                         <div class="know-text-group_item fl">所有处理中：<strong class="know-text-group_strong" ng-click="goTo('app.incident.list',{tab:'all',state:'1544'})">{{managerIndexInfo.doingOrders}}</strong></div>
                     </div>
-                    <div class="know-text-group_block fl">
+                    <div class="know-text-group_block fr">
                         <div class="know-text-group_item fl">今日应到运维人员：<strong>{{managerIndexInfo.usersCount}}</strong></div>
                         <div class="know-text-group_item fl">实到：<strong>{{managerIndexInfo.onlineCount}}</strong></div>
                         <div class="know-text-group_item fl">迟到：<strong>{{managerIndexInfo.errorOnlineCount}}</strong></div>

assets/views/incident/tpl/tel.html

@@ -9,6 +9,140 @@
     .hj .body .rigt .div{
         height: 100px!important;
     }
+
+    .hj {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        display: flex;
+        flex-direction: column;
+        width: 340px;
+        z-index: 11;
+        background-color: white;
+        border-radius: 4px;
+        transition-duration: 0.8s
+    }
+
+    /* 头部 */
+    .hj .head {
+        text-align: center;
+        height: 40px;
+        line-height: 40px;
+        border-bottom: 1px #d1d1d1 solid
+    }
+
+    /* 交叉 */
+    .hj .head .jiaocha {
+        float: right;
+        width: 14px;
+        height: 14px;
+        line-height: 12px;
+        text-align: center;
+        border: 1px #6e6e6e solid;
+        border-radius: 50%;
+        margin-right: 20px;
+        margin-top: 15px;
+        cursor: pointer;
+    }
+
+    /* 主体 */
+    .hj .body {
+        overflow: auto;
+        width: 298px;
+        max-height: 400px;
+        background-color: #f5f5f5;
+        border: 1px #d1d1d1 solid;
+        margin: 0 auto;
+        border-radius: 2px;
+        margin-top: 10px;
+        flex:1;
+    }
+    .hj .body::-webkit-scrollbar {         /*滚动条整体样式*/
+        width:3px;
+        height:3px;
+    }
+    .hj .body::-webkit-scrollbar-thumb {   /*滚动条里面小方块样式*/
+        border-radius:100px;
+        box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+        background:rgba(0,0,0,0.1);;
+    } 
+    .hj .body::-webkit-scrollbar-track {   /*滚动条里面轨道样式*/
+        box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius:0;
+        background:rgba(0,0,0,0.1);
+    }
+
+    .hj .body .xing {
+        color: red;
+        float: left;
+        width: 20px;
+        text-align: center;
+        margin-top: 12px
+    }
+
+    .hj .body .xing div {
+        height: 70px;
+        font-size: 16px
+    }
+
+    .hj .body .rigt {
+        float: left;
+        margin-top: 12px
+    }
+
+    .hj .body .rigt .div {
+        height: 70px;
+    }
+
+    .hj .body .rigt span {
+        font-size: 13px;
+        font-weight: bold
+    }
+
+    .hj .body .rigt .xiala {
+        margin-top: 4px;
+        width: 258px !important;
+        height: auto;
+        background-color: #f5f5f5
+    }
+
+    .hj .body .rigt .xialaipt {
+        margin-top: 4px;
+        width: 258px !important;
+        height: 32px;
+    }
+    .hj .body .rigt .price {
+        margin-top: 4px;
+        width: 100px !important;
+        height: 32px;
+    }
+
+    .hj .submi {
+        text-align: center;
+    }
+
+    .hj .submi input {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        width: 78px;
+        height: 32px;
+        border: none；
+    }
+
+    /* 保存 */
+    .hj .submi .preservation {
+        background-color: #123f8f !important;
+        color: white;
+        border: 1px #123f8f solid
+    }
+
+    /* 取消 */
+    .hj .submi .cancel {
+        background-color: #f2f2f2;
+        color: #373737;
+        border: 1px #d1d1d1 solid
+    }
 </style>
 <div class="new new_after hj">
     <div class="head">

assets/views/incident/tpl/toAssign.tpl.html

@@ -5,12 +5,12 @@
     </div>
 </div>
 <div class="modal-body center">
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 380px;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">工作组</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:310px" ng-model="assignGroup" theme="bootstrap" ng-change="onChangeRotateGroup($select.selected)">
+                <ui-select class="pull-left" style="width:230px" ng-model="assignGroup" theme="bootstrap" ng-change="onChangeRotateGroup($select.selected)">
                     <ui-select-match placeholder="">
                         {{$select.selected.groupName}}
                     </ui-select-match>
@@ -21,17 +21,17 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 380px;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">指派对象</label>:</div>
             <div class="pull-right">
-                <ui-select class="pull-left" style="width:310px" ng-model="assignUser" theme="bootstrap" ng-change="onChangeRotateUser($select.selected)">
+                <ui-select class="pull-left" style="width:230px" ng-model="assignUser" theme="bootstrap" ng-change="onChangeRotateUser($select.selected)">
                     <ui-select-match placeholder="">
-                        {{$select.selected.userTaskCount}}
+                        {{$select.selected.name + '【'+$select.selected.taskCount+'】'}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in user | filter:{$:$select.search}">
-                        <div ng-bind-html="item.userTaskCount | highlight: $select.search"></div>
+                        <div ng-bind-html="(item.name + '【'+item.taskCount+'】') | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
             </div>
@@ -39,11 +39,6 @@
     </div>
 </div>
 <div class="modal-footer modelfooter-hint pointfont">
-    <div class="hintfooterleft pull-left" ng-click="ok()" translate="modal.button.OK ">OK</div>
-    <div class="hintfooterright pull-right" ng-click="cancel() " translate="modal.button.CANCEL ">Cancel</div>
-</div>
-<style>
-    .modal-dialog{
-        width: 450px!important;
-    }
-</style>
+    <div class="hintfooterleft pull-left" ng-click="ok()">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()">取消</div>
+</div>

assets/views/partials/off-sidebar2.html

@@ -2,13 +2,14 @@
 <tabset class="sidebar-wrapper" justified="true">
   <tab>
     <tab-heading>
-      <i class="fa fa-phone"></i>
+      当前绑定分机：<i class="fa fa-phone"></i>{{phoneNumber}}
     </tab-heading>
     <div class="tab-pane" id="getup">
       <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" 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">
           <div class="col-xs-12 fontsizes-14">
@@ -53,7 +54,7 @@
             <div class="col-xs-12">
               <input type="button" style="margin-left:8px;" value="呼叫" ng-click="tlaCallagc()"
                 ng-if="jry_state!='laidian'" class="jry_btn">
-              <input type="button" style="margin-left:8px;" value="签出" ng-click="jry_qianchu()" class="jry_btn">
+              
             </div>
           </div>
         </div>
@@ -77,7 +78,6 @@
             </div>
             <div class="col-xs-12">
               <input type="button" style="margin-left:8px;" value="转接" ng-click="tlaTransfertoagc()" class="jry_btn">
-              <input type="button" style="margin-left:8px;" value="签出" ng-click="jry_qianchu()" class="jry_btn">
             </div>
           </div>
         </div>

assets/views/partials/top-navbar.html

@@ -55,7 +55,7 @@
         <!-- <li class="dropdown current-user" dropdown style="width:100px">
             <div class="newOrderBtn" ng-click="newOrder()">快速建单</div>
         </li> -->
-        <li class="dropdown current-user" dropdown style="width:100px" ng-if="isFuwutai">
+        <li class="dropdown current-user" dropdown style="width:120px" ng-if="isFuwutai">
             <div>
                 <!-- 东经呼叫中心 -->
                 <!-- 来电  -->
@@ -104,6 +104,16 @@
                     <img src="assets/images/connection.png" class="image-widthh-34"><span
                         class="round connectioncolor fontsizes-14">●</span><span
                         class="fontcolor-six fontsizes-14">通话中</span> </div>
+                <!--正在外呼  -->
+                <div ng-if="jry_state=='zhengzaiwaihu'" class="margin-top-15">
+                    <img src="assets/images/connection.png" class="image-widthh-34"><span
+                        class="round connectioncolor fontsizes-14">●</span><span
+                        class="fontcolor-six fontsizes-14">正在外呼</span> </div>
+                <!--正在转移  -->
+                <div ng-if="jry_state=='zhengzaizhuanyi'" class="margin-top-15">
+                    <img src="assets/images/connection.png" class="image-widthh-34"><span
+                        class="round connectioncolor fontsizes-14">●</span><span
+                        class="fontcolor-six fontsizes-14">正在转移</span> </div>
             </div>
         </li>
         <li class="dropdown current-user" dropdown on-toggle="toggled(open)">