From 0e579505f189e885aa8e994db87217e087918899 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 25 六月 2024 19:18:18 +0800
Subject: [PATCH] 英语bug修改
---
src/components/matching/matching.vue | 162 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 96 insertions(+), 66 deletions(-)
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index 875ff46..bcc4cc4 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -15,10 +15,9 @@
:key="index"
ref="left"
@mousedown="(e) => touchstart(e, item, index)"
- :style="{backgroundColor:bc}"
- >
- {{ item.label.txt }}
- </div>
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
+ v-html="item.label.txt"
+ ></div>
</div>
<div class="answer-box">
<div
@@ -26,10 +25,9 @@
v-for="(item, index) in rightArr"
:key="index"
ref="right"
- :style="{backgroundColor:bc}"
- >
- {{ item.label.txt }}
- </div>
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
+ v-html="item.label.txt"
+ ></div>
</div>
</div>
<canvas
@@ -48,17 +46,24 @@
<!-- 鎸夐挳 -->
<div class="btn-bottom">
<el-button @click="submitData">鎻愪氦</el-button>
- <el-button @click="saveData">淇濆瓨</el-button>
+ <el-button @click="saveData" :style="{ borderColor: bordercolor }"
+ >淇濆瓨</el-button
+ >
<el-button @click="redo">閲嶅仛</el-button>
- <el-button @click="handleAnswer">鏌ョ湅绛旀</el-button>
+ <el-button @click="handleAnswer" :style="{ borderColor: bordercolor }"
+ >鏌ョ湅绛旀</el-button
+ >
</div>
<!-- 瑙ｆ瀽 -->
<ul class="show-answer" v-if="isShowAnswer">
- <li v-if="isRight !== null">绛旀缁撴灉锛�<span v-if="isRight" style="color: #83e089;">姝ｇ‘</span> <span v-if="isRight == false" style="color:#d81e06">閿欒</span></li>
+ <li v-if="isRight !== null">
+ 绛旀缁撴灉锛�<span v-if="isRight" style="color: #83e089">姝ｇ‘</span>
+ <span v-if="isRight == false" style="color: #d81e06">閿欒</span>
+ </li>
<li class="show-answer-box">
<div>绛旀:</div>
<div>
- <img :src="item.answerImg" alt="" class="w100">
+ <img :src="question.answerImg" alt="" class="w100" />
</div>
</li>
</ul>
@@ -85,8 +90,8 @@
checkItemIndex: null,
isShowAnswer: false,
isRight: null,
- value:[],
- pageNum:null
+ value: [],
+ pageNum: null,
};
},
props: {
@@ -99,15 +104,19 @@
};
},
},
- item: {
+ question: {
type: Object,
default: () => {
return [];
},
},
- bc:{
+ primaryColor: {
+ type: String,
+ default: "#fff",
+ },
+ bordercolor:{
type:String,
- default:"#0bab87"
+ default:'#f49a4c'
}
},
watch: {
@@ -120,7 +129,7 @@
},
mounted() {
// 鑾峰彇褰撳墠椤电爜锛岀敤浜庡尮閰嶆湰娆″瓨鍌ㄩ鐩暟鎹�
- this.pageNum = this.handlePage()
+ this.pageNum = this.handlePage();
// 娣诲姞婊氬姩浜嬩欢 鐩戝惉 瑙ｅ喅鍥犱负婊氬姩寮曡捣鐨勬嫋鍔ㄧ嚎涓嶅鐨勯棶棰�
window.addEventListener(
"scroll",
@@ -142,7 +151,7 @@
this.$nextTick(() => {
this.drawing();
});
- this.getAnswer()
+ this.getAnswer();
},
methods: {
init() {
@@ -181,14 +190,16 @@
},
// 瑙︽懜缁撴潫
touchend(e, index) {
- console.log("鎶捣", e, this.checkItem);
this.isDragging = false;
- if (this.item.showAnswer) {
+ if (this.question.showAnswer) {
return false;
}
// let event = e.changedTouches[0];
// document.elementFromPoint 閲嶇偣锛屾牴鎹畑,y鍧愭爣 鍙栧綋鍓嶅厓绱� 鎵�鏈夎兘杩愯鐨勯�昏緫 閮戒緷鎵樹簬杩欓噷銆�
- let dom = document.elementFromPoint(e.pageX, e.pageY);
+ let dom = (this.container ? this.container : document).elementFromPoint(
+ e.pageX,
+ e.pageY
+ );
// 鍙宠竟鐨刣om鏄摢涓�
let right = this.rightDom.find((r) => r.bom === dom);
// 涓嶇鏄摢涓兘娓呴櫎鎺� 搴曢儴鐨勭嚎
@@ -219,13 +230,12 @@
})
.filter((r) => r.right !== undefined);
this.$emit("input", model);
- this.item.userChoise = model;
- console.log(JSON.stringify(model));
+ this.question.userChoise = model;
+ // console.log(JSON.stringify(model));
},
// 瑙︽懜寮�濮�
touchstart(e, item, index) {
this.isDragging = true;
- console.log("鎸変笅", e);
this.checkItem = item;
this.checkItemIndex = index;
e.stopPropagation();
@@ -239,7 +249,7 @@
// touchmove(e, item) {
// if(!this.isDragging) return false
// console.log('绉诲姩',e);
- // if (this.item.showAnswer) {
+ // if (this.question.showAnswer) {
// return false;
// }
// // let event = e.targetTouches[0];
@@ -251,10 +261,9 @@
// 绉诲姩涓�
mousemove(e) {
if (!this.isDragging) return false;
- if (this.item.showAnswer) {
+ if (this.question.showAnswer) {
return false;
}
- // console.log('绉诲姩',e);
this.checkItem.line[2] = e.pageX;
this.checkItem.line[3] =
e.pageY - this.$refs.connect.getBoundingClientRect().y + this.scrollTop;
@@ -282,8 +291,8 @@
canvasA.lineWidth = 2;
for (let i = 0; i < this.leftArr.length; i++) {
const line = this.leftArr[i].line;
- console.log(line);
- console.log(this.leftArr[i]);
+ // console.log(line);
+ // console.log(this.leftArr[i]);
if (line.length) {
canvasA.moveTo(line[0], line[1]);
canvasA.lineTo(line[2], line[3]);
@@ -330,37 +339,34 @@
// 鎻愪氦
submitData() {
const answerArr = [];
- const values = this.item.options.values;
+ const values = this.question.options.values;
for (let index = 0; index < values.length; index++) {
const item = values[index];
- const rightIndex = this.item.options.linkValues.findIndex(
+ const rightIndex = this.question.options.linkValues.findIndex(
(citem) => citem.oldId == item.oldId
);
+
answerArr.push({
left: index,
right: rightIndex,
});
}
- this.isRight = this.areArraysEqual(this.item.userChoise,answerArr)
- this.item.showAnswer = true
- console.log(
- "绛旀",
- answerArr,
- this.item.userChoise,
- this.isRight
- );
+ console.log(this.question.userChoise,answerArr);
+ this.isRight = this.areArraysEqual(this.question.userChoise, answerArr);
+ this.isShowAnswer = true;
},
// 鑾峰彇褰撳墠椤电爜
handlePage() {
- let pageNum = null
- const element = document.getElementsByClassName("matching")[0];
+ let pageNum = null;
+ const element = (
+ this.container ? this.container : document
+ ).querySelector("matching");
if (element) {
- pageNum = this.getParentWithClass(
- element,
- "page-box"
- ).getAttribute("page");
+ pageNum = this.getParentWithClass(element, "page-box").getAttribute(
+ "page"
+ );
}
- return pageNum
+ return pageNum;
},
getParentWithClass(element, className) {
while (element.parentElement) {
@@ -372,30 +378,38 @@
},
// 鑾峰彇鏈湴瀛樺偍棰樼洰绛旀
getAnswer() {
- const data = localStorage.getItem(this.config.activeBook.name + '-matching-' + this.pageNum)
- if(data) {
- this.value = JSON.parse(data)
+ const data = localStorage.getItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum
+ );
+ if (data) {
+ this.value = JSON.parse(data);
}
},
// 淇濆瓨
saveData() {
- if(this.item.userChoise.length)
- localStorage.setItem(this.config.activeBook.name + '-matching-' + this.pageNum,JSON.stringify(this.item.userChoise))
- console.log('淇濆瓨鎴愬姛',this.config.activeBook.name,this.pageNum);
+ if (this.question.userChoise.length)
+ localStorage.setItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum,
+ JSON.stringify(this.question.userChoise)
+ );
+ // console.log('淇濆瓨鎴愬姛',this.config.activeBook.name,this.pageNum);
},
// 閲嶅仛
redo() {
- this.item.showAnswer = false
- localStorage.removeItem(this.config.activeBook.name + '-matching-' + this.pageNum)
- this.value = []
+ this.question.showAnswer = false;
+ localStorage.removeItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum
+ );
+ this.value = [];
for (let index = 0; index < this.leftArr.length; index++) {
const item = this.leftArr[index];
- item.value = []
- item.line = []
+ item.value = [];
+ item.line = [];
}
- this.leftArr
- this.drawing()
- }
+ this.leftArr;
+ this.drawing();
+ this.isShowAnswer = false;
+ },
},
};
</script>
@@ -439,7 +453,7 @@
border-radius: 4px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
margin-bottom: 20px;
- line-height: 40px;
+ line-height: 24px;
padding: 6px;
}
@@ -463,7 +477,7 @@
height: min-content;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
li {
- padding:10px
+ padding: 10px;
}
}
.btn-bottom {
@@ -471,10 +485,26 @@
margin: 70px auto 0 auto;
display: flex;
justify-content: space-evenly;
+ flex-wrap: wrap;
+ .el-button {
+ margin-top: 10px;
+ }
}
.el-button {
- height:30px;
- padding:9px;
- min-width: 78px
+ height: 30px;
+ padding: 7px;
+ min-width: 78px;
+}
+.answer-box-item {
+ /deep/ .un1 {
+ -webkit-text-emphasis-style: dot;
+ -moz-text-emphasis-style: dot;
+ -ms-text-emphasis-style: dot;
+ text-emphasis-style: dot;
+ -webkit-text-emphasis-position: under;
+ -moz-text-emphasis-position: under;
+ -ms-text-emphasis-position: under;
+ text-emphasis-position: under;
+ }
}
</style>
--
Gitblit v1.9.1