diff --git a/src/api/home.js b/src/api/home.js index d65e8b5..17b0560 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -13,7 +13,7 @@ export function getVideoListApi(data) { return request({ url: '/api/largeScreen/video/list', method: 'post', - params: data + data }) } diff --git a/src/api/request.js b/src/api/request.js index 51fa072..95661c3 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -14,11 +14,11 @@ const router = useRouter() */ const instance = axios.create({ // baseURL: 'http://36.138.38.16:6180/fjtcc-api', - // baseURL: 'http://36.138.38.16:8001/fjtcc-api', - baseURL: ' http://172.22.15.170/fjtcc-api', + baseURL: 'http://36.138.38.16:8001/fjtcc-api', + // baseURL: 'http://172.22.15.170/fjtcc-api', timeout: 100000, headers: { - Authorization: proToken, + Authorization: devToken, 'Content-Type': 'application/json;charset=UTF-8' } }) diff --git a/src/components/CoreVideo/index.vue b/src/components/CoreVideo/index.vue index ee565d2..a2da096 100644 --- a/src/components/CoreVideo/index.vue +++ b/src/components/CoreVideo/index.vue @@ -50,6 +50,7 @@ let res = await getVideoListApi({ businessVideoDisplayPosition: '' }) + console.log(res, '============') list.value = res.data nextTick(() => { list.value.forEach(async (item, index) => { diff --git a/src/components/Line/index.vue b/src/components/Line/index.vue index ad57f47..e320b8c 100644 --- a/src/components/Line/index.vue +++ b/src/components/Line/index.vue @@ -62,7 +62,7 @@ } } } - let defaultConfig = { + const defaultConfig = { colors: defaultColors, tooltip: { trigger: 'axis', @@ -168,7 +168,7 @@ if (val[0].length > 0 && val[1].length > 0) { setTimeout(() => { updateOption() - }, 500) + }, 1000) } }, { immediate: true } diff --git a/src/views/home/components/age.vue b/src/views/home/components/age.vue index 572f0c7..d343f29 100644 --- a/src/views/home/components/age.vue +++ b/src/views/home/components/age.vue @@ -5,20 +5,29 @@