服务台人员和一线运维登录选择

assets/js/controllers/customform/customformCtrl.js

@@ -22099,6 +22099,7 @@ appFormly.controller("CustomformCtrl", [
             } else {
               console.log($scope.formData.url, "zzzz");
               var integralMechanism = sessionStorage.getItem('integralMechanism');
+              let resetDuty = sessionStorage.getItem("resetDuty");
               let integralRoles = [];
               let currentUserRoles = [];
               let intersection = [];
@@ -22190,9 +22191,10 @@ appFormly.controller("CustomformCtrl", [
                   if(integralMechanism == 1){
                     integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
-                    intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
+                    intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 });
                   }
-                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  
+                  if(resetDuty === "false" && vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                       controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
@@ -22303,9 +22305,9 @@ appFormly.controller("CustomformCtrl", [
                           }
                       }
                     });
-                }else{
-                  handlerStart();
-                }
+                  }else{
+                    handlerStart();
+                  }
                   // -------------------------------end------------------------------------
                   function handlerStart(){
                     api_bpm_domain
@@ -22346,12 +22348,13 @@ appFormly.controller("CustomformCtrl", [
                         let integralRoles = [];
                         let currentUserRoles = [];
                         let intersection = [];
+                        let resetDuty = sessionStorage.getItem("resetDuty");
                         if(integralMechanism == 1){
                           integralRoles = sessionStorage.getItem("integralRole") ? sessionStorage.getItem("integralRole").split(',') : [];
                           currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                           intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                         }
-                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                        if(resetDuty === "false" && vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                           api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                             var auditState = res.find(v=>v.value == 0);
                             var postData = { 

assets/js/controllers/loginCtrl.js

@@ -1,7 +1,9 @@
-app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$auth', '$window', '$document', '$timeout', '$filter', '$http', 'cfpLoadingBar', 'Restangular', 'api_login', 'api_is_category', 'SweetAlert', 'api_msg',
-    function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $auth, $window, $document, $timeout, $filter, $http, cfpLoadingBar, Restangular, api_login, api_is_category, SweetAlert, api_msg) {
+app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$localStorage', '$cookieStore', '$auth', '$window', '$document', '$timeout', '$filter', '$http', 'cfpLoadingBar', 'Restangular', 'api_login', 'api_is_category', 'SweetAlert', 'api_msg', '$modal', 'api_auth',
+    function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $auth, $window, $document, $timeout, $filter, $http, cfpLoadingBar, Restangular, api_login, api_is_category, SweetAlert, api_msg, $modal, api_auth) {
         $rootScope.app.layout.isNavbarFixed = false;
         $rootScope.app.layout.isSidebarFixed = false;
+        sessionStorage.clear();
+        localStorage.clear();
         //判断项目归属 start
         //因项目众多，前端为了加以区分，所以用域名加以判断，后期有更好的方式可以自行修改
         // 中南财大
@@ -555,9 +557,66 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                                         // if (!resp.error || resp.error != 500) {
                                         if (resp.data && resp.data.user && resp.data.user.id) {
                                             // console.log(resp.error);
-                                            $rootScope.getpending();
-                                            $state.go('app.dashboard');
-                                            $rootScope.app.isLoginFixed = false;
+                                            var firstLineFlag = resp.data.user.role.some(function(v){
+                                                return v.rolecode === 'first-line support';
+                                            });
+                                            var callCenterFlag = resp.data.user.role.some(function(v){
+                                                return v.rolecode === 'call center';
+                                            });
+                                            if(firstLineFlag && callCenterFlag){
+                                                // 同时拥有服务台和一线运维的角色
+                                                // 强制选择登录用途 start
+                                                var modalInstance = $modal.open({
+                                                    templateUrl: "assets/views/customform/tpl/loginPurpose.html",
+                                                    controller: function ($scope, $rootScope, scope, $modalInstance, api_auth) {
+                                                        $scope.title = "选择登录用途";
+                                                        $scope.loginPurpose = 0;
+                                                        $scope.ok = function (item) {
+                                                            if(item){
+                                                                $modalInstance.close(item);
+                                                            }else{
+                                                                SweetAlert.swal("操作失败", "请选择登录用途!", "error");
+                                                            }
+                                                        };
+                                                        $scope.cancel = function () {
+                                                            $modalInstance.dismiss("cancel");
+                                                        };
+                                                        },
+                                                        size: "sm",
+                                                        resolve: {
+                                                        scope: function () {
+                                                            return $scope;
+                                                        },
+                                                    },
+                                                });
+                                                modalInstance.result.then(function (selectedItem) {
+                                                    if (selectedItem) {
+                                                        $rootScope.isMask = true;
+                                                        var flag  = selectedItem == 1 ? true : (selectedItem == 2 ? false : undefined);
+                                                        api_auth.resetDuty({isDuty: flag})
+                                                        .then(function (response) {
+                                                            $rootScope.isMask = false;
+                                                            if (response.status == 200) {
+                                                                sessionStorage.setItem('resetDuty', flag);
+                                                                $rootScope.getpending();
+                                                                $state.go('app.dashboard');
+                                                                $rootScope.app.isLoginFixed = false;
+                                                            } else {
+                                                                SweetAlert.swal("操作失败", "操作失败!", "error");
+                                                            }
+                                                        }).catch(function(err){
+                                                            $rootScope.isMask = false;
+                                                        });
+                                                    }else{
+                                                        SweetAlert.swal("操作失败", "请选择登录用途!", "error");
+                                                    }
+                                                });
+                                                // 强制选择登录用途 end
+                                            }else{
+                                                $rootScope.getpending();
+                                                $state.go('app.dashboard');
+                                                $rootScope.app.isLoginFixed = false;
+                                            }
                                             // console.log(resp);
                                             // api_wechatfile.getDictionary({ "type": "list", "key": "hjzx_cornet" }).then(function(data) {
                                             //     $scope.runNumber = data;

assets/js/main.js

@@ -468,6 +468,21 @@ app.factory('api_text', ['textRestangular', function (textRestangular) {
     }
 }])
 
+app.factory('AuthRestangular', function (Restangular) {
+    return Restangular.withConfig(function (RestangularConfigurer) {
+        RestangularConfigurer.setBaseUrl(serverIp);
+    });
+});
+
+app.factory('api_auth', ['AuthRestangular', function (UserRestangular) {
+    var auths = UserRestangular.all("auth");
+    return {
+        resetDuty: function (data) {
+            return auths.customPOST(data, 'resetDuty', {});
+        }
+    };
+}]);
+
 
 
 app.factory('UserRestangular', function (Restangular) {

assets/views/customform/tpl/loginPurpose.html

@@ -0,0 +1,73 @@
+<style>
+    .bootstrap-touchspin .input-group-btn-vertical>.btn {
+        padding: 6px 10px;
+        /* padding-top: 5px !important; */
+    }
+    
+    .bootstrap-touchspin .input-group-btn-vertical i {
+        top: 0px;
+    }
+    
+    .bootstrap-touchspin .input-group-btn-vertical .bootstrap-touchspin-down {
+        margin-top: 0px;
+    }
+    
+    .input-group-addon:not(:first-child):not(:last-child),
+    .input-group-btn:not(:first-child):not(:last-child),
+    .input-group .form-control:not(:first-child):not(:last-child) {
+        border-radius: 2px;
+    }
+    
+    .btn.btnopen {
+        padding: 3px 8px;
+    }
+    .tab_bdItem_tab {
+        margin-bottom: 0;
+        overflow: hidden;
+    }
+
+    .tab_bdItem_tab li {
+        margin-left: 24px;
+        height: 34px;
+        line-height: 34px;
+    }
+
+    .tab_bdItem_tabItem.active {
+        color: #005395;
+    }
+
+    .tab_bdItem_tabItem {
+        font-size: 14px;
+        color: #ddd;
+        cursor: pointer;
+    }
+</style>
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
+    <form role="form" class="row  margin-bottom-5">
+        <div class="col-xs-12  margin-top-10 margin-bottom-10">因为您同时拥有服务台和一线运维的角色，请选择当前登录用途</div>
+        <div class="col-xs-12  margin-top-10 margin-bottom-10">
+            <div class="control-label fontcolor-two fontsizes-14 col-xs-12"></div>
+            <div class="col-xs-12">
+                <div class="input-group">
+                    <ul class="tab_bdItem_tab">
+                        <li class="fl" style="cursor: pointer;" ng-click="loginPurpose = 1">
+                            <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-class="loginPurpose === 1?'active':''"></i>
+                            <span>服务台值班</span>
+                        </li>
+                        <li class="fl" style="cursor: pointer;" ng-click="loginPurpose = 2">
+                            <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-class="loginPurpose === 2?'active':''"></i>
+                            <span>一线维修</span>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer ">
+    <button class="btn btn-primary " ng-click="ok(loginPurpose) " data-dismiss="modal">确定</button>
+    <button class="btn btn-primary btn-o " ng-click="cancel() ">取消</button>
+</div>