From cef0fbfc5762713d214a5e35a1185f4f073fe4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8B=AC=E6=A0=91=E7=9A=84=E9=A3=8E?= <2167228784@qq.com> Date: Thu, 7 Dec 2023 22:15:11 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 46 ++++++++++--------- .../videoMonitor/components/livePlayer.vue | 2 +- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 9857ea5..4963645 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,32 +1,35 @@ import axios from 'axios' -import vm from "../main"; +import vm from '../main' import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - baseURL: 'http://50.146.63.43:1129/hjapi', - //baseURL: 'http://121.41.91.94:12002/hjapi', + // baseURL: 'http://50.146.63.43:1129/hjapi', + baseURL: 'http://121.41.91.94:12002/hjapi', //baseURL: `http://${window.location.host}/hjapi`, timeout: 50000, - headers: { 'content-type': 'application/json' }, + headers: { 'content-type': 'application/json' } }) // request拦截器 -request.interceptors.request.use(config => { - // 是否需要设置 token - const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 - if (getToken() && !isToken) { - config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 +request.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false + // 是否需要防止数据重复提交 + if (getToken() && !isToken) { + config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 + } + //防止重复提交 + return config + }, + (error) => { + console.log(error) + Promise.reject(error) } - //防止重复提交 - return config -}, error => { - console.log(error) - Promise.reject(error) -}) +) // response 拦截器 // 可以在接口响应后统一处理结果 request.interceptors.response.use( - response => { + (response) => { if (response.data) { switch (response.data.code) { case 200: @@ -36,7 +39,9 @@ request.interceptors.response.use( } // 兼容服务端返回的字符串数据 if (typeof response.data === 'string') { - response.data = response.data ? JSON.parse(response.data) : response.data + response.data = response.data + ? JSON.parse(response.data) + : response.data } return response.data @@ -66,17 +71,14 @@ request.interceptors.response.use( duration: 3 }) return response.data - } } - }, - error => { + (error) => { console.log('err' + error) // for debug return Promise.reject(error) } - ) export default request diff --git a/src/views/videoMonitor/components/livePlayer.vue b/src/views/videoMonitor/components/livePlayer.vue index 7495a14..3031ce6 100644 --- a/src/views/videoMonitor/components/livePlayer.vue +++ b/src/views/videoMonitor/components/livePlayer.vue @@ -147,7 +147,7 @@ export default { left: 50%; transform: translate(-50%, -50%); z-index: 2; - background: url(../../../assets/icon-hza/bg_6.png); + background: url('@/assets/icon-hza/bg_6.png'); background-size: 100% auto; background-repeat: no-repeat; .live_card {