From 7da1551dc2c60025e18ab3ef0711f815bb8470a5 Mon Sep 17 00:00:00 2001
From: unknown <qq1940665526@163.com>
Date: 星期二, 28 五月 2024 18:15:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/index.vue | 13 ------
src/components/examinations/index.vue | 29 ++++++--------
src/App.vue | 4 +-
src/books/childHealth/view/content/index.vue | 19 ++++++++-
4 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index f4df404..8abd459 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -58,10 +58,10 @@
} else {
this.activeBook = await this.config.getBookConfig(
// childHealth
- this.config.resourceCtx + "lifeCare"
+ this.config.resourceCtx + "childHealth"
);
// 娴嬭瘯璇曡30椤�
- // this.activeBook.tryPageCount = 30;
+ // this.activeBook.tryPageCount = 10;
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 63b78b9..6a116dd 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -1,6 +1,13 @@
<template>
<div class="page-main" @scroll="throttledScrollHandler">
- <div class="page-content">
+ <div
+ class="page-content"
+ :style="{
+ fontSize: fontSize ? fontSize + 'px' : '16px',
+ transform: `scale(${pageZoom ? pageZoom : 1})`,
+ transformOrigin: 'center top'
+ }"
+ >
<pageHeader
v-if="showCatalogList.indexOf(0) > -1"
:showPageList="loadPageList"
@@ -104,6 +111,14 @@
loadPageList: [],
questionData: {}
};
+ },
+ computed: {
+ fontSize() {
+ return this.$store.state.qiankun.fontSize;
+ },
+ pageZoom() {
+ return this.$store.state.qiankun.scale / 100;
+ }
},
provide() {
return {
@@ -464,7 +479,7 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log(page,"page",catalog,"catalog");
+ console.log(page, "page", catalog, "catalog");
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
this.$store.state.qiankun.pageChange({
diff --git a/src/books/childHealth/view/index.vue b/src/books/childHealth/view/index.vue
index 3c0e84d..ccc836f 100644
--- a/src/books/childHealth/view/index.vue
+++ b/src/books/childHealth/view/index.vue
@@ -2,10 +2,6 @@
<div
class="temp-book"
@mouseup="handleMouseUp"
- :style="{
- fontSize: fontSize ? fontSize + 'px' : '16px',
- transform: `scale(${pageZoom ? pageZoom : 1})`
- }"
>
<pageContent></pageContent>
</div>
@@ -20,14 +16,7 @@
data() {
return {};
},
- computed: {
- fontSize() {
- return this.$store.state.qiankun.fontSize;
- },
- pageZoom() {
- return this.$store.state.qiankun.scale / 100;
- }
- },
+
mounted() {},
methods: {
getParentWithClass(element, className) {
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 393f4cb..0087def 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -449,11 +449,8 @@
inject:['changeQuestionData'],
mounted() {
this.cardData = this.cardList
- },
- computed:{
- cardLists() {
- return this.props.cardList
- }
+ console.log('this.cardList',this.cardList);
+ console.log('this.cardData',this.cardData);
},
methods: {
// 鏁扮粍杞负瀛楃涓叉柟娉�
@@ -488,20 +485,19 @@
}
},
redo() {
- for (let index = 0; index < this.cardList.length; index++) {
- const item = this.cardList[index];
+ for (let index = 0; index < this.cardData.length; index++) {
+ const item = this.cardData[index];
for (let cindex = 0; cindex < item.infoList.length; cindex++) {
const citem = item.infoList[cindex];
citem.userAnswer = "";
citem.isComplete = false;
}
}
- console.log('閲嶅仛',this.cardList);
},
openAnswers() {
this.$data.loading = true;
- for (let index = 0; index < this.cardList.length; index++) {
- const item = this.cardList[index];
+ for (let index = 0; index < this.cardData.length; index++) {
+ const item = this.cardData[index];
for (let cindex = 0; cindex < item.infoList.length; cindex++) {
const citem = item.infoList[cindex];
citem.isComplete = true;
@@ -514,7 +510,7 @@
},
// 鎵规敼棰樼洰 (缁冧範,鎴戠殑鍋氶,鎴戠殑鏀惰棌妯″紡涓�)
handleQuestion() {
- const list = this.$props.cardList;
+ const list = this.cardData;
for (let index = 0; index < list.length; index++) {
const item = list[index];
for (let cindex = 0; cindex < item.infoList.length; cindex++) {
@@ -559,8 +555,8 @@
}
}
}
- this.$props.cardList = list;
- console.log(this.$props.cardList);
+ this.cardData = list;
+ console.log(this.cardData);
},
getParentWithClass(element, className) {
while (element.parentElement) {
@@ -584,8 +580,8 @@
);
let oldData = oldAnswerData ? JSON.parse(oldAnswerData) : {};
const asnwerList = [];
- for (let index = 0; index < this.$props.cardList.length; index++) {
- const item = this.$props.cardList[index];
+ for (let index = 0; index < this.cardData.length; index++) {
+ const item = this.cardData[index];
for (let cindex = 0; cindex < item.infoList.length; cindex++) {
const citem = item.infoList[cindex];
asnwerList.push({
@@ -595,7 +591,8 @@
}
}
if(oldData[pageNum]) {
- oldData[pageNum].push(asnwerList)
+ oldData[pageNum] = oldData[pageNum].filter(citem => asnwerList.findIndex(ditem => ditem.id == citem.id) == -1 )
+ oldData[pageNum].push(...asnwerList)
} else {
oldData[pageNum] = asnwerList
}
--
Gitblit v1.9.1