登录恢复

assets/js/config.router.js

@@ -34,10 +34,10 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                             '$http','$state',
                             function ($http,$state) {
                                 if(resp.status == 444){
-                                    // $state.go('login.signin');
-                                    if(window.location.hash !== '#/login/signin'){
-                                        window.location.href = location.origin;
-                                    }
+                                    $state.go('login.signin');
+                                    // if(window.location.hash !== '#/login/signin'){
+                                    //     window.location.href = location.origin;
+                                    // }
                                 }
                             }
                         ]);
@@ -110,7 +110,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
             //         angular.extend(authData,response.data.user);
             //         return authData;
             //     // }
-            //     // return authData;            
+            //     // return authData;
             // },
 
             parseExpiry: function (headers) {
@@ -199,7 +199,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
         // $httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
         // For any unmatched url, redirect to /app/dashboard
         // $urlRouterProvider.otherwise("/app/knowledge/forum");
-        $urlRouterProvider.otherwise("/");
+        // $urlRouterProvider.otherwise("/");
         //
         // Set up the states
         $stateProvider.state('app', {

assets/js/controllers/loginCtrl.js

@@ -20,7 +20,7 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
         }
         //判断项目归属 end
         // 是否单点登录
-        $scope.isSSo = true;
+        $scope.isSSo = location.search.length > 0;
         //初始化，获取版本类别，处理人/处理科室-seimin
         $scope.isCategoryHandle = function () {
             api_is_category.isCategory({ "idx": 0, "sum": 1000 })
@@ -145,15 +145,15 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
             // $auth.submitLogin($scope.loginForm)
             // var ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
             // 注释
-            // var ssoStr = '';
-            // var ssoJson;
-            // if ($scope.isSSo) {
-            //     ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
-            //     ssoStr = Base64.decode(decodeURIComponent(ssoStr));
-            //     ssoJson = JSON.parse(ssoStr);
-            // }
-            // var postData = $scope.isSSo ? { username: ssoJson.a, password: ssoJson.u, t: false } : $scope.loginForm;
-            api_login.sslLogin()
+            var ssoStr = '';
+            var ssoJson;
+            if ($scope.isSSo) {
+                ssoStr = location.search.replace('?', '').split('&')[0].split('=')[1];
+                ssoStr = Base64.decode(decodeURIComponent(ssoStr));
+                ssoJson = JSON.parse(ssoStr);
+            }
+            var postData = $scope.isSSo ? { username: ssoJson.a, password: ssoJson.u, t: false } : $scope.loginForm;
+            api_login.login(postData)
                 .then(function (resp) {
                     console.log(resp);
                     if ($scope.isSSo) {
@@ -428,9 +428,7 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                                 } else {
                                     if (resp.state == "500") {
                                         SweetAlert.swal("用户名或者密码验证失败，请重试！", "error");
-                                    }else if (resp.state == "501") {
-                                        $state.go('app.dashboard');
-                                    } else {
+                                    }else {
                                         // if (resp.error != 501 && resp.error != 400) {
                                         //     $state.go('app.knowledge.forum');
                                         //     $rootScope.app.isLoginFixed = false;
@@ -646,7 +644,7 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                     // SweetAlert.swal("系统错误，请重试！", "登录错误", "error");
                     SweetAlert.swal("用户名或者密码验证失败，请重试！", "error");
                 });
-            // })        
+            // })
         };
         if ($scope.isSSo) {
             $scope.handleLoginClick();

assets/views/login_login.html

@@ -34,7 +34,7 @@
         padding: 0 40px;
         margin-top: 20px;
         font-size: 16px;
-        
+
     }
     .licensePassBox .body .inden{
         text-indent: 2em
@@ -84,119 +84,118 @@
     }
 </style>
 <div class="demo-1" ng-controller="LoginCtrl">
-    <ng-container ng-if="false">
-        <div class="container" ng-if="!app.isChrome&&!isSSo">
+    <div class="container" ng-if="!app.isChrome&&!isSSo">
 
-            <header class="codrops-header">
-                <!--<img src="assets/images/HBDXLG.png" style="width:300px"/>-->
-                <!-- <nav class="codrops-demos">
-                    <a href="#" ng-click="login()">
-                        <h1>请登录</h1>
-                    </a>
-                </nav> -->
-                <h1>{{app.name}}</h1>
-                <img class="logo" src="./assets/images/login/logo_zncd.png" alt="" ng-if="isZncd">
-                <img class="logo logo_hk" src="./assets/images/login/logo_hk2.png" alt="" ng-if="isHk">
-                <img class="logo" src="./assets/images/login/logo_default.png" alt="" ng-if="!isZncd&&!isHk">
-                <img src="./assets/images/login/bg01.png" alt="">
-                <img class="map" src="./assets/images/login/bg02.png" alt="">
-            </header>
-            <div class="login wt_login" style="margin: 0 auto">
-                <!-- <div class="login-head wt_login wt_login_head">
-                    
-                </div> -->
+        <header class="codrops-header">
+            <!--<img src="assets/images/HBDXLG.png" style="width:300px"/>-->
+            <!-- <nav class="codrops-demos">
+                <a href="#" ng-click="login()">
+                    <h1>请登录</h1>
+                </a>
+            </nav> -->
+            <h1>{{app.name}}</h1>
+            <img class="logo" src="./assets/images/login/logo_zncd.png" alt="" ng-if="isZncd">
+            <img class="logo logo_hk" src="./assets/images/login/logo_hk2.png" alt="" ng-if="isHk">
+            <img class="logo" src="./assets/images/login/logo_default.png" alt="" ng-if="!isZncd&&!isHk">
+            <img src="./assets/images/login/bg01.png" alt="">
+            <img class="map" src="./assets/images/login/bg02.png" alt="">
+        </header>
+        <div class="login wt_login" style="margin: 0 auto">
+            <!-- <div class="login-head wt_login wt_login_head">
 
-                <form class="wt_login_cantent">
-                    <h1>用 户 登 录</h1>
-                    <p style="margin-top:24px;">
-                        <input id="username" ng-model="loginForm.username" type="text" placeholder='请输入用户名' style="font-size:14px;color:#435063;" />
-                    </p>
-                    <p>
-                    </p>
-                    <!-- 记住密码 wt -->
-                    <!-- <p class="wt_checkbox">
-                        <input type="checkbox" class="remember" ng-model="rememberID" ng-change="remember()">
-                        <span class="remember_psw">记住密码</span>
-                    </p> -->
-                    <!-- wt -->
-                    <p style="overflow:hidden">
-                        <button ng-style="{width:isZncd?'48%':'100%'}" ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl" style="width: 48%!important;"> 登录 </button>
-                        <a ng-if="isZncd" href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a>
-                    </p>
-                    <!-- 激活码:<input type="text" ng-model="ceshilicense">   -->
-                    <!-- <div class="col-xs-12">
-                        <div class="pull-left" style="color:#13459E;padding-left:2px;cursor: pointer;" tooltip="点击展示大屏界面" tooltip-placement="top" ng-click="opendashbord()">大屏展示</div>
-                    </div> -->
-                    <p class="text">
-                        推荐使用Google浏览器,其他浏览器可能会出现兼容性问题
-                    </p>
-                </form>
-                <p class="copyright">
-                    @dashihengtong.[京ICO:143]
+            </div> -->
+
+            <form class="wt_login_cantent">
+                <h1>用 户 登 录</h1>
+                <p style="margin-top:24px;">
+                    <input id="username" ng-model="loginForm.username" type="text" placeholder='请输入用户名' style="font-size:14px;color:#435063;" />
                 </p>
+                <p>
+                    <input ng-model="loginForm.password" type="password" placeholder='请输入密码' style="font-size:14px;color:#435063; " autocomplete />
+                </p>
+                <!-- 记住密码 wt -->
+                <!-- <p class="wt_checkbox">
+                    <input type="checkbox" class="remember" ng-model="rememberID" ng-change="remember()">
+                    <span class="remember_psw">记住密码</span>
+                </p> -->
+                <!-- wt -->
+                <p style="overflow:hidden">
+                    <button ng-style="{width:isZncd?'48%':'100%'}" ng-click="handleLoginClick(loginForm)" class="btn-primary wt_btn fl" style="width: 48%!important;"> 登录 </button>
+                    <a ng-if="isZncd" href="http://itsm.zuel.edu.cn:8080/" class="btn-primary wt_btn fr" style="width: 48%!important;margin-top:30px;line-height:52px;"> 统一身份认证 </a>
+                </p>
+                <!-- 激活码:<input type="text" ng-model="ceshilicense">   -->
+                <!-- <div class="col-xs-12">
+                    <div class="pull-left" style="color:#13459E;padding-left:2px;cursor: pointer;" tooltip="点击展示大屏界面" tooltip-placement="top" ng-click="opendashbord()">大屏展示</div>
+                </div> -->
+                <p class="text">
+                    推荐使用Google浏览器,其他浏览器可能会出现兼容性问题
+                </p>
+            </form>
+            <p class="copyright">
+                @dashihengtong.[京ICO:143]
+            </p>
+        </div>
+        <div>
+            <div class="">
+                <span id="el-login" class="el-login" ng-morph-modal="loginBtn"></span>
             </div>
-            <div>
-                <div class="">
-                    <span id="el-login" class="el-login" ng-morph-modal="loginBtn"></span>
-                </div>
-                <p class="nosupport">对不起,您的浏览器不支持WebGL</p>
-            </div>
+            <p class="nosupport">对不起,您的浏览器不支持WebGL</p>
         </div>
-        <div class="container" ng-if="app.isChrome">
-            <div>
-                <div class="slideshowfalse">
-                    <span id="el-login" class="el-login">
-                        <div class="logincheck">
-                            <div class="margin-bottom-15" style="font-size: 20px;color: white">
-                                <i class="ti-alert margin-right-15" style="font-size: 50px"></i>访问失败 </div>
-                            <div style="font-size:16px">
-                                <p>{{checkchrome}}无法访问该网址，请用Chrome浏览器访问！</p>
-                            </div>
+    </div>
+    <div class="container" ng-if="app.isChrome">
+        <div>
+            <div class="slideshowfalse">
+                <span id="el-login" class="el-login">
+                    <div class="logincheck">
+                        <div class="margin-bottom-15" style="font-size: 20px;color: white">
+                            <i class="ti-alert margin-right-15" style="font-size: 50px"></i>访问失败 </div>
+                        <div style="font-size:16px">
+                            <p>{{checkchrome}}无法访问该网址，请用Chrome浏览器访问！</p>
                         </div>
-                    </span>
-                </div>
-                <p class="nosupport">对不起,您的浏览器不支持WebGL</p>
+                    </div>
+                </span>
             </div>
+            <p class="nosupport">对不起,您的浏览器不支持WebGL</p>
         </div>
-        <!-- license试用期 -->
-        <div class="licensePassBoxFix" ng-show="licenseTrialShow">
-            <div class="licensePassBox">
-                <div class="head">系统通知</div>
-                <div class="body">
-                    <div class="tis">温馨提示:</div>
-                    <div class="contents">欢迎进入itsm运维管理系统通知!</div>
-                    <div class="contents inden">&nbsp;&nbsp;系统试用有效期为<span class="fontImportant">{{featureSum}}</span>天，您的系统账号将于<span class="fontImportant">{{licenseSurplusTime}}</span>天后到期，到期后，账号将自动失效！为了不影响您的正常使用，请尽快联系管理员！</div>
-                    <div class="trialBot">
-                        <input type="button" value="继续试用" class="trialClass" ng-click="licenseTrialSub()">
-                        <input type="button" value="正式激活" class="trialClass" ng-click="licenseTrialActivation()">
-                    </div>  
+    </div>
+    <!-- license试用期 -->
+    <div class="licensePassBoxFix" ng-show="licenseTrialShow">
+        <div class="licensePassBox">
+            <div class="head">系统通知</div>
+            <div class="body">
+                <div class="tis">温馨提示:</div>
+                <div class="contents">欢迎进入itsm运维管理系统通知!</div>
+                <div class="contents inden">&nbsp;&nbsp;系统试用有效期为<span class="fontImportant">{{featureSum}}</span>天，您的系统账号将于<span class="fontImportant">{{licenseSurplusTime}}</span>天后到期，到期后，账号将自动失效！为了不影响您的正常使用，请尽快联系管理员！</div>
+                <div class="trialBot">
+                    <input type="button" value="继续试用" class="trialClass" ng-click="licenseTrialSub()">
+                    <input type="button" value="正式激活" class="trialClass" ng-click="licenseTrialActivation()">
                 </div>
             </div>
         </div>
-        <!-- license已到期 -->
-        <div class="licensePassBoxFix" ng-show="licensePassShow">
-            <div class="licensePassBox">
-                <div class="head">系统通知</div>
-                <div class="body">
-                    <div class="tis">温馨提示:</div>
-                    <div class="contents">欢迎进入itsm运维管理系统通知!</div>
-                    <div class="contents inden">&nbsp;&nbsp;您的系统账号已经到期，账号已失效！为了不影响您的正常使用，请尽快联系管理员！</div>
-                    <input type="button" value="确定" class="iptClas" ng-click="licensePassSub()">
-                </div>
+    </div>
+    <!-- license已到期 -->
+    <div class="licensePassBoxFix" ng-show="licensePassShow">
+        <div class="licensePassBox">
+            <div class="head">系统通知</div>
+            <div class="body">
+                <div class="tis">温馨提示:</div>
+                <div class="contents">欢迎进入itsm运维管理系统通知!</div>
+                <div class="contents inden">&nbsp;&nbsp;您的系统账号已经到期，账号已失效！为了不影响您的正常使用，请尽快联系管理员！</div>
+                <input type="button" value="确定" class="iptClas" ng-click="licensePassSub()">
             </div>
         </div>
-        <!-- license即将到期 -->
-        <div class="licensePassBoxFix" ng-show="licenseSoonShow">
-            <div class="licensePassBox">
-                <div class="head">系统通知</div>
-                <div class="body">
-                    <div class="tis">温馨提示:</div>
-                    <div class="contents">欢迎进入itsm运维管理系统通知!</div>
-                    <div class="contents inden">您的系统账号将于<span class="fontImportant">{{licenseSurplusTime}}</span>天后到期，到期后，账号将自动失效！为了不影响您的正常使用，请尽快联系管理员！</div>
-                    <input type="button" value="确定" class="iptClas" ng-click="licenseSoonShowSub()">
-                </div>
+    </div>
+    <!-- license即将到期 -->
+    <div class="licensePassBoxFix" ng-show="licenseSoonShow">
+        <div class="licensePassBox">
+            <div class="head">系统通知</div>
+            <div class="body">
+                <div class="tis">温馨提示:</div>
+                <div class="contents">欢迎进入itsm运维管理系统通知!</div>
+                <div class="contents inden">您的系统账号将于<span class="fontImportant">{{licenseSurplusTime}}</span>天后到期，到期后，账号将自动失效！为了不影响您的正常使用，请尽快联系管理员！</div>
+                <input type="button" value="确定" class="iptClas" ng-click="licenseSoonShowSub()">
             </div>
         </div>
-    </ng-container>
+    </div>
 </div>
 <!--<script src="assets/js/index.min.js"></script>-->