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/chapter005.vue | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter005.vue b/src/books/mathBook/view/components/chapter005.vue
index 463a438..d62b771 100644
--- a/src/books/mathBook/view/components/chapter005.vue
+++ b/src/books/mathBook/view/components/chapter005.vue
@@ -214,7 +214,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[164]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[164]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h3 id="c049">
@@ -382,7 +382,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[167]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[167]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -405,7 +405,7 @@
<div class="padding-116">
<h3 id="c050">涔犻5.1<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[168]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[168]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h2 id="b031">
@@ -901,12 +901,12 @@
</p>
<p>鎵�浠ャ��154掳13鈥测増2.69 rad.</p>
</div>
- <calculator />
+ <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
<p class="left">
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[171]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[171]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -1314,12 +1314,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[173]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[173]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h3 id="c053">涔犻5.2<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[174]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[174]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h2 id="b032">
@@ -1772,7 +1772,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[176]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[176]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<p class="left">
@@ -2041,7 +2041,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[178]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[178]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -2301,12 +2301,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[180] ? questionData[180][1] : []" :hideCollect="true"
+ <examinations :cardList="questionData[180] ? questionData[180][1] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c054">涔犻5.3<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[180] ? questionData[180][2] : []" :hideCollect="true"
+ <examinations :cardList="questionData[180] ? questionData[180][2] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h2 id="b033">
@@ -3371,12 +3371,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[184] ? questionData[184][1] : []" :hideCollect="true"
+ <examinations :cardList="questionData[184] ? questionData[184][1] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c055">涔犻5.4<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[184] ? questionData[184][2] : []" :hideCollect="true"
+ <examinations :cardList="questionData[184] ? questionData[184][2] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -3697,7 +3697,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[186]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[186]" sourceType="json" v-if="questionData">
</examinations>
</div>
<p class="left">
@@ -4173,7 +4173,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[188]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[188]" sourceType="json" v-if="questionData">
</examinations>
</div>
<p class="left">
@@ -4640,7 +4640,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[190]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[190]" sourceType="json" v-if="questionData">
</examinations>
</div>
<p class="left">
@@ -5183,7 +5183,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[192]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[192]" sourceType="json" v-if="questionData">
</examinations>
</div>
<p class="left">
@@ -5351,7 +5351,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[193]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[193]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -5374,7 +5374,7 @@
<div class="padding-116">
<h3 id="c056">涔犻5.5<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[194]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[194]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -5634,7 +5634,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[198]" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[198]" sourceType="json" v-if="questionData">
</examinations>
<p class="block">
<i>y</i>=-sin<i>x</i>涓�<i>y</i>=sin<i>x</i>鐨勫浘鍍忔湁浠�涔堝叧绯伙紵
@@ -5940,7 +5940,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[199]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[199]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h3 id="c059">
@@ -6289,12 +6289,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[201] ? questionData[201][1] : []" :hideCollect="true"
+ <examinations :cardList="questionData[201] ? questionData[201][1] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c060">涔犻5.6<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[201] ? questionData[201][2] : []" :hideCollect="true"
+ <examinations :cardList="questionData[201] ? questionData[201][2] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -6634,7 +6634,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[206] ? questionData[206][1] : []" :hideCollect="true"
+ <examinations :cardList="questionData[206] ? questionData[206][1] : []"
sourceType="json" v-if="questionData"></examinations>
</div>
<p>
@@ -6895,7 +6895,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[206] ? questionData[206][2] : []" :hideCollect="true"
+ <examinations :cardList="questionData[206] ? questionData[206][2] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -6912,7 +6912,7 @@
<div class="padding-116">
<h3 id="c063">涔犻5.7<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[207]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[207]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
<h2 id="b037">
@@ -7561,7 +7561,7 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[209]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[209]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -7623,7 +7623,7 @@
</svg>
</span>
</p>
- <calculator />
+ <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
<div v-if="isShowAnswer49" >
<p>
<span class="zt-ls"><b>瑙�</b></span> 鍥犱负<math display="0">
@@ -7736,7 +7736,7 @@
</svg>
</span>
</p>
- <calculator />
+ <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
<div v-if="isShowAnswer51" >
<p>
<span class="zt-ls"><b>瑙�</b></span> 鍥犱负<math display="0">
@@ -7837,12 +7837,12 @@
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
- <examinations :cardList="questionData[212] ? questionData[212][1] : []" :hideCollect="true"
+ <examinations :cardList="questionData[212] ? questionData[212][1] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
<h3 id="c066">涔犻5.8<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[212] ? questionData[212][2] : []" :hideCollect="true"
+ <examinations :cardList="questionData[212] ? questionData[212][2] : []"
sourceType="json" inputBc="#d3edfa" v-if="questionData"></examinations>
</div>
</div>
@@ -8165,7 +8165,7 @@
鍗曞厓妫�娴�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
</h2>
<div class="bj">
- <examinations :cardList="questionData[217]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[217]" sourceType="json" inputBc="#d3edfa"
v-if="questionData"></examinations>
</div>
</div>
@@ -8229,7 +8229,6 @@
import paint from '@/components/paint/index.vue'
import examinations from "@/components/examinations/index.vue";
import fillInTable from "@/components/fillInTable/index.vue";
-import calculator from '@/components/calculator/index.vue'
const handleShow = (num) => {
const obj = {}
for (let index = 0; index < num; index++) {
@@ -8249,7 +8248,7 @@
type: Object,
},
},
- components: { examinations, fillInTable,paint,calculator },
+ components: { examinations, fillInTable,paint },
data() {
return {
...showObj,
--
Gitblit v1.9.1