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

JLBA202505130001_关于吉林银行新建AI智能培训系统的需求_合并subject文件冲突

Browse Source
This commit is contained in:
田岩
2026-01-19 14:10:49 +08:00
parent 0e03b9b3ed c1e0fe2f01
commit f56f70e91f
6 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/examination/subject.vue
+10 -10
View File
@@ -2,7 +2,7 @@
<view class="item" :class="{'no-touch':qnsTyp === 'ES' && !isDisabled && ['examination', 'practice', 'mistake_in', 'pk_in'].includes(props.mode)}">
<view class="top">
<!-- v-if="!['study'].includes(props.mode)" -->
<view class="type" v-if="!['study_answer'].includes(props.mode)">{{ subject_type_text }}</view>
<view class="type" v-if="!['study_answer', 'study_record'].includes(props.mode)">{{ subject_type_text }}</view>
<view class="score" v-if="['settlement', 'examination', 'pk_in'].includes(props.mode)">
{{ item.tgtGrade }}分
</view>
@@ -44,14 +44,13 @@
</template>
</view>
</view>
<view class="question_text" v-if="!['study_answer'].includes(props.mode)">
<view class="question_text" v-if="!['study_answer', 'study_record'].includes(props.mode)">
{{ subject_data.qnsContent }}
</view>
<view :style="{ height: animationHeight }" :class="{ collapse_wrapper: props.mode === 'mistake' }" ref="wrapperRef">
<view class="collapse-content" ref="contentRef">
<view class="option_div" v-if="!['study_answer'].includes(props.mode)">
<view class="option_div" v-if="!['study_answer', 'study_record'].includes(props.mode)">
<template v-if="qnsTyp === 'ES'">
<questionVue
:status="subject_data.es_status"
:dataInfo="props.item?.my_answer"
@@ -75,7 +74,7 @@
class="option_div_button"
v-if="
qnsTyp === 'MU' &&
['practice', 'study', 'study_answer', 'pk_in', 'mistake_in'].includes(props.mode) &&
['practice', 'study', 'study_answer', 'study_record', 'pk_in', 'mistake_in'].includes(props.mode) &&
!props.isPreview &&
clearResult
"
@@ -96,7 +95,7 @@
class="analysis_div"
v-if="
!clearResult &&
['study', 'study_answer', 'mistake', 'settlement', 'practice', 'mistake_in', 'practice_record', 'pk_in'].includes(props.mode)
['study', 'study_answer', 'study_record', 'mistake', 'settlement', 'practice', 'mistake_in', 'practice_record', 'pk_in'].includes(props.mode)
"
>
<view class="analysis_title" v-if="qnsTyp !== 'ES'">
@@ -106,7 +105,7 @@
<text :class="right_or_wrong_class ? 'success' : 'error'">{{ myResultLabel.join('') }}</text>
</view>
</view>
<view class="reference_answer" v-if="qnsTyp === 'ES' && !['study', 'study_answer'].includes(props.mode)">
<view class="reference_answer" v-if="qnsTyp === 'ES' && !['study', 'study_answer', 'study_record'].includes(props.mode)">
<view class="reference_answer_title">你的答案：</view>
{{ subject_data.anserResult ?? '' }}
</view>
@@ -171,7 +170,7 @@
// 学习: study
// 考试结算页 settlement
// 练习记录页 practice_record, 'practice_record'
return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'study_answer', 'settlement', 'practice_record', 'pk_in'].includes(
return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'study_answer', 'study_record', 'settlement', 'practice_record', 'pk_in'].includes(
value
);
}
@@ -318,7 +317,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','study_answer'].includes(props.mode)) {
if (!['study','study_answer', 'study_record'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'SN') {
@@ -332,7 +331,7 @@
// 多选直接插入
item_answer.value.push(analysisVo.itemId);
modelValue.value = item_answer.value;
if (!['study','study_answer'].includes(props.mode)) {
if (!['study','study_answer', 'study_record'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'JD') {
@@ -473,6 +472,7 @@
margin-top: 28rpx;
}
.reference_answer {
white-space: pre-line;
.reference_answer_title {
font-weight: 700;
font-size: 30rpx;
src/components/image-preview/image-preview.vue
+2 -2
View File
@@ -84,11 +84,11 @@
imgId: {
handler(newval, oldval) {
if (newval.indexOf('/') === 0) {
this.imgUrlShow = this.base_url + newval;
this.imgUrlShow = this.base_url + newval + '?tk=' + this.token;
return;
}
if (newval.indexOf('http') === 0) {
this.imgUrlShow = newval;
this.imgUrlShow = newval + '?tk=' + this.token;
return;
}
if (newval && this.watching) {