From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 18:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter003.vue | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter003.vue b/src/books/mathBook/view/components/chapter003.vue
index b168661..0b2b2b9 100644
--- a/src/books/mathBook/view/components/chapter003.vue
+++ b/src/books/mathBook/view/components/chapter003.vue
@@ -173,7 +173,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[78] ? questionData[78][1] : []" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[78] ? questionData[78][1] : []" sourceType="json" v-if="questionData">
</examinations>
</div>
<p class="center"><img class="img-c" alt="" src="../../assets/images/0082-2.jpg" /></p>
@@ -198,7 +198,7 @@
</div>
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj">
- <examinations :cardList="questionData[78] ? questionData[78][2] : []" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[78] ? questionData[78][2] : []" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -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>
@@ -513,7 +509,7 @@
</div>
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj" >
- <examinations :cardList="questionData[80]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[80]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -530,7 +526,7 @@
<div class="padding-116">
<h3 id="c026">涔犻3.1<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj" >
- <examinations :cardList="questionData[81]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[81]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
<h2 id="b016">3.2 鍑芥暟鐨勮〃绀烘柟娉�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
@@ -691,12 +687,12 @@
<div class="bj1-hzjl">
<p class="left"><img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" /></p>
</div>
- <examinations :cardList="questionData[85] ? questionData[85][1] : []" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[85] ? questionData[85][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[85] ? questionData[85][2] : []" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[85] ? questionData[85][2] : []" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -1082,12 +1078,12 @@
<div class="bj1-hzjl">
<p class="left"><img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" /></p>
</div>
- <examinations :cardList="questionData[88] ? questionData[88][1] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[88] ? questionData[88][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[88] ? questionData[88][2] : []" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[88] ? questionData[88][2] : []" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -1104,7 +1100,7 @@
<div class="padding-116">
<h3 id="c029">涔犻3.2<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[89]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[89]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
<h2 id="b017">3.3 鍑芥暟鐨勫崟璋冩�у拰濂囧伓鎬�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
@@ -1451,7 +1447,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[95]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[95]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -1540,23 +1536,17 @@
</p>
<p class="img fl fl-cn ju-cn">
<span>鍥�3-15</span>
- <el-tooltip class="item" effect="dark" :content="chapterData.isCollectImg ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
- placement="top-start">
<img :src="collectResourceList.findIndex(item => item.id == '722FE833') > -1 ? collectCheck : collectImg"
alt="" class="collect-btn" @click="handleCollect('img')" />
- </el-tooltip>
</p>
<video :src="videoPath" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true"
x5-video-orientation="h5" x5-video-player-fullscreen="true" x5-playsinline="" controls
controlslist="nodownload" class="video-border w100"></video>
<p class="img fl fl-cn ju-cn">
<span>瑙嗛锛氬垽鏁板嚱鏁板鍋舵�х殑鏂规硶鍜屾楠� </span>
- <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
- placement="top-start">
<img
:src="collectResourceList.findIndex(item => item.id == 'a28cd862d61b5df2201406b76e9f01b0') > -1 ? collectCheck : collectImg"
alt="" class="collect-btn" @click="handleCollect('video')" />
- </el-tooltip>
</p>
<p class="fl">
<span>
@@ -1769,7 +1759,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[98]" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[98]" sourceType="json"
v-if="questionData" ></examinations>
</div>
</div>
@@ -1786,18 +1776,24 @@
<div class="padding-116">
<p class="left"><img class="img-gn" alt="" src="../../assets/images/stlx.jpg" /></p>
<div class="bj" >
- <examinations :cardList="questionData[99]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[99]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
<p class="gr-title">
鍥涖�佸嚱鏁� f(x)=x鈥�-3 鐨勫浘鍍忓湪
杞村乏杈圭殑閮ㄥ垎濡傚浘鎵�绀猴紝璇蜂綘鐢诲嚭杩欎釜鍑芥暟鍥惧儚鍦� y杞村彸杈圭殑閮ㄥ垎.
</p>
<div>
- <paint
+ <!-- <paint
:page="99"
:imgUrl="
this.config.activeBook.resourceUrl + '/images/0103-2.jpg'
"
+ /> -->
+ <graffiti
+ :page="99"
+ :bcImg="this.config.activeBook.resourceUrl + '/images/0103-2.jpg'"
+ :imgWidth="520"
+ :imgHeight="494"
/>
</div>
</div>
@@ -2079,7 +2075,7 @@
<img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" />
</p>
</div>
- <examinations :cardList="questionData[103] ? questionData[103][1] : []" :hideCollect="true" sourceType="json" v-if="questionData">
+ <examinations :cardList="questionData[103] ? questionData[103][1] : []" sourceType="json" v-if="questionData">
</examinations>
</div>
<p>濡傛灉涓�涓嚱鏁版槸濂囧嚱鏁版垨鍋跺嚱鏁帮紝閭ｄ箞灏辩О杩欎釜鍑芥暟鍏锋湁<b>濂囧伓鎬�</b>.鍚﹀垯锛屽嚱鏁颁笉鍏锋湁濂囧伓鎬�.</p>
@@ -2270,7 +2266,7 @@
<div class="bj1-hzjl">
<p class="left"><img class="img-gn2" alt="" src="../../assets/images/hzjl.jpg" /></p>
</div>
- <examinations :cardList="questionData[103] ? questionData[103][2] : []" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[103] ? questionData[103][2] : []" sourceType="json"
v-if="questionData" ></examinations>
</div>
</div>
@@ -2290,7 +2286,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[104]" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[104]" sourceType="json"
v-if="questionData" ></examinations>
</div>
@@ -2314,7 +2310,7 @@
<div class="padding-116">
<h3 id="c032">涔犻3.3<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj" >
- <examinations :cardList="questionData[105]" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[105]" sourceType="json"
v-if="questionData" ></examinations>
</div>
<h2 id="b018">3.4 鍑芥暟鐨勫簲鐢�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
@@ -2690,7 +2686,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[110]" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[110]" sourceType="json"
v-if="questionData" ></examinations>
</div>
</div>
@@ -2710,7 +2706,7 @@
<div class="padding-116">
<h3 id="c033">涔犻3.4<span class="fontsz2">锛烇紴锛�</span></h3>
<div class="bj">
- <examinations :cardList="questionData[111]" :hideCollect="true" sourceType="json" inputBc="#d3edfa"
+ <examinations :cardList="questionData[111]" sourceType="json" inputBc="#d3edfa"
v-if="questionData" ></examinations>
</div>
</div>
@@ -2817,7 +2813,7 @@
<div class="padding-116">
<h2 id="b021">鍗曞厓妫�娴�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span></h2>
<div class="bj" >
- <examinations :cardList="questionData[117]" :hideCollect="true" sourceType="json"
+ <examinations :cardList="questionData[117]" sourceType="json"
v-if="questionData" ></examinations>
</div>
</div>
@@ -2899,6 +2895,7 @@
<script>
import paint from '@/components/paint/index.vue'
+import graffiti from '@/components/graffiti/index.vue'
import examinations from '@/components/examinations/index.vue'
import { getResourcePath } from "@/assets/methods/resources";
import { getCollectResource, setCollectResource } from "@/assets/methods/resources";
@@ -2921,7 +2918,7 @@
type: Object,
},
},
- components: {examinations,paint},
+ components: {examinations,paint,graffiti},
data() {
return {
...showObj,
@@ -3017,7 +3014,6 @@
},
//璧勬簮鏀惰棌浜嬩欢
handleCollectResource(id, md5, resourcePath, resourceType, source, resourceName) {
- console.log(this.collectResourceList);
let list = this.collectResourceList
if (list.findIndex(item => item.id == id) > -1) {
list = list.filter(item => item.id != id)
--
Gitblit v1.9.1