diff --git a/.env.development.yh b/.env.development.yh index 2b8b529b..95d4857d 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,10 +2,10 @@ ENV = 'development.yh' # 'development.yh' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' diff --git a/src/api/sparring.js b/src/api/sparring.js index 2b9c8f05..d34cc3ee 100644 --- a/src/api/sparring.js +++ b/src/api/sparring.js @@ -62,6 +62,7 @@ export const partnerChatReportTrigger = (data) => { export const partnerChatPrompt = (data) => { return request({ url: base_url + '/traPartnerChat/partnerChatPrompt', + timeout: 60000, method: 'post', data }); diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue index 64a62a9a..429f1f15 100644 --- a/src/pages/analytics/study.vue +++ b/src/pages/analytics/study.vue @@ -16,6 +16,8 @@ :current="currentTab" class="font_pf my_tabs" :inactive-style="{ color: '#333333', fontSize: '28rpx', fontWeight: '500' }" :activeStyle="{ color: '#333333', fontSize: '28rpx', fontWeight: '600' }"> + + @@ -229,6 +231,12 @@ const loading2 = ref(false) const loading3 = ref(false) const loading4 = ref(false) + const overLoading = computed(()=>{ + return !loading.value && !loading1.value && !loading2.value && !loading3.value && !loading4.value + }) + const showToast = () => { + common.msg('学习分析生成中,请稍后再试!') + } const getInfoNow = async (params) => { loading.value = true loading2.value = true @@ -440,6 +448,17 @@ .tabs-box { width: 600rpx; + height: 88rpx; + position: relative; + .tab-btn{ + position: absolute; + width: 600rpx; + height: 88rpx; + top: 0; + left: 0; + z-index: 23; + // background-color: #ccc; + } } .analytics-items {