tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2025-12-11 10:36:36 +08:00
parent bb1cfdbf33 8246b06811
commit 7332d9ec9c
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.yh
+2 -2
View File
@@ -4,8 +4,8 @@ ENV = 'development.yh'
# 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.91: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'
src/pages/analytics/study.vue
+7 -1
View File
@@ -131,7 +131,7 @@
<CommonLoading color="#06f" class="loading-box" />
</view>
<view class="evaluation-box study1" v-if="!loading3">
<view class="study1-item">
<view class="study1-item" v-show="!!suggestObj.content">
<view class="item-cont study3-bg">{{suggestObj.content}}</view>
</view>
</view>
@@ -238,6 +238,8 @@
common.msg('学习分析生成中，请稍后再试！')
}
const getInfoNow = async (params) => {
statisticsObj.value = []
dimesionList.value =[]
loading.value = true
loading2.value = true
loading1.value = true
@@ -267,6 +269,10 @@
suggestObj.value = {
..._res4.body[0]
}
}else{
suggestObj.value = {
content: ''
}
}
loading3.value = false
}).catch(() => {
src/pages/sparring/result.vue
+1 -2
View File
@@ -296,8 +296,7 @@
const isOver = ref(false)
const goBack = () => {
if (isOver.value) {
console.log(3)
common.navigateBack(3)
common.navigateBack(2)
} else {
common.navigateBack()
}
src/pages/sparring/tip.vue
+14 -6
View File
@@ -69,6 +69,7 @@
<!-- sceneDesc -->
{{ detailInfo.sceneDesc }}
</view>
<view class="talking-desc">陪练角色不具备主动终止场景陪练的功能，当用户完成预设陪练目标时，需由用户手动发起结束陪练操作。</view>
<view class="talking-box" v-if="detailInfo.traInterTyp !== '01'">
<view class="tip-text">-请点击下方按钮开始{{ detailInfo.traInterTypDesc }}</view>
</view>
@@ -259,7 +260,7 @@
traInterTyp: detailInfo.value.traInterTyp,
traInterTypDesc: detailInfo.value.traInterTypDesc,
});
common.navigateTo(
common.redirectTo(
'/pages/sparring/talk?traId=' +
traId.value +
'&chaId=' +
@@ -331,7 +332,7 @@
reconcatNum.value += 1;
// common.redirectTo(`/pages/index/dialog`);
socketStore?.closeSocket();
common.navigateTo(
common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -466,7 +467,8 @@
if (commond === 'ASK-OVER') {
console.log(body);
console.log('陪练已结束，去结果页面！');
common.navigateTo(
socketStore?.closeSocket();
common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -528,7 +530,7 @@
});
socketStore?.closeSocket();
changePlayItemId('');
common.navigateTo(
common.redirectTo(
'/pages/sparring/result?isOver=1&traId=' +
traId.value +
'&execId=' +
@@ -539,7 +541,7 @@
(isPreview.value ? '1' : '')
);
// pointAndBadgesRun(talkingType.value === '01'? '07': '08', '', ()=>{
// common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
// common.redirectTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
// })
})
.catch(() => {
@@ -890,7 +892,13 @@
text-align: center;
}
}
.talking-desc{
// padding-top: 24rpx;
padding: 24rpx 20rpx 0;
font-size: 24rpx;
// text-align: center;
color: #999;
}
.talking-box {
padding-top: 24rpx;
.tip-text {