多选漏选也为错题

pages2/bank/questionBank.vue

@@ -836,10 +836,11 @@ export default {
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
-							number++;
+							// number++;
+							doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
-							rightQuestionIds.push(item.questionId)
+							// rightQuestionIds.push(item.questionId)
 						}
 					}
 					allScore += item.score;
@@ -999,7 +1000,7 @@ export default {
 							if(checkboxScore <= 0) { //0分
 							
 							} else { //部分分
-								number++;
+								// number++;
 								score += checkboxScore;
 							}
 						}
@@ -1546,10 +1547,11 @@ export default {
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
-							number++;
+							// number++;
+							doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
-							rightQuestionIds.push(item.questionId)
+							// rightQuestionIds.push(item.questionId)
 						}
 					}
 					allScore += item.score;
@@ -1901,8 +1903,8 @@ export default {
 					//多选
 				} else if (item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item, i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item, i) => {
+						return item == this.questionList[index].ques[i];
 					});
 					//判断
 				} else if (item.type == 3) {
@@ -1953,8 +1955,8 @@ export default {
 					//多选
 				} else if (item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item, index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item, i) => {
+						return item != this.questionList[index].ques[i];
 					});
 					//判断
 				} else if (item.type == 3) {

pages2/bank/questionBankAllExplain.vue

@@ -448,9 +448,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						console.log(item == this.questionList[index].ans[i])
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -500,8 +499,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,i) => {
-						return item != this.questionList[index].ans[i];
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/questionBankContinue.vue

@@ -850,10 +850,11 @@ export default {
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
-							number++;
+							// number++;
+							doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
-							rightQuestionIds.push(item.questionId)
+							// rightQuestionIds.push(item.questionId)
 						}
 					}
 					allScore += item.score;
@@ -1102,10 +1103,11 @@ export default {
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
-							number++;
+							// number++;
+							doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
-							rightQuestionIds.push(item.questionId)
+							// rightQuestionIds.push(item.questionId)
 						}
 					}
 					allScore += item.score;
