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

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

Browse Source 
# Conflicts:
#	src/views/login.vue
This commit is contained in:
chy
2026-03-06 22:44:43 +08:00
parent 2125269c6c 1373b56b94
commit ace17a95dd
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/dev.env.js
View File

@@ -4,6 +4,6 @@ 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"'
}) })

11
src/utils/request.js
View File

@@ -1,11 +1,12 @@
import axios from 'axios' import axios from 'axios'
import { Message, MessageBox } from 'element-ui' import { Message, MessageBox } from 'element-ui'
import router from '../router'
import store from '../store' import store from '../store'
import { getToken } from '@/utils/auth' 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: 20000 // 请求超时时间 timeout: 200000 // 请求超时时间
}) })
// request拦截器 // request拦截器
@@ -41,7 +42,13 @@ service.interceptors.response.use(
// sessionStorage.clear() // sessionStorage.clear()
// localStorage.clear() // localStorage.clear()
localStorage.removeItem('AJReportToken') localStorage.removeItem('AJReportToken')
window.location.href = "/"; router.push({
path: '/login',
query: {
redirect: location.hash.substring(1)
}
})
// window.location.href = "/index?redirect=" + location.hash.substring(1);
}) })
} }
else if (res.code !== '200') { else if (res.code !== '200') {

11
src/views/login.vue
View File

@@ -145,18 +145,14 @@ export default {
this.handleLoginFocus(); this.handleLoginFocus();
//获取url传参 ticket url //获取url传参 ticket url
const ticket = this.$route.query.ticket; const ticket = this.$route.query.ticket;
debugger
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) {
debugger 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://192.168.1.241/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F192.168.1.241%3A8080%2F%23%2Flogin'; // window.location.href = 'http://localhost:8099/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2Flocalhost%3A9528%2F%23'+this.redirect;
// window.location.href = 'http://127.0.0.1/login?redirect=/lig/oauth2/oauth2/application&appid=330b4ecb60c9a6802b957fe1e5a5ecd3&url=http%3A%2F%2F127.0.0.1%3A9528%2F%23%2Flogin';
} }
} else if (ticket != undefined && token == null) { } else if (ticket != undefined && token == null) {
@@ -164,6 +160,7 @@ export default {
this.logincasapi(); this.logincasapi();
} else { } else {
} }
}, },
created() {}, created() {},