diff --git a/.env.development b/.env.development
index 4871a998..1767d8b3 100644
--- a/.env.development
+++ b/.env.development
@@ -15,8 +15,10 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
# VITE_APP_BASE_API_Url = 'http://192.168.108.129'
# dev
+
#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+
# sit
#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
diff --git a/.env.development.yh b/.env.development.yh
index 193ce295..e5b3101e 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -12,4 +12,5 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
+# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.32.157:9605'
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 1f02b0b4..4ccaf7c6 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -1,7 +1,8 @@
- {{ subject_type_text }}
+
+ {{ subject_type_text }}
{{ item.tgtGrade }}分
@@ -40,12 +41,12 @@
-
+
{{ subject_data.qnsContent }}
-
+
@@ -72,7 +73,7 @@
class="option_div_button"
v-if="
qnsTyp === 'MU' &&
- ['practice', 'study', 'pk_in', 'mistake_in'].includes(props.mode) &&
+ ['practice', 'study', 'study_answer', 'pk_in', 'mistake_in'].includes(props.mode) &&
!props.isPreview &&
clearResult
"
@@ -93,7 +94,7 @@
class="analysis_div"
v-if="
!clearResult &&
- ['study', 'mistake', 'settlement', 'practice', 'mistake_in', 'practice_record', 'pk_in'].includes(props.mode)
+ ['study', 'study_answer', 'mistake', 'settlement', 'practice', 'mistake_in', 'practice_record', 'pk_in'].includes(props.mode)
"
>
@@ -103,7 +104,7 @@
{{ myResultLabel.join('') }}
-
+
你的答案:
{{ subject_data.anserResult ?? '' }}
@@ -167,7 +168,7 @@
// 学习: study
// 考试结算页 settlement
// 练习记录页 practice_record, 'practice_record'
- return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'settlement', 'practice_record', 'pk_in'].includes(
+ return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'study_answer', 'settlement', 'practice_record', 'pk_in'].includes(
value
);
}
@@ -314,7 +315,7 @@
if (item_answer.value.includes(analysisVo.itemId)) {
item_answer.value = item_answer.value.filter((id) => id !== analysisVo.itemId);
modelValue.value = item_answer.value;
- if (!['study'].includes(props.mode)) {
+ if (!['study','study_answer'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'SN') {
@@ -328,7 +329,7 @@
// 多选直接插入
item_answer.value.push(analysisVo.itemId);
modelValue.value = item_answer.value;
- if (!['study'].includes(props.mode)) {
+ if (!['study','study_answer'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'JD') {
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index f2e54504..aad428d1 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -33,11 +33,17 @@
-
+
参考答案:{{ dataInfo.itemAnswer }}
-
+
-
+
{{ type === 5 ? '试题解析:' : '' }}{{ showContent }}
- 问答题
+
{{ showContent }}
-
+ -->
-
@@ -324,10 +331,26 @@
return {
...dataInfo.value,
...(dataInfo.value?.traQnsInfoVo || {}),
- my_answer: dataInfo.value?.traQnsInfoVo?.anserResult || ''
+ my_answer: dataInfo.value?.traQnsInfoVo?.anserResult || '',
+ ...(props.type === 5?{
+ "qnsTyp": "ES",
+ my_answer: dataInfo.value,
+ itemVos: [{
+ ...dataInfo.value,
+ "qnsTyp": "ES",
+ "qnsId": dataInfo.value.qnsId,
+ "itemAnswer": dataInfo.value.itemAnswer,
+ "relKeyword": dataInfo.value.relKeyword,
+ anserResult:dataInfo.value?.traQnsInfoVo?.anserResult || '',
+ "evalSettingVos": dataInfo.value?.essayEvalVo,
+ }]
+ }:{})
+
};
});
- const mode = ref('study'); // 考试 examination 练习practice 学习study
+ const mode = computed(()=>{
+ return props.type == 5 ? 'study_answer' : 'study'
+ }); // 考试 examination 练习practice 学习study 学习结果study_answer
const imgAddrs = computed(()=>{
return (dataInfo.value.imageAddrs || [])
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 0f3a51a2..3e0fd12d 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -10,7 +10,7 @@
placeholder="请输入文字">
-
+
-
+
发送
@@ -51,10 +51,10 @@
-
+
-
+
@@ -231,7 +231,8 @@
}
audioPath.value = res.tempFilePath;
console.log(isOut.value, isOutLeft.value, isOutRight.value)
- if (!isOut.value) {
+ if (!isOut.value && (props.answerMethod !== '02')) {
+ console.log(11111111111)
if (startFlag.value !== 2) {
closeModel(() => {
nextTick(() => {
@@ -249,7 +250,7 @@
} else if (isOutLeft.value) {
console.log('取消')
closeModel();
- } else if (isOutRight.value) {
+ } else if (isOutRight.value || (props.answerMethod === '02')) {
console.log('转文本')
transLoading.value = true
commonUploadVoiceFile(audioPath.value, '/traapp/voice/voiceChart', {}).then(res => {
@@ -551,7 +552,7 @@
isMoving.value = false;
if (!showTalkingModel.value) return;
//#ifdef APP-PLUS
- transVoiceIng.value = isOutRight.value
+ transVoiceIng.value = isOutRight.value || (props.answerMethod === '02')
stopRecord();
// #endif
diff --git a/src/pages/course/components/touchBtn1.vue b/src/pages/course/components/touchBtnOnlyVoice.vue
similarity index 100%
rename from src/pages/course/components/touchBtn1.vue
rename to src/pages/course/components/touchBtnOnlyVoice.vue
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 20c28eae..4c87f03b 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -80,6 +80,20 @@
+ {
}
const answerOnlyVoice = computed(() => {
- return lastTalkingInfo.value.answerWay === 'V'
+ return lastTalkingInfo.value.answerWay === 'V' || (answerMethod.value === '03')
})
const canAnswerText = computed(() => {
diff --git a/src/pages/courseRecord/components/talkingItem.vue b/src/pages/courseRecord/components/talkingItem.vue
index 8d7b96cf..319016f6 100644
--- a/src/pages/courseRecord/components/talkingItem.vue
+++ b/src/pages/courseRecord/components/talkingItem.vue
@@ -31,10 +31,10 @@
{{ showContent }}
-
-
+
@@ -55,14 +55,14 @@
>
-
+
参考答案:{{ dataInfo.itemAnswer }}