退出前签出

assets/js/controllers/desk/chartCtrl.js

@@ -451,7 +451,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
             $scope.fileData.wxincident.createTime = moment($scope.fileData.wxincident.createTime).format('YYYY-MM-DD HH:mm:ss');
         }
         if ($scope.fileData.wxincident.createTimeEnd) {
-            $scope.fileData.wxincident.createTimeEnd = moment($scope.fileData.wxincident.createTimeEnd).format('YYYY-MM-DD HH:mm:ss');
+            $scope.fileData.wxincident.createTimeEnd = moment($scope.fileData.wxincident.createTimeEnd).format('YYYY-MM-DD') + ' 23:59:59';
         }
         $scope.refreshData('expand-right', $scope.fileData);
     }

assets/js/controllers/mainCtrl.js

@@ -2741,7 +2741,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     } else {
       reashdata();
     }
-    $rootScope.end = function () {
+    $rootScope.end = function (callback) {
       api_text.logout($rootScope.takes, $rootScope.user.id).then(function (data) {
         if (data.errno == 0) {
           localStorage.removeItem('hk_phone');
@@ -2749,6 +2749,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
             if (data.errno == 0) {
               $rootScope.statuscall = 0;
               $scope.login = false;
+              callback();
               //     SweetAlert.swal({
               //       title: "登出成功",
               //       text: "呼叫中心登出成功!",
@@ -3210,10 +3211,28 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       // console.log(' userid='+JSON.stringify( userid));
       //单点登录
       if (localStorage.getItem('isSSo') === '1') {
-        $scope.runNumber = [];
-        sessionStorage.clear();
-        localStorage.clear();
-        location.href = 'http://' + location.hostname + '/pc_logout.jsp'
+        console.log($rootScope.isHk,'hk');
+        console.log($rootScope.isZncd,'zncd');
+        if($rootScope.isHk){
+          if ($rootScope.isFuwutai && $scope.login){
+            $rootScope.end(function(){
+              $scope.runNumber = [];
+              sessionStorage.clear();
+              localStorage.clear();
+              location.href = 'http://' + location.hostname + '/pc_logout.jsp';
+            })
+          }else{
+            $scope.runNumber = [];
+            sessionStorage.clear();
+            localStorage.clear();
+            location.href = 'http://' + location.hostname + '/pc_logout.jsp';
+          }
+        }else{
+          $scope.runNumber = [];
+          sessionStorage.clear();
+          localStorage.clear();
+          location.href = 'http://' + location.hostname + '/pc_logout.jsp';
+        }
       } else {
         $auth.signOut()
           .then(function (resp) {
@@ -3232,8 +3251,16 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                   message: '呼叫中心断开连接'
                 });
               }
+              $state.go("login.signin");
+            }else if($rootScope.isHk){
+              if ($rootScope.isFuwutai && $scope.login) {
+                $rootScope.end(function(){
+                  $state.go("login.signin");
+                })
+              }else{
+                $state.go("login.signin");
+              }
             }
-            $state.go("login.signin");
           })
           .catch(function (resp) { });
       }