admin/gr_bi_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:c5fdbd6a2779c63ed72a5689f94cb807733ca44d
Branches Tags
admin:main admin:tab20260208 admin:20260204
...
compare: admin:0e482453810d9bcb466d1539d3574e2ee805dc22
Branches Tags
admin:main admin:tab20260208 admin:20260204

3 Commits
c5fdbd6a27 ... 0e48245381

Author SHA1 Message Date
DESKTOP-AD8UBUJ\ling
0e48245381 Merge branch 'main' of http://8.130.49.250:3000/admin/gr_bi_web 
# Conflicts:
#	config/dev.env.js
#	src/views/login.vue
 2026-03-07 00:22:49 +08:00
DESKTOP-AD8UBUJ\ling
83a8974dc5 config提交 2026-03-07 00:20:09 +08:00
DESKTOP-AD8UBUJ\ling
76443e343c 单点修改2 2026-03-07 00:13:29 +08:00
3 changed files with 20 additions and 16 deletions
Expand all files Collapse all files

2
config/dev.env.js
View File

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

2
src/utils/request.js
View File

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

10
src/views/login.vue
View File

@@ -146,19 +146,21 @@ export default {
//获取url传参 ticket url //获取url传参 ticket url
const ticket = this.$route.query.ticket; const ticket = this.$route.query.ticket;
let token = getToken(); let token = getToken();
console.log(ticket);
console.log(token);
if (ticket == undefined && token == null) { if (ticket == undefined && token == null) {
//跳转统一身份认证 //跳转统一身份认证
var isTs = true; var isTs = true;
if (isTs) { 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%2Flogin'+(this.redirect?'&ssUrl='+this.redirect:'');
window.location.href = // 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:'');
"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) { } else if (ticket != undefined && token == null) {
//请求登录 //请求登录
this.logincasapi(); this.logincasapi();
} else { } else {
} }
}, },
created() {}, created() {},