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/components/examinations/index.vue | 1 +
src/books/mathBook/view/components/index.vue | 6 +++---
src/books/mathBook/view/components/chapter005.vue | 27 ++++++++++++++++++---------
src/books/mathBook/view/components/chapter003.vue | 4 ----
4 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter003.vue b/src/books/mathBook/view/components/chapter003.vue
index 82c4c56..0b2b2b9 100644
--- a/src/books/mathBook/view/components/chapter003.vue
+++ b/src/books/mathBook/view/components/chapter003.vue
@@ -213,10 +213,6 @@
<li>涓婂唽</li>
</ul>
<div class="padding-116">
- <div class="bj">
- <p>锛�3锛� 鑻ュ嚱鏁�<i>f</i>锛�<i>x</i>锛�=2<i>x</i>-1锛屽垯<i>f</i>锛�<i>t</i>锛�=___锛�<i>f</i>锛�<i>f</i>锛�5锛夛級=____.</p>
- <p>2.涓�鍒楀姩杞︿粠A鍩庝互姣忓皬鏃�200km鐨勯�熷害鍖�閫熺洿绾胯椹�4 h鍚庡埌杈綛鍩�.璇ュ姩杞﹀湪琛岄┒杩囩▼涓紝琛岄┒鐨勮矾绋嬫槸鏃堕棿鐨勫嚱鏁板悧锛熷鏋滄槸锛岃鍐欏嚭鍑芥暟鐨勫畾涔夊煙銆佸搴斿叧绯诲拰鍊煎煙锛涘鏋滀笉鏄紝璇疯鏄庣悊鐢�.</p>
- </div>
<p>浠庝笂闈㈢殑瀛︿範鍙互鐭ラ亾锛屼竴涓嚱鏁板寘鍚畾涔夊煙銆佸搴斿叧绯诲拰鍊煎煙.鍑芥暟鐨勫�煎煙鏄敱鍑芥暟鐨勫畾涔夊煙鍜屽搴斿叧绯诲喅瀹氱殑.</p>
<p>閫氬父鍑芥暟鐨勫畾涔夊煙闅愬惈鍦ㄥ嚱鏁板叧绯讳腑.渚嬪锛屾垜浠笉鑳借绠楀綋<i>x</i>=0鏃�<math display="0">
<mi>f</mi>
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,
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index 30f1d55..7a27465 100644
--- a/src/books/mathBook/view/components/index.vue
+++ b/src/books/mathBook/view/components/index.vue
@@ -188,8 +188,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- // setTimeout(() => {
- // this.gotoPage(3,72);
+ setTimeout(() => {
+ this.gotoPage(4,79);
// // setTimeout(() => {
// // this.renderSign("Highlight", {
// // id: "2ACA9359",
@@ -217,7 +217,7 @@
// // txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// // txtIndex: 57
// // });
- // }, 500);
+ }, 500);
// 鑾峰彇棰樼洰id鍒楄〃
this.getQuestionId();
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index e99c446..34463b6 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -967,6 +967,7 @@
<style lang="less">
.titleText img {
max-width: 80%;
+ min-width: 220px;
}
</style>
--
Gitblit v1.9.1