还原呼叫中心

assets/js/controllers/customform/customformCtrl.js

@@ -15854,7 +15854,7 @@ appFormly.config(function config(formlyConfigProvider) {
         $scope.dialout = function (teleno) {
           // var gid = "@0";
           // var telephone = "9" + teleno;
-          // $rootScope.callout = 2;
+          $rootScope.callout = 2;
           // var agcount = tlwsa.tlaGetagentcount();
           // var agcountFlag = false;
           // console.log(teleno)
@@ -15879,27 +15879,14 @@ appFormly.config(function config(formlyConfigProvider) {
             $rootScope.toggle('off-sidebar');
             // tlwsa.tlaCallout(teleno, caller, 0);
           }else if(localStorage.getItem('hk_phone')){
-            var gid = "@0";
-            var telephone = '9' + teleno;
+            var gid = "@0"
+            var telephone = '9' + teleno
+            $rootScope.callout = 2;
             if ($rootScope.takes) {
-                $rootScope.isMask = true;
                 api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
-                  $rootScope.isMask = false;
-                  if (data.errno == 0) {
-                    $rootScope.preStatus = $rootScope.callStatus;
-                    $rootScope.callStatus = 4;
-                    $rootScope.callout = 2;
-                  }else{
-                    new Notification("呼叫失败1！", {
-                      icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                    });
-                  }
-                }, function(err){
-                  $rootScope.isMask = false;
-                  console.error('err', err);
-                  new Notification("呼叫失败2！", {
-                    icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                  });
+                    if (data.errno == 0) {
+                        $rootScope.status = 6;
+                    }
                 })
             } else {
                 SweetAlert.swal({

assets/js/controllers/desk/calllogCtrl.js

@@ -370,27 +370,14 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
             // tlwsa.tlaCallout(data.callerIdNumber, caller, 0);
             $rootScope.toggle('off-sidebar');
           }else if(localStorage.getItem('hk_phone')){
-            var gid = "@0";
-            var telephone = '9' + data.destinationNumber;
+            var gid = "@0"
+            var telephone = '9' + data.destinationNumber
+            $rootScope.callout = 2;
             if ($rootScope.takes) {
-                $rootScope.isMask = true;
                 api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
-                  $rootScope.isMask = false;
-                  if (data.errno == 0) {
-                    $rootScope.preStatus = $rootScope.callStatus;
-                    $rootScope.callStatus = 4;
-                    $rootScope.callout = 2;
-                  }else{
-                    new Notification("呼叫失败1！", {
-                      icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                    });
-                  }
-                }, function(err){
-                  $rootScope.isMask = false;
-                  console.error('err', err);
-                  new Notification("呼叫失败2！", {
-                    icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                  });
+                    if (data.errno == 0) {
+                        $rootScope.status = 6;
+                    }
                 })
             } else {
                 SweetAlert.swal({

assets/js/controllers/desk/jry_wxDetailCtrl.js

@@ -36,7 +36,7 @@ app.controller('wxDetailCtrl', ["$scope", "i18nService", "$rootScope", "$state",
     $scope.dialout = function (teleno) {
         // var gid = "@0";
         // var telephone = "9" + teleno;
-        // $rootScope.callout = 2;
+        $rootScope.callout = 2;
         // var agcount = tlwsa.tlaGetagentcount();
         // var agcountFlag = false;
         // console.log(teleno)
@@ -61,36 +61,23 @@ app.controller('wxDetailCtrl', ["$scope", "i18nService", "$rootScope", "$state",
           $rootScope.toggle('off-sidebar');
           // tlwsa.tlaCallout(teleno, caller, 0);
         }else if(localStorage.getItem('hk_phone')){
-            var gid = "@0";
-            var telephone = '9' + teleno;
-            if ($rootScope.takes) {
-                $rootScope.isMask = true;
-                api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
-                  $rootScope.isMask = false;
+          var gid = "@0"
+          var telephone = '9' + teleno
+          $rootScope.callout = 2;
+          if ($rootScope.takes) {
+              api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
                   if (data.errno == 0) {
-                    $rootScope.preStatus = $rootScope.callStatus;
-                    $rootScope.callStatus = 4;
-                    $rootScope.callout = 2;
-                  }else{
-                    new Notification("呼叫失败1！", {
-                      icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                    });
+                      $rootScope.status = 6;
                   }
-                }, function(err){
-                  $rootScope.isMask = false;
-                  console.error('err', err);
-                  new Notification("呼叫失败2！", {
-                    icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                  });
-                })
-            } else {
-                SweetAlert.swal({
-                    title: "呼叫失败",
-                    text: "请先签入呼叫中心!",
-                    type: "error",
-                    confirmButtonColor: "#DD6B55"
-                });
-            }
+              })
+          } else {
+              SweetAlert.swal({
+                  title: "呼叫失败",
+                  text: "请先签入呼叫中心!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+          }
         } else {
           SweetAlert.swal({
             title: "呼叫失败",

assets/js/controllers/desk/recordCtrl.js

@@ -707,7 +707,7 @@ app.controller("recordCtrl", [
     /*--------- call --------- */
     $scope.recordcallid = function (data) {
       // var telephone = '9' + data.ano;
-      // $rootScope.callout = 2;
+      $rootScope.callout = 2;
       // if ($rootScope.takes) {
       //     api_text.dialout($rootScope.takes, "@0", telephone).then(function(data) {
       //         if (data.errno == 0) {
@@ -740,25 +740,12 @@ app.controller("recordCtrl", [
       }else if(localStorage.getItem('hk_phone')){
         var gid = "@0"
         var telephone = '9' + data.ano
+        $rootScope.callout = 2;
         if ($rootScope.takes) {
-            $rootScope.isMask = true;
             api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
-              $rootScope.isMask = false;
-              if (data.errno == 0) {
-                $rootScope.preStatus = $rootScope.callStatus;
-                $rootScope.callStatus = 4;
-                $rootScope.callout = 2;
-              }else{
-                new Notification("呼叫失败1！", {
-                  icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                });
-              }
-            }, function(err){
-              $rootScope.isMask = false;
-              console.error('err', err);
-              new Notification("呼叫失败2！", {
-                icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-              });
+                if (data.errno == 0) {
+                    $rootScope.status = 6;
+                }
             })
         } else {
             SweetAlert.swal({

assets/js/controllers/incident/incidentCtrl.js

@@ -2553,42 +2553,34 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 // 测试 end
 
                 $scope.dialout = function (teleno) {
+                    $rootScope.callout = 2;
                     if (localStorage.getItem('fenjiNumber')) {
                       $rootScope.toggle('off-sidebar');
                     }else if(localStorage.getItem('hk_phone')){
-                        var gid = "@0";
-                        var telephone = '9' + teleno;
-                        if ($rootScope.takes) {
-                            $rootScope.isMask = true;
-                            api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
-                              $rootScope.isMask = false;
-                              if (data.errno == 0) {
-                                $rootScope.preStatus = $rootScope.callStatus;
-                                $rootScope.callStatus = 4;
-                                $rootScope.callout = 2;
+                      var gid = "@0"
+                      var telephone = '9' + teleno
+                      $rootScope.callout = 2;
+                      if ($rootScope.takes) {
+                        $rootScope.isMask = true;
+                        api_text.dialout($rootScope.takes, gid, telephone).then(function (data) {
+                            console.log(data);
+                            $rootScope.isMask = false;
+                            if (data.errno == 0) {
+                                $rootScope.status = 6;
                                 $scope.telephone = telephone;
-                              }else{
+                                
+                            }else{
                                 $scope.callId = undefined;
-                                new Notification("呼叫失败1！", {
-                                  icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                                });
-                              }
-                            }, function(err){
-                              $rootScope.isMask = false;
-                              $scope.callId = undefined;
-                              console.error('err', err);
-                              new Notification("呼叫失败2！", {
-                                icon: './bower_components/HTML5-Desktop-Notifications/alert.ico',
-                              });
-                            })
-                        } else {
-                            SweetAlert.swal({
-                                title: "呼叫失败",
-                                text: "请先签入呼叫中心!",
-                                type: "error",
-                                confirmButtonColor: "#DD6B55"
-                            });
-                        }
+                            }
+                        })
+                      } else {
+                          SweetAlert.swal({
+                              title: "呼叫失败",
+                              text: "请先签入呼叫中心!",
+                              type: "error",
+                              confirmButtonColor: "#DD6B55"
+                          });
+                      }
                     } else {
                       SweetAlert.swal({
                         title: "呼叫失败",

assets/js/main.js

@@ -380,27 +380,7 @@ app.factory('textRestangular', function (Restangular) {
 app.factory('api_text', ['textRestangular', function (textRestangular) {
     var loginService = textRestangular.all("comm");
     var loginsins = textRestangular.all("tele/agent");
-    var loginCall = textRestangular.all("tele/monitor");
-    var loginCallSys = textRestangular.all("tele/monitor");
     return {
-        getagentinfolist: function (token) {
-            var rdata = "dom=0&token=" + token;
-            return loginCallSys.customPOST(rdata, 'getagentinfolist', {}, {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-            });
-        },
-        getevent: function (token, evttype) {
-            var rdata = "dom=0&token=" + token + "&evttype=" + evttype;
-            return loginCall.customPOST(rdata, 'getevent', {}, {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-            });
-        },
-        leaveacd: function (token, phone, group) {
-            var rdata = "dom=0&token=" + token + "&destaid=" + phone + "&acd=" + group;
-            return loginCall.customPOST(rdata, 'leaveacd', {}, {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-            });
-        },
         start: function (phone, id) {
             var rdata = "dom=0&epwd=&aid=" + id + "&apwd=e10adc3949ba59abbe56e057f20f883e&adn=" + phone;
             return loginService.customPOST(rdata, 'start', {}, {

assets/views/partials/off-sidebar3-2023年4月20日.html

@@ -1,104 +0,0 @@
-<!-- start: OFF RIGHT SIDEBAR TABSET -->
-<tabset class="sidebar-wrapper" justified="true">
-    <!-- start: TAB FAVORITES  -->
-    <tab>
-        <tab-heading>
-            <!-- <i class="ti-heart"></i> -->
-            <i class="fa fa-phone"></i>
-        </tab-heading>
-        <div class="tab-pane" id="getup">
-            <div class="users-list fontsizes-14">
-                <!-- <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" ng-if="statecall==1&&login">setbusy</botton>
-                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" ng-if="statecall==2">setidle</botton> -->
-                <!-- <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" ng-if="login">getout</botton> -->
-                <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" class="btn btn-setbusy setbusy" ng-if="statecall==1&&login&&statuscall!=3&&statuscall!=2">setbusy</botton>
-                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" class="btn btn-setidle setidle" ng-if="login&&statecall==2&&statuscall!=3&&statuscall!=2">setidle</botton>
-                <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" class="btn btn-getout getout" ng-if="login">getout</botton>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" id="updata" ng-if="!login">
-                    <div class="col-xs-12 fontsizes-14">
-                        <div class="col-xs-12">
-                            <div class="control-label" for="title">
-                                绑定分机:
-                            </div>
-                            <!-- <label class="control-label text-right pull-left" for="range">分机号:</label> -->
-                            <!-- <ui-select ng-model="hjzx.phone" theme="bootstrap">
-                                <ui-select-match placeholder="选择分机号">
-                                    {{$select.selected.name}}
-                                </ui-select-match>
-                                <ui-select-choices repeat="item in runNumber | filter: $select.search">
-                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
-                                </ui-select-choices>
-                            </ui-select> -->
-                            <select class="form-control" ng-model="phone" ng-change="phoneChange(phone)">  
-                                        <option ng-repeat="x in runNumber" value="{{x.name}}">{{x.name}}</option>  
-                                    </select>
-
-                            <!-- <select class="cs-select cs-skin-slide" ng-model="hjzx.phone">
-                                        <option value=""></option>
-                                        <option ng-repeat="row in runNumber" value="{{row.id}}" >{{row.name}}</option>
-                                    </select> -->
-                            <!-- <div class="">
-                                <input id="title" name="title" ng-model="phone" class="form-control" placeholder="分机号" />
-                            </div> -->
-                        </div>
-                        <!-- <div class="col-xs-12">
-                            <div class="control-label" for="title" style="padding-right:0px">
-                                ACD技能组:
-                            </div>
-                            <div class="">
-                                <select-input class="openaddinput" onChangeadd="onChangeadd()" model={{telephone}} requesdata="telephone" showkeys="phone"></select-input>
-                            </div>
-                        </div> -->
-                        <div class="col-xs-12">
-                            <button class="btn btn-addbutton  addbutton pull-right" style="margin-top:20px" ng-click="start(phone)" translate="offsidebar.login.GETIN"></button>
-                        </div>
-                    </div>
-                </div>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" id="dialout" ng-if="login&&statuscall!=3">
-                    <div class="col-xs-12 fontsizes-14">
-                        <!-- <div class="col-xs-12">
-                            <div class="control-label" for="title">
-                                中继选择:
-                            </div>
-                            <div class="">
-                                <input id="gid" name="gid" ng-model="gid" class="form-control" placeholder="中继选择" />
-                            </div>
-                        </div> -->
-                        <div class="col-xs-12">
-                            <div>
-                                <div class="control-label" for="title">
-                                    目的号码:
-                                </div>
-                                <div class="">
-                                    <input id="teleno" name="teleno" ng-model="teleno" class="form-control" placeholder="目的号码" />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12">
-                            <button class="btn btn-primary col-md-offset-6" style="margin-top:20px" ng-click="dialout(gid,teleno)" translate="offsidebar.login.DIALOUT"></button>
-                        </div>
-                    </div>
-                </div>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" ng-if="login&&statuscall==3">
-                    <div class="col-xs-12 fontsizes-14">
-                        <div class="col-xs-12">
-                            <div class="control-label" for="title" style="padding-right:0px">
-                                转接号码:
-                            </div>
-                            <div class="">
-                                <select-input class="openaddinput" onChangeadd="onChangeadd()" model={{telephone}} requesdata="telephone" showkeys="phone"></select-input>
-                            </div>
-                        </div>
-                        <div class="col-xs-12">
-                            <button class="btn btn-primary" style="margin-top:20px" ng-click="inittrans(telephone)" translate="offsidebar.login.INITTRANS"></button>
-                            <!-- <button class="btn btn-primary" ng-click="comptrans()" style="margin-top:20px" translate="offsidebar.login.COMPTRANS"></button> -->
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!-- </div> -->
-    </tab>
-    <!-- end: TAB FAVORITES -->
-</tabset>
-<!-- end: OFF RIGHT SIDEBAR TABSET -->

assets/views/partials/off-sidebar3.html

@@ -3,30 +3,67 @@
     <!-- start: TAB FAVORITES  -->
     <tab>
         <tab-heading>
+            <!-- <i class="ti-heart"></i> -->
             <i class="fa fa-phone"></i>
         </tab-heading>
         <div class="tab-pane" id="getup">
             <div class="users-list fontsizes-14">
-                <botton href="#" ng-click="setbusy()" translate="offsidebar.login.SETBUSY" class="btn btn-setbusy setbusy" ng-if="callStatus == 1">setbusy</botton>
-                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" class="btn btn-setidle setidle" ng-if="callStatus == 2">setidle</botton>
-                <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" class="btn btn-getout getout" ng-if="callStatus != -1">getout</botton>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" id="updata" ng-if="callStatus == -1">
+                <!-- <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" ng-if="statecall==1&&login">setbusy</botton>
+                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" ng-if="statecall==2">setidle</botton> -->
+                <!-- <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" ng-if="login">getout</botton> -->
+                <botton href="#" ng-click="setbusy(1)" translate="offsidebar.login.SETBUSY" class="btn btn-setbusy setbusy" ng-if="statecall==1&&login&&statuscall!=3&&statuscall!=2">setbusy</botton>
+                <botton href="#" ng-click="setidle()" translate="offsidebar.login.SETIDLE" class="btn btn-setidle setidle" ng-if="login&&statecall==2&&statuscall!=3&&statuscall!=2">setidle</botton>
+                <botton href="#" style="float:right" ng-click="end()" translate="offsidebar.login.GETOUT" class="btn btn-getout getout" ng-if="login">getout</botton>
+                <div class="row form-group fontcolor-two" style="margin-top:30px" id="updata" ng-if="!login">
                     <div class="col-xs-12 fontsizes-14">
                         <div class="col-xs-12">
                             <div class="control-label" for="title">
                                 绑定分机:
                             </div>
-                            <select class="form-control" ng-model="phone">  
+                            <!-- <label class="control-label text-right pull-left" for="range">分机号:</label> -->
+                            <!-- <ui-select ng-model="hjzx.phone" theme="bootstrap">
+                                <ui-select-match placeholder="选择分机号">
+                                    {{$select.selected.name}}
+                                </ui-select-match>
+                                <ui-select-choices repeat="item in runNumber | filter: $select.search">
+                                    <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                </ui-select-choices>
+                            </ui-select> -->
+                            <select class="form-control" ng-model="phone" ng-change="phoneChange(phone)">  
                                         <option ng-repeat="x in runNumber" value="{{x.name}}">{{x.name}}</option>  
                                     </select>
+
+                            <!-- <select class="cs-select cs-skin-slide" ng-model="hjzx.phone">
+                                        <option value=""></option>
+                                        <option ng-repeat="row in runNumber" value="{{row.id}}" >{{row.name}}</option>
+                                    </select> -->
+                            <!-- <div class="">
+                                <input id="title" name="title" ng-model="phone" class="form-control" placeholder="分机号" />
+                            </div> -->
                         </div>
+                        <!-- <div class="col-xs-12">
+                            <div class="control-label" for="title" style="padding-right:0px">
+                                ACD技能组:
+                            </div>
+                            <div class="">
+                                <select-input class="openaddinput" onChangeadd="onChangeadd()" model={{telephone}} requesdata="telephone" showkeys="phone"></select-input>
+                            </div>
+                        </div> -->
                         <div class="col-xs-12">
                             <button class="btn btn-addbutton  addbutton pull-right" style="margin-top:20px" ng-click="start(phone)" translate="offsidebar.login.GETIN"></button>
                         </div>
                     </div>
                 </div>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" id="dialout" ng-if="callStatus != 4 && callStatus != -1">
+                <div class="row form-group fontcolor-two" style="margin-top:30px" id="dialout" ng-if="login&&statuscall!=3">
                     <div class="col-xs-12 fontsizes-14">
+                        <!-- <div class="col-xs-12">
+                            <div class="control-label" for="title">
+                                中继选择:
+                            </div>
+                            <div class="">
+                                <input id="gid" name="gid" ng-model="gid" class="form-control" placeholder="中继选择" />
+                            </div>
+                        </div> -->
                         <div class="col-xs-12">
                             <div>
                                 <div class="control-label" for="title">
@@ -38,11 +75,11 @@
                             </div>
                         </div>
                         <div class="col-xs-12">
-                            <button class="btn btn-primary col-md-offset-6" style="margin-top:20px" ng-click="dialout(teleno)" translate="offsidebar.login.DIALOUT"></button>
+                            <button class="btn btn-primary col-md-offset-6" style="margin-top:20px" ng-click="dialout(gid,teleno)" translate="offsidebar.login.DIALOUT"></button>
                         </div>
                     </div>
                 </div>
-                <div class="row form-group fontcolor-two" style="margin-top:30px" ng-if="callStatus == 4 && callout == 1">
+                <div class="row form-group fontcolor-two" style="margin-top:30px" ng-if="login&&statuscall==3">
                     <div class="col-xs-12 fontsizes-14">
                         <div class="col-xs-12">
                             <div class="control-label" for="title" style="padding-right:0px">
@@ -54,6 +91,7 @@
                         </div>
                         <div class="col-xs-12">
                             <button class="btn btn-primary" style="margin-top:20px" ng-click="inittrans(telephone)" translate="offsidebar.login.INITTRANS"></button>
+                            <!-- <button class="btn btn-primary" ng-click="comptrans()" style="margin-top:20px" translate="offsidebar.login.COMPTRANS"></button> -->
                         </div>
                     </div>
                 </div>

assets/views/partials/top-navbar3-2023年4月20日.html

@@ -1,202 +0,0 @@
-<!-- start: TOP NAVBAR -->
-<!-- start: NAVBAR HEADER -->
-<div class="navbar-header">
-    <a href="#" class="sidebar-mobile-toggler pull-left hidden-md hidden-lg" ng-click="toggle('sidebar')" class="btn btn-navbar sidebar-toggle">
-        <i class="ti-align-justify"></i>
-    </a>
-    <a href="#" class="sidebar-toggler pull-right visible-md visible-lg" ng-click="app.layout.isSidebarClosed = !app.layout.isSidebarClosed;togle()">
-        <i class="ti-align-justify"></i>
-    </a>
-    <a class="pull-rigth menu-toggler visible-xs-block" id="menu-toggler" ng-click="navbarCollapsed = !navbarCollapsed">
-        <span class="sr-only">Toggle navigation</span>
-        <i class="ti-view-grid"></i>
-    </a>
-    <a class="navbar-brand pull-left margin-left-5" ui-sref="app.dashboard">
-        <img ng-src="assets/images/login/logo_hk2.png" style="width:160px;height:35px" alt="{{app.name}}" /><span class="padding-left-10 padding-right-5"></span> <span class="fontsizes-16 padding-right-5">{{app.author}}</span>
-    </a>
-</div>
-<!-- end: NAVBAR HEADER -->
-<!-- start: NAVBAR COLLAPSE -->
-<div class="navbar-collapse collapse" collapse="navbarCollapsed" ng-init="navbarCollapsed = true" off-click="navbarCollapsed = true" off-click-if='!navbarCollapsed' off-click-filter="#menu-toggler">
-    <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header" data-ct-fullheight-if="isSmallDevice">
-        <!-- start: MESSAGES DROPDOWN 
-		<li class="dropdown" dropdown on-toggle="toggled(open)">
-			<a href class="dropdown-toggle" dropdown-toggle>
-				<span class="dot-badge partition-red"></span> <i class="ti-comment"></i> <span translate="topbar.messages.MAIN">MESSAGES</span>
-			</a>
-			<ul class="dropdown-menu dropdown-light dropdown-messages dropdown-large">
-				<li>
-					<span class="dropdown-header" translate="topbar.messages.HEADER"> Unread messages</span>
-				</li>
-				<li>
-					<div class="drop-down-wrapper ps-container">
-						<ul>
-							<li class="unread">
-								<a href="javascript:;" class="unread">
-									<div class="clearfix">
-										<div class="thread-image">
-											<img src="./assets/images/avatar-2.jpg" alt="">
-										</div>
-										<div class="thread-content">
-											<span class="author">Nicole Bell</span>
-											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
-											<span class="time"> Just Now</span>
-										</div>
-									</div>
-								</a>
-							</li>
-							<li>
-								<a href="javascript:;" class="unread">
-									<div class="clearfix">
-										<div class="thread-image">
-											<img src="./assets/images/avatar-3.jpg" alt="">
-										</div>
-										<div class="thread-content">
-											<span class="author">Steven Thompson</span>
-											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
-											<span class="time">8 hrs</span>
-										</div>
-									</div>
-								</a>
-							</li>
-							<li>
-								<a href="javascript:;">
-									<div class="clearfix">
-										<div class="thread-image">
-											<img src="./assets/images/avatar-5.jpg" alt="">
-										</div>
-										<div class="thread-content">
-											<span class="author">Kenneth Ross</span>
-											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
-											<span class="time">14 hrs</span>
-										</div>
-									</div>
-								</a>
-							</li>
-						</ul>
-					</div>
-				</li>
-				<li class="view-all">
-					<a href="#" translate="topbar.messages.SEEALL">
-						See All
-					</a>
-				</li>
-			</ul>
-		</li>
-		end: MESSAGES DROPDOWN -->
-        <!-- start: ACTIVITIES DROPDOWN
-		<li class="dropdown" dropdown on-toggle="toggled(open)">
-			<a href class="dropdown-toggle" dropdown-toggle>
-				<i class="ti-check-box"></i> <span translate="topbar.activities.MAIN">ACTIVITIES</span>
-			</a>
-			<ul class="dropdown-menu dropdown-light dropdown-messages dropdown-large">
-				<li>
-					<span class="dropdown-header" translate="topbar.activities.HEADER"> You have new notifications</span>
-				</li>
-				<li>
-					<div class="drop-down-wrapper ps-container">
-						<div class="list-group no-margin">
-							<a class="media list-group-item" href="">
-								<img class="img-circle" alt="..." src="assets/images/avatar-1.jpg">
-								<span class="media-body block no-margin"> Use awesome animate.css <small class="block text-grey">10 minutes ago</small> </span>
-							</a>
-							<a class="media list-group-item" href="">
-								<span class="media-body block no-margin"> 1.0 initial released <small class="block text-grey">1 hour ago</small> </span>
-							</a>
-						</div>
-					</div>
-				</li>
-				<li class="view-all">
-					<a href="#" translate="topbar.activities.SEEALL">
-						See All
-					</a>
-				</li>
-			</ul>
-		</li>
-		 <li class="dropdown" dropdown on-toggle="toggled(open)">
-			<a href class="dropdown-toggle" dropdown-toggle>
-				<i class="ti-world"></i> {{language.selected}}
-			</a>
-			<ul role="menu" class="dropdown-menu dropdown-light fadeInUpShort">
-				<li ng-repeat="(localeId, langName) in language.available">
-					<a ng-click="language.set(localeId, $event)" href="#" class="menu-toggler">
-						{{langName}}
-					</a>
-				</li>
-			</ul>
-		</li>
-		start: LANGUAGE SWITCHER -->
-        <!-- start: USER OPTIONS DROPDOWN -->
-        <li class="dropdown current-user" dropdown style="width:100px">
-            <div>
-                <!-- 来电  -->
-                <div ng-if="!login" class="headercall">
-                    <img src="assets/images/nologin.png" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round fontcolor-eight fontsizes-14">●</span><span class="fontcolor-eight fontsizes-14">未签入</span> </div>
-                <div ng-if="login&&statuscall==2" class="headercall">
-                    <img src="assets/images/comein.gif" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round comeincolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">来电</span> </div>
-                <!--呼出  -->
-                <!-- <img src="assets/images/m7.png" style="width:25px;height:25px;margin-top:20px" ng-if="status==3"> -->
-                <!-- 置忙  -->
-                <div ng-if="login&&statuscall!=3&&statecall==2&&statuscall!=0" class="margin-top-15">
-                    <img src="assets/images/setbusy.gif" ng-click="setidle();toggle('off-sidebar')" class="image-widthh-34"><span class="round setbusycolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示忙</span> </div>
-                <!-- 签入  -->
-                <div ng-if="login&&statuscall==1&&statecall==1&&login" class="margin-top-15">
-                    <img src="assets/images/link.gif" ng-click="setbusy(1);toggle('off-sidebar')" class="image-widthh-34"><span class="round linkcolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示闲</span> </div>
-                <!--摘机  -->
-                <div ng-if="login&&statuscall==3" class="margin-top-15">
-                    <img src="assets/images/connection.png" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round connectioncolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">通话中</span> </div>
-                <!--挂机  -->
-                <!-- <img src="assets/images/m22.png" style="width:25px;height:25px;margin-top:20px" ng-if="status==7"> -->
-            </div>
-        </li>
-        <li class="dropdown current-user" dropdown on-toggle="toggled(open)">
-            <a href class="dropdown-toggle" dropdown-toggle>
-                <img src="assets/images/avatar-1.jpg" alt="{{user.name}}" style="background-color:red"> <span class="username">{{user.name}} <i class="ti-angle-down"></i></i></span>
-            </a>
-            <ul class="dropdown-menu dropdown-dark">
-                <!-- <li>
-					<a ui-sref="app.pages.user" translate="topbar.user.PROFILE">
-						My Profile
-					</a>
-				</li>
-				<li>
-					<a ui-sref="app.pages.calendar" translate="topbar.user.CALENDAR">
-						My Calendar
-					</a>
-				</li>
-				<li>
-					<a ui-sref="app.pages.messages" translate="topbar.user.MESSAGES">
-						My Messages (3)
-					</a>
-				</li> -->
-                <!-- <li>
-                    <a ng-click="changepassword()" translate="topbar.user.CHANGEPASSWORD" class="fontchangepas">
-						changepassword
-					</a>
-                </li> -->
-                <!-- <li>
-					<a ui-sref="login.lockscreen" translate="topbar.user.LOCKSCREEN">
-						Lock Screen
-					</a>
-				</li> -->
-                <li>
-                    <a ng-click="logout()" class="fontchangepas" translate="topbar.user.LOGOUT">
-						Log Outs
-					</a>
-                </li>
-            </ul>
-        </li>
-        <!-- end: USER OPTIONS DROPDOWN -->
-    </ul>
-    <!-- start: MENU TOGGLER FOR MOBILE DEVICES -->
-    <!-- div class="close-handle visible-xs-block menu-toggler" ng-click="navbarCollapsed = true">
-		<div class="arrow-left"></div>
-		<div class="arrow-right"></div>
-	</div> -->
-    <!-- end: MENU TOGGLER FOR MOBILE DEVICES -->
-</div>
-<a class="dropdown-off-sidebar" ng-click="toggle('off-sidebar')">
-	&nbsp;
-</a>
-<!-- end: NAVBAR COLLAPSE -->
-<!-- start: TOP NAVBAR -->

assets/views/partials/top-navbar3.html

@@ -19,24 +19,134 @@
 <!-- start: NAVBAR COLLAPSE -->
 <div class="navbar-collapse collapse" collapse="navbarCollapsed" ng-init="navbarCollapsed = true" off-click="navbarCollapsed = true" off-click-if='!navbarCollapsed' off-click-filter="#menu-toggler">
     <ul class="nav navbar-right" ct-fullheight="window" data-ct-fullheight-exclusion="header" data-ct-fullheight-if="isSmallDevice">
+        <!-- start: MESSAGES DROPDOWN 
+		<li class="dropdown" dropdown on-toggle="toggled(open)">
+			<a href class="dropdown-toggle" dropdown-toggle>
+				<span class="dot-badge partition-red"></span> <i class="ti-comment"></i> <span translate="topbar.messages.MAIN">MESSAGES</span>
+			</a>
+			<ul class="dropdown-menu dropdown-light dropdown-messages dropdown-large">
+				<li>
+					<span class="dropdown-header" translate="topbar.messages.HEADER"> Unread messages</span>
+				</li>
+				<li>
+					<div class="drop-down-wrapper ps-container">
+						<ul>
+							<li class="unread">
+								<a href="javascript:;" class="unread">
+									<div class="clearfix">
+										<div class="thread-image">
+											<img src="./assets/images/avatar-2.jpg" alt="">
+										</div>
+										<div class="thread-content">
+											<span class="author">Nicole Bell</span>
+											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
+											<span class="time"> Just Now</span>
+										</div>
+									</div>
+								</a>
+							</li>
+							<li>
+								<a href="javascript:;" class="unread">
+									<div class="clearfix">
+										<div class="thread-image">
+											<img src="./assets/images/avatar-3.jpg" alt="">
+										</div>
+										<div class="thread-content">
+											<span class="author">Steven Thompson</span>
+											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
+											<span class="time">8 hrs</span>
+										</div>
+									</div>
+								</a>
+							</li>
+							<li>
+								<a href="javascript:;">
+									<div class="clearfix">
+										<div class="thread-image">
+											<img src="./assets/images/avatar-5.jpg" alt="">
+										</div>
+										<div class="thread-content">
+											<span class="author">Kenneth Ross</span>
+											<span class="preview">Duis mollis, est non commodo luctus, nisi erat porttitor ligula...</span>
+											<span class="time">14 hrs</span>
+										</div>
+									</div>
+								</a>
+							</li>
+						</ul>
+					</div>
+				</li>
+				<li class="view-all">
+					<a href="#" translate="topbar.messages.SEEALL">
+						See All
+					</a>
+				</li>
+			</ul>
+		</li>
+		end: MESSAGES DROPDOWN -->
+        <!-- start: ACTIVITIES DROPDOWN
+		<li class="dropdown" dropdown on-toggle="toggled(open)">
+			<a href class="dropdown-toggle" dropdown-toggle>
+				<i class="ti-check-box"></i> <span translate="topbar.activities.MAIN">ACTIVITIES</span>
+			</a>
+			<ul class="dropdown-menu dropdown-light dropdown-messages dropdown-large">
+				<li>
+					<span class="dropdown-header" translate="topbar.activities.HEADER"> You have new notifications</span>
+				</li>
+				<li>
+					<div class="drop-down-wrapper ps-container">
+						<div class="list-group no-margin">
+							<a class="media list-group-item" href="">
+								<img class="img-circle" alt="..." src="assets/images/avatar-1.jpg">
+								<span class="media-body block no-margin"> Use awesome animate.css <small class="block text-grey">10 minutes ago</small> </span>
+							</a>
+							<a class="media list-group-item" href="">
+								<span class="media-body block no-margin"> 1.0 initial released <small class="block text-grey">1 hour ago</small> </span>
+							</a>
+						</div>
+					</div>
+				</li>
+				<li class="view-all">
+					<a href="#" translate="topbar.activities.SEEALL">
+						See All
+					</a>
+				</li>
+			</ul>
+		</li>
+		 <li class="dropdown" dropdown on-toggle="toggled(open)">
+			<a href class="dropdown-toggle" dropdown-toggle>
+				<i class="ti-world"></i> {{language.selected}}
+			</a>
+			<ul role="menu" class="dropdown-menu dropdown-light fadeInUpShort">
+				<li ng-repeat="(localeId, langName) in language.available">
+					<a ng-click="language.set(localeId, $event)" href="#" class="menu-toggler">
+						{{langName}}
+					</a>
+				</li>
+			</ul>
+		</li>
+		start: LANGUAGE SWITCHER -->
         <!-- start: USER OPTIONS DROPDOWN -->
         <li class="dropdown current-user" dropdown style="width:100px">
             <div>
-                <!-- 未签入 -->
-                <div ng-if="callStatus == -1" class="headercall">
+                <!-- 来电  -->
+                <div ng-if="!login" class="headercall">
                     <img src="assets/images/nologin.png" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round fontcolor-eight fontsizes-14">●</span><span class="fontcolor-eight fontsizes-14">未签入</span> </div>
-				<!-- 来电  -->
-                <div ng-if="callStatus == 3" class="headercall">
+                <div ng-if="login&&statuscall==2" class="headercall">
                     <img src="assets/images/comein.gif" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round comeincolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">来电</span> </div>
-                <!-- 示忙  -->
-                <div ng-if="callStatus == 2" class="margin-top-15">
-                    <img src="assets/images/setbusy.gif" ng-click="(callStatus == 2&&setidle());toggle('off-sidebar')" class="image-widthh-34"><span class="round setbusycolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示忙</span> </div>
-                <!-- 示闲  -->
-                <div ng-if="callStatus == 1" class="margin-top-15">
-                    <img src="assets/images/link.gif" ng-click="(callStatus == 1&&setbusy());toggle('off-sidebar')" class="image-widthh-34"><span class="round linkcolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示闲</span> </div>
-                <!-- 通话中  -->
-                <div ng-if="callStatus == 4" class="margin-top-15">
+                <!--呼出  -->
+                <!-- <img src="assets/images/m7.png" style="width:25px;height:25px;margin-top:20px" ng-if="status==3"> -->
+                <!-- 置忙  -->
+                <div ng-if="login&&statuscall!=3&&statecall==2&&statuscall!=0" class="margin-top-15">
+                    <img src="assets/images/setbusy.gif" ng-click="setidle();toggle('off-sidebar')" class="image-widthh-34"><span class="round setbusycolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示忙</span> </div>
+                <!-- 签入  -->
+                <div ng-if="login&&statuscall==1&&statecall==1&&login" class="margin-top-15">
+                    <img src="assets/images/link.gif" ng-click="setbusy(1);toggle('off-sidebar')" class="image-widthh-34"><span class="round linkcolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">示闲</span> </div>
+                <!--摘机  -->
+                <div ng-if="login&&statuscall==3" class="margin-top-15">
                     <img src="assets/images/connection.png" ng-click="toggle('off-sidebar')" class="image-widthh-34"><span class="round connectioncolor fontsizes-14">●</span><span class="fontcolor-six fontsizes-14">通话中</span> </div>
+                <!--挂机  -->
+                <!-- <img src="assets/images/m22.png" style="width:25px;height:25px;margin-top:20px" ng-if="status==7"> -->
             </div>
         </li>
         <li class="dropdown current-user" dropdown on-toggle="toggled(open)">
@@ -44,6 +154,31 @@
                 <img src="assets/images/avatar-1.jpg" alt="{{user.name}}" style="background-color:red"> <span class="username">{{user.name}} <i class="ti-angle-down"></i></i></span>
             </a>
             <ul class="dropdown-menu dropdown-dark">
+                <!-- <li>
+					<a ui-sref="app.pages.user" translate="topbar.user.PROFILE">
+						My Profile
+					</a>
+				</li>
+				<li>
+					<a ui-sref="app.pages.calendar" translate="topbar.user.CALENDAR">
+						My Calendar
+					</a>
+				</li>
+				<li>
+					<a ui-sref="app.pages.messages" translate="topbar.user.MESSAGES">
+						My Messages (3)
+					</a>
+				</li> -->
+                <!-- <li>
+                    <a ng-click="changepassword()" translate="topbar.user.CHANGEPASSWORD" class="fontchangepas">
+						changepassword
+					</a>
+                </li> -->
+                <!-- <li>
+					<a ui-sref="login.lockscreen" translate="topbar.user.LOCKSCREEN">
+						Lock Screen
+					</a>
+				</li> -->
                 <li>
                     <a ng-click="logout()" class="fontchangepas" translate="topbar.user.LOGOUT">
 						Log Outs
@@ -54,6 +189,10 @@
         <!-- end: USER OPTIONS DROPDOWN -->
     </ul>
     <!-- start: MENU TOGGLER FOR MOBILE DEVICES -->
+    <!-- div class="close-handle visible-xs-block menu-toggler" ng-click="navbarCollapsed = true">
+		<div class="arrow-left"></div>
+		<div class="arrow-right"></div>
+	</div> -->
     <!-- end: MENU TOGGLER FOR MOBILE DEVICES -->
 </div>
 <a class="dropdown-off-sidebar" ng-click="toggle('off-sidebar')">