From 0ac4e192d2d2c28eb95e118eb381c04330b07953 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 20 十一月 2024 11:51:46 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter003.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter003.vue b/src/books/mathBook/view/components/chapter003.vue
index b168661..d3adb66 100644
--- a/src/books/mathBook/view/components/chapter003.vue
+++ b/src/books/mathBook/view/components/chapter003.vue
@@ -1540,23 +1540,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>
@@ -1793,11 +1787,17 @@
杞村乏杈圭殑閮ㄥ垎濡傚浘鎵�绀猴紝璇蜂綘鐢诲嚭杩欎釜鍑芥暟鍥惧儚鍦� 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>
@@ -2899,6 +2899,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 +2922,7 @@
type: Object,
},
},
- components: {examinations,paint},
+ components: {examinations,paint,graffiti},
data() {
return {
...showObj,
@@ -3017,7 +3018,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