@@ -1388,9 +1390,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						console.log(item == this.questionList[index].ans[i])
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -1440,8 +1441,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,i) => {
-						return item != this.questionList[index].ans[i];
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/questionBankExplain.vue

@@ -454,9 +454,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						console.log(item == this.questionList[index].ans[i])
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -506,8 +505,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,i) => {
-						return item != this.questionList[index].ans[i];
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/questionBankExplainDetail.vue

@@ -1331,9 +1331,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						console.log(item == this.questionList[index].ans[i])
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -1383,8 +1382,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,i) => {
-						return item != this.questionList[index].ans[i];
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/questionBankTest.vue

@@ -932,8 +932,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -983,8 +983,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/questionBankWrongExplain.vue

@@ -463,9 +463,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						console.log(item == this.questionList[index].ans[i])
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -515,8 +514,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,i) => {
-						return item != this.questionList[index].ans[i];
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/bank/question_record.vue

@@ -43,23 +43,8 @@
 						<view class="btn" v-if="record.status == 1">解析</view>
 					</navigator>
 					<navigator  hover-class="none" :url="'/pages2/bank/question_report?goodsId='+record.goodsId+'&chapterId='+record.chapterExamId+'&moduleId='+record.moduleExamId+'&examId='+record.examId+'&id=' + record.recordId"><view class="btn" v-if="record.status == 1">报告</view></navigator>
-					<navigator
-						:url="
-							'/pages2/bank/questionBankContinue?recordId=' +
-								record.recordId +
-								'&id=' +
-								record.examId +
-								'&goodsid=' +
-								record.goodsId +
-								'&moduleId=' +
-								record.moduleExamId +
-								'&chapterId=' +
-								record.chapterExamId +
-								''
-						"
-					>
-						<view class="btn continue" v-if="record.status == 0 && record.historyExamJson">继续答题</view>
-					</navigator>
+
+					<view class="btn continue" @click="doContinue(record,index)" v-if="record.status == 0 && record.historyExamJson">继续答题</view>
 				</view>
 			</view>
 		</view>
@@ -101,6 +86,7 @@ export default {
 				pageNum: 1,
 				pageSize: 10
 			},
+			isRepeat:false,
 			total: 0,
 			activeIndex: 0,
 			typeIndex:0,
@@ -130,17 +116,32 @@ export default {
 		}
 	},
 	onShow() {
-		if(this.itemIndex !== '') {
-			this.refreshByIndex();
+		if(this.isRepeat) {
+			this.addRecord();
+		} else {
+			if(this.itemIndex !== '') {
+				this.refreshByIndex();
+			}
 		}
+		
 	},
 	methods: {
+		addRecord() {
+			this.$api.examRecordList({
+				pageNum: 1,
+				pageSize: 1
+			}).then(res => {
+				this.recordList.unshift(res.data.rows[0])
+			});
+			this.isRepeat = false;
+		},
 		refreshByIndex() {
 			this.$api.examRecordList({
 				pageNum: this.itemIndex+1,
 				pageSize: 1
 			}).then(res => {
 				this.$set(this.recordList,this.itemIndex,res.data.rows[0])
+				this.itemIndex = ''
 			});
 		},
 		getExamRecordList() {
@@ -152,12 +153,32 @@ export default {
 				this.total = res.data.total;
 			});
 		},
+		/**
+		 * 继续做题
+		 */
+		doContinue(record,index) {
+			this.itemIndex = index;
+			this.isRepeat = false;
+			uni.navigateTo({
+				url:'/pages2/bank/questionBankContinue?recordId=' +
+						record.recordId +
+						'&id=' +
+						record.examId +
+						'&goodsid=' +
+						record.goodsId +
+						'&moduleId=' +
+						record.moduleExamId +
+						'&chapterId=' +
+						record.chapterExamId
+			})
+		},
 		/**
 		 * 去做题
 		 */
 		async doRepeat(id, goodsId, moduleId = 0, chapterId = 0,index) {
 			// await this.getDetail(goodsId);
-			this.itemIndex = index;
+			this.itemIndex = '';
+			this.isRepeat = true;
 			let count = await this.examRecordCount(id,goodsId);
 			let answerNum = await this.getExamDetail(id);
 			//超过答题次数
@@ -292,22 +313,21 @@ page {
 .record {
 	margin-top: 80rpx;
 	padding: 16rpx 8rpx;
-	-moz-column-count: 2; /* Firefox */
-	-webkit-column-count: 2; /* Safari 和 Chrome */
-	column-count: 2;
-	-moz-column-gap: 16rpx;
-	-webkit-column-gap: 16rpx;
-	column-gap: 16rpx;
+	display: flex;
+	flex-wrap: wrap;
 	.item {
 		margin-bottom: 16rpx;
-		-moz-page-break-inside: avoid;
-		-webkit-column-break-inside: avoid;
-		break-inside: avoid;
+		width:359rpx;
 		background: #ffffff;
 		border-radius: 16rpx;
 		padding: 65rpx 20rpx 22rpx;
 		position: relative;
 		overflow: hidden;
+		
+		&:nth-of-type(2n) {
+			margin-left:16rpx;
+			
+		}
 
 		.note {
 			color: #fff;

pages2/bank/question_report.vue

@@ -260,7 +260,10 @@ export default {
 				return;
 			}
 
-			uni.navigateTo({
+			var pages = getCurrentPages();
+			var prepage = pages[pages.length - 2]; //上一个页面
+			prepage.$vm.isRepeat = true;
+			uni.redirectTo({
 				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + ''
 			});
 		},

pages2/class/questionBank.vue

@@ -1165,7 +1165,7 @@ export default {
 							} else {
 								item.scoreResult = checkboxScore;
 								score += checkboxScore;
-								number++;
+								// number++;
 							}
 						}
 
@@ -1636,10 +1636,11 @@ export default {
 							item.scoreResult = 0;
 							doWrongQuestionIds.push(item.questionId)
 						} else { //部分分
-							number++;
+							// number++;
+							doWrongQuestionIds.push(item.questionId)
 							item.scoreResult = checkboxScore;
 							score += checkboxScore;
-							rightQuestionIds.push(item.questionId)
+							// rightQuestionIds.push(item.questionId)
 						}
 					}
 					allScore += item.score;
@@ -1941,8 +1942,8 @@ export default {
 					//多选
 				} else if (item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item, i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item, i) => {
+						return item == this.questionList[index].ques[i];
 					});
 					//判断
 				} else if (item.type == 3) {
@@ -1993,8 +1994,8 @@ export default {
 					//多选
 				} else if (item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item, index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item, i) => {
+						return item != this.questionList[index].ques[i];
 					});
 					//判断
 				} else if (item.type == 3) {

pages2/subject/collectBank.vue

@@ -809,8 +809,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -860,8 +860,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/subject/collectTypeBank.vue

@@ -809,8 +809,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -860,8 +860,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/subject/wrongBank.vue

@@ -964,8 +964,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -1015,8 +1015,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {

pages2/subject/wrongTypeBank.vue

@@ -849,8 +849,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.every((item,i) => {
-						return item == this.questionList[index].ans[i];
+					return this.questionList[index].ans.every((item,i) => {
+						return item == this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {
@@ -900,8 +900,8 @@ export default {
 				//多选
 				} else if(item.type == 2) {
 					//每一项都相等
-					return this.questionList[index].ques.some((item,index) => {
-						return item != this.questionList[index].ans;
+					return this.questionList[index].ans.some((item,i) => {
+						return item != this.questionList[index].ques[i];
 					})
 				//判断
 				} else if(item.type == 3) {