From 7869653a258353bd70fc232630ab8467fa379bfe Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期五, 21 六月 2024 18:43:36 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/chapter001.vue | 110 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/src/books/mathBook/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
index 55f50d7..9cf0e20 100644
--- a/src/books/mathBook/view/components/chapter001.vue
+++ b/src/books/mathBook/view/components/chapter001.vue
@@ -156,7 +156,7 @@
placement="top-start"
>
<img
- :src="chapterData.isCollectImg ? collectCheck : collectImg"
+ :src="collectResourceList.findIndex(item => item.id == '722FE833') > -1 ? collectCheck : collectImg"
alt=""
class="collect-btn"
@click="handleCollect('img')"
@@ -184,7 +184,7 @@
placement="top-start"
>
<img
- :src="chapterData.isCollectVideo ? collectCheck : collectImg"
+ :src="collectResourceList.findIndex(item => item.id == 'a28cd862d61b5df2201406b76e9f01b0') > -1 ? collectCheck : collectImg"
alt=""
class="collect-btn"
@click="handleCollect('video')"
@@ -564,8 +564,9 @@
</p>
<div class="bj">
<examinations
- :cardList="questionData"
+ :cardList="questionData[9]"
:hideCollect="true"
+ sourceType="json"
inputBc="#d3edfa"
v-if="questionData"
:isReal="false"
@@ -818,7 +819,7 @@
<script>
import examinations from "@/components/examinations/index.vue";
import { getResourcePath } from "@/assets/methods/resources";
-import axios from "axios";
+import { getCollectResource,setCollectResource } from "@/assets/methods/resources";
export default {
name: "chapter-one",
components: { examinations },
@@ -827,14 +828,17 @@
type: Array,
default: [],
},
+ questionData:{
+ type:Object
+ }
},
- mounted() {
+ async mounted() {
const data = localStorage.getItem("math-chapterData");
if (data) {
this.chapterData = JSON.parse(data);
}
this.getPath();
- this.getQuestionData();
+ this.collectResourceList = await getCollectResource(this.config.activeBook.bookId)
},
data() {
return {
@@ -849,9 +853,9 @@
thinkingDialog: false,
stepDialog: false,
videoPath: "",
- questionData: [],
stepIndex: 1,
thinkIndex: 1,
+ collectResourceList:[],
chapterData: {
isCollectImg: false,
isCollectVideo: false,
@@ -896,45 +900,46 @@
"a28cd862d61b5df2201406b76e9f01b0"
);
},
- getQuestionData() {
- axios
- .get(this.config.activeBook.resourceUrl + "/question.json")
- .then((res) => {
- let oldAnswer = localStorage.getItem(
- this.config.activeBook.name + "oldAnswerData"
- );
- if (oldAnswer) {
- oldAnswer = JSON.parse(oldAnswer);
- console.log("鏃ф暟鎹�", oldAnswer);
- if (oldAnswer[9]) {
- for (let index = 0; index < res.data.data.length; index++) {
- const item = res.data.data[index];
- if (item.infoList.length) {
- for (
- let cindex = 0;
- cindex < item.infoList.length;
- cindex++
- ) {
- const citem = item.infoList[cindex];
- const question = oldAnswer[9].find(
- (ditem) => ditem.id == citem.id
- );
- if (question) {
- citem.userAnswer = question.userAnswer;
- }
- }
- }
- }
- }
- }
- this.questionData = res.data.data;
- });
- },
+ // getQuestionData() {
+ // axios
+ // .get(this.config.activeBook.resourceUrl + "/question.json")
+ // .then((res) => {
+ // let oldAnswer = localStorage.getItem(
+ // this.config.activeBook.name + "oldAnswerData"
+ // );
+ // if (oldAnswer) {
+ // oldAnswer = JSON.parse(oldAnswer);
+ // console.log("鏃ф暟鎹�", oldAnswer);
+ // if (oldAnswer[9]) {
+ // for (let index = 0; index < res.data.data.length; index++) {
+ // const item = res.data.data[index];
+ // if (item.infoList.length) {
+ // for (
+ // let cindex = 0;
+ // cindex < item.infoList.length;
+ // cindex++
+ // ) {
+ // const citem = item.infoList[cindex];
+ // const question = oldAnswer[9].find(
+ // (ditem) => ditem.id == citem.id
+ // );
+ // if (question) {
+ // citem.userAnswer = question.userAnswer;
+ // }
+ // }
+ // }
+ // }
+ // }
+ // }
+ // this.questionData = res.data.data;
+ // });
+ // },
handleCollect(type) {
if (type == "img") {
- this.chapterData.isCollectImg = !this.chapterData.isCollectImg;
+ this.handleCollectResource("722FE833","",'images/0101-1.jpg',"鍥剧墖","json",'鍥�3-15')
} else if (type == "video") {
- this.chapterData.isCollectVideo = !this.chapterData.isCollectVideo;
+ this.handleCollectResource("a28cd862d61b5df2201406b76e9f01b0","a28cd862d61b5df2201406b76e9f01b0",'',"瑙嗛","bits",'瑙嗛锛氬垽鏁板嚱鏁板鍋舵�х殑鏂规硶鍜屾楠�')
+ // setCollectResource(this.config.activeBook.bookId,[])
}
this.handleChapterData();
},
@@ -959,6 +964,25 @@
this.stepIndex++;
}
},
+ //璧勬簮鏀惰棌浜嬩欢
+ 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)
+ } else {
+ list.push({
+ id,
+ md5,
+ resourcePath,
+ resourceType,
+ source,
+ resourceName,
+ })
+ }
+ this.collectResourceList = list
+ setCollectResource(this.config.activeBook.bookId,this.collectResourceList)
+ }
},
};
</script>
--
Gitblit v1.9.1