Merge branch 'main' of http://8.130.49.250:3000/admin/gr_bi_web

# Conflicts:
#	src/views/login.vue

src/views/login.vue

@@ -144,22 +144,22 @@ export default {
   mounted() {
     this.handleLoginFocus();
     //获取url传参 ticket url
-    const ticket = this.$route.query.ticket;
-    let token = getToken();
-    // console.log(ticket);
-    // console.log(token);
-    // this.logincasapi();
-    if (ticket == undefined && token == null) {
-      //跳转统一身份认证
-      var isTs = true;
-      if (isTs) {
-          window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
+     const ticket = this.$route.query.ticket;
+     let token = getToken();
+     console.log(ticket);
+     console.log(token);
+     if (ticket == undefined && token == null) {
+       //跳转统一身份认证
+       var isTs = true;
+       if (isTs) {
+         window.location.href = 'http://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
           // window.location.href = 'http://localhost/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A9528%2F%23%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
-      }
-    } else if (ticket != undefined && token == null) {
-        //请求登录
-        this.logincasapi();
-    } else {
+   
+       }
+     } else if (ticket != undefined && token == null) {
+       //请求登录
+       this.logincasapi();
+     } else {
 
     }
   },