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

# Conflicts:
#	config/dev.env.js
#	src/views/login.vue

config/dev.env.js

@@ -5,5 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://127.0.0.1:48090"'
+
   BASE_API: '"http://192.168.1.241:8080/prod-api"'
+
 })

src/utils/request.js

@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 200000 // 请求超时时间
+  timeout: 20000 // 请求超时时间
 })
 
 // request拦截器

src/views/login.vue

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