From a4ccb26ce25a05842d9573149603260b3fbadcbb Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 13 五月 2024 14:52:23 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/components/examinations/index.vue | 148 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 119 insertions(+), 29 deletions(-)
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 9adde9f..0329a7c 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="examination" v-loading="loading">
- <div v-for="(item, nindex) in cardList" :key="nindex">
+ <div v-for="(item, nindex) in cardList" :key="nindex" class="border-box">
<p class="catalogName">
<span v-if="nindex == 0">涓�銆�</span>
<span v-if="nindex == 1">浜屻��</span>
@@ -18,7 +18,13 @@
<!-- 鏍囬 -->
<div class="questionTitle">
<div class="titleContent">
- <span class="questionNum" :style="{marginTop:value.questionType == 'completion' ? '12px' : '0'}">{{ index + 1 }}銆�</span>
+ <span
+ class="questionNum"
+ :style="{
+ marginTop: value.questionType == 'completion' ? '12px' : '0',
+ }"
+ >{{ index + 1 }}. </span
+ >
<!-- 鍚姏杩涘害鏉� -->
<!-- <answerAudioPlayer :audioUrl="value.src" v-show="item.name == '鍚姏棰�'" /> -->
<!-- 棰樺共 -->
@@ -57,7 +63,7 @@
v-for="(itemText, indexText) in value.stem"
:key="indexText"
>
- <span v-if="typeof itemText == 'string'">{{ itemText }}</span>
+ <span v-if="typeof itemText == 'string'" >{{ itemText }}</span>
<!-- -->
<el-input
v-else
@@ -269,11 +275,11 @@
<div class="headerConent sitgBox">
<p v-if="!value.isUnfold">
<span class="analysisColor">鏌ョ湅瑙ｆ瀽</span
- ><el-image :src="chakanIcon" />
+ ><el-image />
</p>
<p v-else>
<span class="analysisColor">鏀惰捣瑙ｆ瀽</span
- ><el-image :src="packIcon" />
+ ><el-image />
</p>
</div>
</div>
@@ -353,10 +359,20 @@
</div>
<div class="bottom-btn" v-if="!loading">
- <el-button>淇濆瓨</el-button>
- <el-button @click="openAnswers">鎻愪氦</el-button>
- <el-button @click="redo">閲嶅仛</el-button>
- <el-button @click="openAnswers">鏌ョ湅绛旀</el-button>
+ <el-button style="height: 34px; padding: 4px 10px">淇濆瓨</el-button>
+ <el-button
+ @click="handleQuestion"
+ style="border-color: #1eb9ee; height: 34px; padding: 4px 10px"
+ >鎻愪氦</el-button
+ >
+ <el-button @click="redo" style="height: 34px; padding: 4px 10px"
+ >閲嶅仛</el-button
+ >
+ <el-button
+ @click="openAnswers"
+ style="border-color: #1eb9ee; height: 34px; padding: 4px 10px"
+ >鏌ョ湅绛旀</el-button
+ >
</div>
</div>
</template>
@@ -374,7 +390,7 @@
};
},
mounted() {
- this.getIdPathList()
+ this.getIdPathList();
},
methods: {
// 鏁扮粍杞负瀛楃涓叉柟娉�
@@ -424,7 +440,7 @@
// }
},
openAnswers() {
- this.$data.loading = true
+ this.$data.loading = true;
for (let index = 0; index < this.cardList.length; index++) {
const item = this.cardList[index];
for (let cindex = 0; cindex < item.infoList.length; cindex++) {
@@ -432,7 +448,7 @@
citem.isComplete = true;
}
}
- this.$data.loading = false
+ this.$data.loading = false;
},
watchParsing(data) {
data.isUnfold = !data.isUnfold;
@@ -444,14 +460,14 @@
path: "*",
queryType: "*",
productId: this.config.bookId,
- cmsPath: '24080\\63791\\63792\\63807',
+ cmsPath: "24080\\63791\\63792\\63807",
pading: {
start: 0,
size: 999,
},
};
this.MG.store.getProductDetail(query).then(async (res) => {
- console.log(this.$props.productLinkPath,res.datas.cmsDatas[0].datas);
+ console.log(this.$props.productLinkPath, res.datas.cmsDatas[0].datas);
const idPathList = res.datas.cmsDatas[0].datas;
await this.getQuestionList(idPathList);
});
@@ -680,6 +696,57 @@
});
}
},
+ // 鎵规敼棰樼洰 (缁冧範,鎴戠殑鍋氶,鎴戠殑鏀惰棌妯″紡涓�)
+ handleQuestion() {
+ const list = this.$data.cardList
+ for (let index = 0; index < list.length; index++) {
+ const item = list[index];
+ for (let cindex = 0; cindex < item.infoList.length; cindex++) {
+ const citem = item.infoList[cindex];
+ citem.isComplete = true;
+ // 淇敼棰樼洰鐘舵�佷负瀹屾垚
+ citem.isComplete = true;
+ // 鎵规敼棰樼洰
+ if (citem.questionType == "multipleChoice") {
+ // 澶氶�夐
+ if (citem.answer.length == citem.userAnswer.length) {
+ const sortedArr1 = citem.answer.slice().sort();
+ const sortedArr2 = citem.userAnswer.slice().sort();
+ citem.isRight = sortedArr1.every(
+ (value, index) => value === sortedArr2[index]
+ );
+ } else {
+ citem.isRight = false;
+ }
+ } else if (
+ citem.questionType == "singleChoice" ||
+ citem.questionType == "judge"
+ ) {
+ if(citem.id == '63825') console.log('i',item);
+ citem.isRight = citem.answer == citem.userAnswer;
+ } else if (citem.questionType == "shortAnswer") {
+ // 绠�绛� 缈昏瘧
+ citem.isRight = null;
+ } else if (citem.questionType == "completion") {
+ // 濉┖
+ if (typeof citem.answer == "string") {
+ citem.isRight = citem.answer == citem.userAnswer[0];
+ } else {
+ if (citem.answer.length != citem.userAnswer.length) {
+ citem.isRight = false;
+ } else {
+ citem.isRight = citem.answer.every(
+ (value, index) =>
+ value === citem.userAnswer[index]
+ );
+ }
+ }
+ }
+ }
+
+ }
+ this.$data.cardList = list
+ },
},
};
</script>
@@ -688,12 +755,29 @@
.catalogName {
color: #00aeef;
text-indent: 1em !important;
- font-size: 24px;
+ font-size: 16px;
}
.examination {
min-height: 100px;
ul {
- list-style:none ;
+ list-style: none;
+ }
+}
+.border-box {
+ border: 2px solid #e9e9e9;
+ border-top: 0;
+}
+.border-box:first-child {
+ border-top:2px solid #e9e9e9 ;
+}
+.questionContent {
+ // display: flex;
+ // justify-content: flex-start;
+ margin-left: -36px;
+}
+.input {
+ /deep/ .el-input__inner {
+ height: 26px;
}
}
p {
@@ -747,9 +831,9 @@
padding-left: 12px;
display: flex;
align-items: center;
- font-size: 14px;
+ font-size: 16px;
.questionText {
- font-size: 14px;
+ font-size: 16px;
color: #000;
}
span {
@@ -776,19 +860,19 @@
text-align: left;
padding: 0 10px 10px 0px;
min-width: 90%;
- font-size: 14px;
+ font-size: 16px;
line-height: 32px;
color: #000;
span {
display: inline-block;
- font-size: 14px;
+ font-size: 16px;
// line-height: 26px;
color: #000;
font-weight: 400;
margin-top: 6px;
}
.el-input {
- width: 150px;
+ width: 140px;
height: 24px;
border-top: 0;
}
@@ -799,7 +883,7 @@
border-top: 0 !important;
border-left: 0 !important ;
border-right: 0 !important ;
- border-bottom: 1px solid #000 !important;
+ border-bottom: 1px solid #15c0f2 !important;
border-radius: 0 !important;
}
/deep/ .el-input.is-disabled .el-input__inner {
@@ -832,11 +916,15 @@
align-items: center;
min-width: 45%;
margin-right: 50px;
+ margin-bottom: 6px;
white-space: pre-wrap !important;
color: #000;
/deep/ .el-checkbox__label {
line-height: 1.5;
}
+ }
+ /deep/ .el-radio__inner {
+ border-color: #a5a3a3;
}
.optionContent {
margin: 0;
@@ -848,6 +936,8 @@
}
.analysis {
margin: 20px 0;
+ width:550px;
+ margin-left: 48px;
}
.el-collapse {
width: 100%;
@@ -858,7 +948,7 @@
min-height: 48px;
height: min-content;
padding: 0 20px;
- font-size: 14px;
+ font-size: 16px;
background-color: #f4f4f4;
.headerBox {
width: 100%;
@@ -908,7 +998,7 @@
}
.errorBox {
width: 100px;
- height: 48px;
+ // height: 48px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -934,10 +1024,10 @@
color: #333;
}
/deep/ .el-collapse-item__content {
- width: 100%;
+ width: 93%;
padding: 0 20px;
background-color: #f4f4f4;
- font-size: 14px;
+ font-size: 16px;
color: #333;
}
/deep/ .el-collapse-item__arrow {
@@ -956,7 +1046,7 @@
background-color: #f4f4f4;
width: 100%;
padding: 0 20px;
- font-size: 14px;
+ font-size: 16px;
display: flex;
flex-direction: column;
justify-content: flex-start;
@@ -1007,7 +1097,7 @@
span,
p {
text-indent: 0em;
- font-size: 14px;
+ font-size: 16px;
line-height: 20px;
}
}
@@ -1148,7 +1238,7 @@
}
.bottom-btn {
- margin-top: 50px;
+ margin-top: 25px;
display: flex;
justify-content: center;
flex-wrap: wrap;
--
Gitblit v1.9.1