From b07b6716bc19bcbe0c112433b584be3847a4de2c Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 23 十二月 2024 18:10:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter005.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter005.vue b/src/books/mathBook/view/components/chapter005.vue
index d62b771..0592e68 100644
--- a/src/books/mathBook/view/components/chapter005.vue
+++ b/src/books/mathBook/view/components/chapter005.vue
@@ -5636,20 +5636,22 @@
</div>
<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>鐨勫浘鍍忔湁浠�涔堝叧绯伙紵
- <i>y</i>=1+sin<i>x</i>涓�<i>y</i>=sin<i>x</i>鐨勫浘鍍忔湁浠�涔堝叧绯伙紵
- </p>
</div>
<p class="left">
<img class="img-gn" alt="" src="../../assets/images/stlx.jpg" />
</p>
<div class="bj">
<fillInTable :queryData="queryDataOne" />
- <paint
+ <!-- <paint
:page="198"
:imgUrl="this.config.activeBook.resourceUrl + '/images/0103-2.jpg'"
- />
+ /> -->
+ <graffiti
+ :page="198"
+ :bcImg="this.config.activeBook.resourceUrl + '/images/0103-2.jpg'"
+ :imgWidth="520"
+ :imgHeight="494"
+ />
</div>
<h3 id="c058">
5.6.2 姝ｅ鸡鍑芥暟鐨勬�ц川锛堜竴锛�<span class="fontsz2">锛烇紴锛�</span>
@@ -6529,11 +6531,17 @@
<p class="table-answer-box" v-if="isShowAnswer">
绛旀锛氱炕杞拰骞崇Щ
</p>
- <paint
+ <!-- <paint
:page="204"
:canvasHeight="200"
:imgUrl="this.config.activeBook.resourceUrl + '/images/0208-4.jpg'"
- />
+ /> -->
+ <graffiti
+ :page="204"
+ :bcImg="this.config.activeBook.resourceUrl + '/images/0208-4.jpg'"
+ :imgWidth="520"
+ :imgHeight="294"
+ />
</div>
</div>
</div>
@@ -8227,6 +8235,7 @@
<script>
import paint from '@/components/paint/index.vue'
+import graffiti from '@/components/graffiti/index.vue'
import examinations from "@/components/examinations/index.vue";
import fillInTable from "@/components/fillInTable/index.vue";
const handleShow = (num) => {
@@ -8248,7 +8257,7 @@
type: Object,
},
},
- components: { examinations, fillInTable,paint },
+ components: { examinations, fillInTable,paint,graffiti },
data() {
return {
...showObj,
--
Gitblit v1.9.1