From 713e5f5c012eb510b768d4f75d6aa1e2631e649b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 03 六月 2024 19:09:23 +0800
Subject: [PATCH] 连线题，合并
---
src/books/embedded/assets/main.less | 2 +-
src/books/childHealth/view/content/components/header.vue | 4 ++--
src/books/childHealth/assets/main.less | 2 +-
src/components/matching/matching.vue | 22 +++++++++++-----------
src/books/English/view/components/header.vue | 9 +++++----
src/books/English/assets/main.less | 2 +-
src/books/embedded/view/components/header.vue | 2 +-
7 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/books/English/assets/main.less b/src/books/English/assets/main.less
index db919a5..7e7ed49 100644
--- a/src/books/English/assets/main.less
+++ b/src/books/English/assets/main.less
@@ -651,7 +651,7 @@
// 鑷畾涔夊唴瀹�
.page-box {
box-sizing: border-box;
- min-height: 1128px !important;
+ min-height: 1128px;
margin-bottom: 20px;
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
diff --git a/src/books/English/view/components/header.vue b/src/books/English/view/components/header.vue
index 23782d6..642f742 100644
--- a/src/books/English/view/components/header.vue
+++ b/src/books/English/view/components/header.vue
@@ -1,16 +1,16 @@
<template>
<div class="chapter" num="1">
- <!-- <div class="page-box">
+ <div class="page-box">
<matching :rawData="rawData" :item="question" :value="value"></matching>
- </div> -->
+ </div>
<!-- -->
- <div class="page-box mt-20" page="1">
+ <div class="page-box mt-20" page="1" style="min-height: auto">
<div v-if="showPageList.indexOf(1) > -1">
<img class="img-0" alt="" src="../../assets/images/Cover.jpg" />
</div>
</div>
<!-- 1 -->
- <div class="page-box" page="2">
+ <div class="page-box" page="2" style="min-height: auto">
<div v-if="showPageList.indexOf(2) > -1">
<img class="img-0" alt="" src="../../assets/images/SMY.jpg" />
</div>
@@ -191,6 +191,7 @@
</div>
</div>
</div>
+
</div>
</template>
diff --git a/src/books/childHealth/assets/main.less b/src/books/childHealth/assets/main.less
index 3e83968..49d7fe7 100644
--- a/src/books/childHealth/assets/main.less
+++ b/src/books/childHealth/assets/main.less
@@ -451,7 +451,7 @@
}
.page-box {
box-sizing: border-box;
- min-height: 1150px !important;
+ min-height: 1150px ;
margin-bottom: 20px;
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
diff --git a/src/books/childHealth/view/content/components/header.vue b/src/books/childHealth/view/content/components/header.vue
index 137585a..855a0ce 100644
--- a/src/books/childHealth/view/content/components/header.vue
+++ b/src/books/childHealth/view/content/components/header.vue
@@ -1,12 +1,12 @@
<template>
<div class="chapter" num="1">
<!-- 灏侀潰 -->
- <div class="page-box cover" page="1">
+ <div class="page-box cover" page="1" style="min-height:auto">
<div v-if="showPageList.indexOf(1) > -1">
<img src="../../../assets/images/Covers.jpg" alt="" />
</div>
</div>
- <div class="page-box cover" page="2">
+ <div class="page-box cover" page="2" style="min-height:auto">
<div v-if="showPageList.indexOf(2) > -1">
<img src="../../../assets/images/Cover.jpg" alt="" />
</div>
diff --git a/src/books/embedded/assets/main.less b/src/books/embedded/assets/main.less
index 9d51bae..5b16ee0 100644
--- a/src/books/embedded/assets/main.less
+++ b/src/books/embedded/assets/main.less
@@ -601,7 +601,7 @@
// 鑷畾涔夊唴瀹�
.page-box {
box-sizing: border-box;
- min-height: 1092px !important;
+ min-height: 1092px ;
margin-bottom: 20px;
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
diff --git a/src/books/embedded/view/components/header.vue b/src/books/embedded/view/components/header.vue
index f54dbda..477e3f6 100644
--- a/src/books/embedded/view/components/header.vue
+++ b/src/books/embedded/view/components/header.vue
@@ -1,7 +1,7 @@
<template>
<div class="chapter" num="1">
<!-- 灏侀潰 -->
- <div class="page-box" page="1">
+ <div class="page-box" page="1" style="min-height: auto;">
<div v-if="showPageList.indexOf(1) > -1">
<h1 class="frontCover" title="">
<img
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index a33045c..7e1cd5b 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -1,6 +1,6 @@
<template>
- <div class="connect" id="connect" ref="connect" @mouseup="mouseup">
- <div class="answer" @mousemove="mousemove">
+ <div class="connect" id="connect" ref="connect" @mousemove="mousemove" @mouseup="(e) => touchend(e)">
+ <div class="answer" >
<div class="answer-box">
<div
class="answer-box-item"
@@ -19,7 +19,6 @@
v-for="(item, index) in rightArr"
:key="index"
ref="right"
- @mouseup="(e) => touchend(e, item, index)"
>
{{ item.label.txt }}
</div>
@@ -57,6 +56,7 @@
scrollTop: 0,
debounce: false,
checkItem: null,
+ checkItemIndex:null
};
},
props: {
@@ -149,8 +149,8 @@
});
},
// 瑙︽懜缁撴潫
- touchend(e, item, index) {
- console.log("鎶捣", e,item);
+ touchend(e, index) {
+ console.log("鎶捣", e,this.checkItem);
this.isDragging = false;
if (this.item.showAnswer) {
return false;
@@ -164,20 +164,20 @@
this.canvasB.clearRect(0, 0, this.clientWidth, this.clientHeight);
// 濡傛灉涓嶆槸鍙宠竟鐨刣om 鐩存帴鎶� 绾� 骞叉帀 -- 璇佹槑涓嶆槸 娌℃湁鎷栧埌鍙宠竟涓�
if (!right) {
- item.line = [];
+ this.checkItem.line = [];
return;
}
// 濡傛灉宸叉湁鐨勪笉鏄垜鑷繁 鐩存帴鏇挎崲鎺変笂涓�涓殑
- if (item.value[0] !== right.index) {
+ if (this.checkItem.value[0] !== right.index) {
let model = this.leftArr.find((r) => r.value[0] === right.index);
if (model) {
model.value = [];
model.line = [];
}
- item.value = [right.index];
+ this.checkItem.value = [right.index];
}
// 閲嶆柊璧嬪�� 绾跨殑 x y 杞�
- item.line = this.attachment(index, right.index);
+ this.checkItem.line = this.attachment(this.checkItemIndex, right.index);
this.drawing();
let model = this.leftArr
.map((r, i) => {
@@ -192,10 +192,11 @@
console.log(JSON.stringify(model));
},
// 瑙︽懜寮�濮�
- touchstart(e, item) {
+ touchstart(e, item,index) {
this.isDragging = true;
console.log("鎸変笅", e);
this.checkItem = item
+ this.checkItemIndex = index
e.stopPropagation();
// let event = e.targetTouches[0];
item.line = [
@@ -219,7 +220,6 @@
// 绉诲姩涓�
mousemove(e) {
if (!this.isDragging) return false;
- console.log("绉诲姩", e);
if (this.item.showAnswer) {
return false;
}
--
Gitblit v1.9.1