|
|
@@ -301,7 +301,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="ans_submit answerInfos" v-if="bank.ques[ansIndex] || bank.ques[ansIndex].imageList.length || bank.ques[ansIndex].text">
|
|
|
+ <view class="ans_submit answerInfos" v-if="bank.ques[ansIndex] && (bank.ques[ansIndex].imageList.length || bank.ques[ansIndex].text)">
|
|
|
<view class="answerTitle">我的答案</view>
|
|
|
{{ bank.ques[ansIndex].text || ''}}
|
|
|
<view class="imgs">
|
|
|
@@ -424,6 +424,8 @@
|
|
|
? `您还有${lastCount}道题未作答， 现在继续作答，还是下次继续？`
|
|
|
: cgType === 6
|
|
|
? `您还有${lastCount}道题未作答， 您确定要交卷吗？`
|
|
|
+ : cgType == 9
|
|
|
+ ? `您已完成所有题目，快去交卷吧！？`
|
|
|
: ''
|
|
|
}}
|
|
|
</view>
|
|
|
@@ -439,6 +441,10 @@
|
|
|
<view class="btnsty btns1" @click="backPages()">下次继续</view>
|
|
|
<view class="btnsty btns2" @click="showpopups = false">继续作答</view>
|
|
|
</view>
|
|
|
+ <view class="classFootsty" v-if="cgType === 9">
|
|
|
+ <view class="btnsty btns1" @click="showpopups = false">暂不交卷</view>
|
|
|
+ <view class="btnsty btns2" @click="submit">立即交卷</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
</view>
|
|
|
@@ -637,7 +643,8 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
} else if (jsonItem.type == 5) {
|
|
|
- if (item.ques[indexs] && (item.ques[indexs].text.length || item.ques[indexs].imageList.length)) {
|
|
|
+ if (item.ques[indexs] && (item.ques[indexs].text || item.ques[indexs].imageList.length)) {
|
|
|
+ console.log('chil')
|
|
|
return true;
|
|
|
} else {
|
|
|
return false;
|
|
|
@@ -654,7 +661,8 @@ export default {
|
|
|
//简答题
|
|
|
if(hasSpecail) {
|
|
|
|
|
|
- if (item.ansText && (item.ansText.text.length || item.ansText.imageList.length)) {
|
|
|
+ if (item.ques && (item.ques.text || item.ques.imageList.length)) {
|
|
|
+ console.log(5,item)
|
|
|
count++;
|
|
|
}
|
|
|
}
|
|
|
@@ -663,6 +671,16 @@ export default {
|
|
|
|
|
|
return count;
|
|
|
},
|
|
|
+ /**
|
|
|
+ * 是否做完所有题目
|
|
|
+ */
|
|
|
+ isDoOver() {
|
|
|
+ let questionOverNum = this.questionOverNum(true); //获取已经回答的题目数(包括简答和案例)
|
|
|
+ if(this.questionList.length == questionOverNum) { //全部做完弹窗
|
|
|
+ this.cgType = 9;
|
|
|
+ this.showpopups = true;
|
|
|
+ }
|
|
|
+ },
|
|
|
/**
|
|
|
* 暂不交卷
|
|
|
*/
|
|
|
@@ -1109,7 +1127,7 @@ export default {
|
|
|
ansArr[index] = json.answerQuestion;
|
|
|
} else if (json.type == 5) {
|
|
|
ansArr[index] = {
|
|
|
- text: '',
|
|
|
+ text: json.answerQuestion,
|
|
|
imageList: []
|
|
|
};
|
|
|
json.ansText = {
|
|
|
@@ -1139,6 +1157,7 @@ export default {
|
|
|
radioSelect(optionsId, bindex) {
|
|
|
if (this.questionList[bindex].ques) return;
|
|
|
this.$set(this.questionList[bindex], 'ques', optionsId);
|
|
|
+ this.isDoOver();
|
|
|
|
|
|
// 回答错误
|
|
|
if (this.questionList[bindex].ques != this.questionList[bindex].ans) {
|
|
|
@@ -1171,6 +1190,7 @@ export default {
|
|
|
radioSelectChild(optionsId, ansIndex, bindex) {
|
|
|
if (this.questionList[bindex].ques[ansIndex]) return;
|
|
|
this.$set(this.questionList[bindex].ques, ansIndex, optionsId);
|
|
|
+ this.isDoOver();
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -1200,6 +1220,7 @@ export default {
|
|
|
});
|
|
|
|
|
|
this.$set(this.questionList[bindex], 'ques', arr);
|
|
|
+ this.isDoOver();
|
|
|
|
|
|
let isWrong = this.questionList[bindex].ques.some((quesItem, quesIndex) => {
|
|
|
return this.questionList[bindex].ques[quesIndex] != this.questionList[bindex].ans[quesIndex];
|
|
|
@@ -1242,6 +1263,7 @@ export default {
|
|
|
});
|
|
|
|
|
|
this.$set(this.questionList[bindex].ques, ansIndex, arr);
|
|
|
+ this.isDoOver();
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -1252,6 +1274,7 @@ export default {
|
|
|
judgeSelect(index, bindex) {
|
|
|
if (this.questionList[bindex].ques) return;
|
|
|
this.$set(this.questionList[bindex], 'ques', index + '');
|
|
|
+ this.isDoOver();
|
|
|
// 回答错误
|
|
|
if (this.questionList[bindex].ques != this.questionList[bindex].ans) {
|
|
|
this.$api
|
|
|
@@ -1286,6 +1309,7 @@ export default {
|
|
|
judgeSelectChild(ansindex, childindex, bindex) {
|
|
|
if (this.questionList[bindex].ques[ansindex]) return;
|
|
|
this.$set(this.questionList[bindex].ques, ansindex, childindex + '');
|
|
|
+ this.isDoOver();
|
|
|
},
|
|
|
|
|
|
openFooterTab() {
|
|
|
@@ -1752,6 +1776,7 @@ export default {
|
|
|
imageList: this.questionList[bankindex].ansText.imageList || [],
|
|
|
text: this.questionList[bankindex].ansText.text || ''
|
|
|
});
|
|
|
+ this.isDoOver()
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -1773,6 +1798,7 @@ export default {
|
|
|
imageList: this.questionList[bankindex].jsonStr[ansindex].ansText.imageList || [],
|
|
|
text: this.questionList[bankindex].jsonStr[ansindex].ansText.text || ''
|
|
|
});
|
|
|
+ this.isDoOver()
|
|
|
},
|
|
|
|
|
|
isRight(item, index) {
|
chenxiong