From a670b0c082dcc5728ecf19e8d30b09c71f80b707 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期二, 26 十一月 2024 16:56:58 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter002.vue | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter002.vue b/src/books/mathBook/view/components/chapter002.vue
index 64f40da..a7043b0 100644
--- a/src/books/mathBook/view/components/chapter002.vue
+++ b/src/books/mathBook/view/components/chapter002.vue
@@ -268,7 +268,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[41]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[41]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<p>
@@ -355,7 +355,7 @@
<div class="padding-116">
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
- <examinations :cardList="questionData[42]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[42]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h3 id="c013">2.1.2 浣滃樊姣旇緝娉�<span class="fontsz2">锛烇紴锛�</span></h3>
@@ -771,13 +771,13 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[43] ? questionData[43][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[43] ? questionData[43][1] : []" sourceType="json"
v-if="questionData">
</examinations>
</div>
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
- <examinations :cardList="questionData[43] ? questionData[43][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[43] ? questionData[43][2] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -797,7 +797,7 @@
<div class="padding-116">
<h3 id="c014">涔犻2.1<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[44]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[44]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h2 id="b008">2.2 鍖洪棿<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
@@ -1046,12 +1046,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[47] ? questionData[47][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[47] ? questionData[47][1] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c015">涔犻2.2<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[47] ? questionData[47][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[47] ? questionData[47][2] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h2 id="b009">
@@ -1365,7 +1365,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[51] ? questionData[51][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[51] ? questionData[51][1] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
@@ -1374,7 +1374,13 @@
<p>鈶�<i>y</i>=<i>x</i><sup>2</sup>-3<i>x</i>-4锛� 鈶�<i>y</i>=<i>x</i><sup>2</sup>+<i>x</i>+2锛�
鈶�<i>y</i>=<i>x</i><sup>2</sup>-6<i>x</i>+9.</p>
<p>锛�1锛� 鍒嗗埆鐢诲嚭瀹冧滑鐨勫嚱鏁板浘鍍忥紱</p>
- <paint :page="51" :imgUrl="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'" />
+ <!-- <paint :page="51" :imgUrl="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'" /> -->
+ <graffiti
+ :page="51"
+ :bcImg="this.config.activeBook.resourceUrl + '/images/a6fe3d63.png'"
+ :imgWidth="520"
+ :imgHeight="494"
+ />
<p>
锛�2锛� 鏍规嵁鍑芥暟鍥惧儚鍐欏嚭<i>y</i>=0锛�<i>y</i>锛�0锛�<i>y</i>锛�0鏃舵墍瀵瑰簲鐨�<i>x</i>鐨勫�兼垨鍙栧�艰寖鍥�.
<span class="btn-box" @click="isShowAnswer = !isShowAnswer">
@@ -2017,7 +2023,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[54] ? questionData[54][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[54] ? questionData[54][1] : []" sourceType="json"
v-if="questionData">
</examinations>
</div>
@@ -2033,7 +2039,7 @@
</p>
<p>绗笁姝ワ細瑙傚療绠�鍥撅紝鍐欏嚭涓嶇瓑寮忕殑瑙ｉ泦.</p>
<div class="bj">
- <examinations :cardList="questionData[54] ? questionData[54][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[54] ? questionData[54][2] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -2292,7 +2298,7 @@
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
<p>瑙ｄ笅鍒椾竴鍏冧簩娆′笉绛夊紡.</p>
- <examinations :cardList="questionData[56]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[56]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -2309,7 +2315,7 @@
<div class="padding-116">
<h3 id="c019">涔犻2.3<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[57]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[57]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -2615,14 +2621,14 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[60] ? questionData[60][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[60] ? questionData[60][1] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<p class="left">
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[60] ? questionData[60][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[60] ? questionData[60][2] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c021">
@@ -2740,7 +2746,7 @@
</div>
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
- <examinations :cardList="questionData[61]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[61]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -2760,7 +2766,7 @@
<div class="padding-116">
<h3 id="c022">涔犻2.4<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[62]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[62]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h2 id="b011">
@@ -2883,7 +2889,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[63]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[63]" sourceType="json" v-if="questionData">
</examinations>
</div>
</div>
@@ -2903,7 +2909,7 @@
<div class="padding-116">
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
- <examinations :cardList="questionData[64]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[64]" sourceType="json" v-if="questionData">
</examinations>
</div>
<h3 id="c024">
@@ -3034,7 +3040,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[65]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[65]" sourceType="json" v-if="questionData">
</examinations>
</div>
</div>
@@ -3056,12 +3062,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[66] ? questionData[66][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[66] ? questionData[66][1] : []" sourceType="json"
inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c025">涔犻2.5<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[66] ? questionData[66][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[66] ? questionData[66][2] : []" sourceType="json"
v-if="questionData">
</examinations>
</div>
@@ -3586,7 +3592,7 @@
<div class="padding-116">
<h2 id="b014">鍗曞厓妫�娴�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
<div class="bj">
- <examinations :cardList="questionData[72]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[72]" sourceType="json" v-if="questionData">
</examinations>
</div>
</div>
@@ -3656,6 +3662,7 @@
return obj
}
const showObj = handleShow(30)
+import graffiti from '@/components/graffiti/index.vue'
import paint from '@/components/paint/index.vue'
import examinations from '@/components/examinations/index.vue'
export default {
@@ -3669,7 +3676,7 @@
type: Object,
},
},
- components: { examinations, paint },
+ components: { examinations, paint,graffiti },
data() {
return {
collectImg: require('../../assets/images/icon/heart.png'),
--
Gitblit v1.9.1