From 6b15f89a33b0bffb9837f954c48ea2b21e7381fd Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 11:57:20 +0800
Subject: [PATCH] 合并代码
---
src/books/math/view/components/chapter001.vue | 96 +++++++++++++++++---------------
src/books/math/assets/main.less | 8 +-
src/books/childHealth/view/content/components/chapter007.vue | 35 -----------
src/components/examinations/index.vue | 2
src/App.vue | 2
src/books/childHealth/view/content/index.vue | 2
6 files changed, 58 insertions(+), 87 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index a5e51a6..2edaae6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,7 +79,7 @@
// artAndDance
// artAndDrama
// math
- this.config.resourceCtx + "artAndDrama"
+ this.config.resourceCtx + "math"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/books/childHealth/view/content/components/chapter007.vue b/src/books/childHealth/view/content/components/chapter007.vue
index 7d692ca..f60d4ec 100644
--- a/src/books/childHealth/view/content/components/chapter007.vue
+++ b/src/books/childHealth/view/content/components/chapter007.vue
@@ -385,41 +385,6 @@
</p>
<p class="block">甯歌浜庤儍鑲犻亾鐤剧梾銆�</p>
<p class="block">2.澶т究鎬х姸寮傚父</p>
- <p class="block">锛�2锛夌淮鐢熺礌A鎴栫淮鐢熺礌D涓瘨锛屼篃浼氬紩璧峰帉椋熴��</p>
- <p class="block">锛�3锛夐暱鏈熸憚椋熸棤鐩愰ギ椋燂紝涔熷彲浣块娆蹭綆涓嬨��</p>
- <p class="block">2.椋熸浜㈣繘</p>
- <p class="block">
- 锛�1锛夊辜鍎胯嫢鍚冨緱澶氥�佸枬寰楀銆佸翱寰楀锛屽簲妫�鏌ユ槸鍚︽偅鏈夌敳鐘惰吅鍔熻兘浜㈣繘鎴栫硸灏跨梾銆�
- </p>
- <p class="block">锛�2锛夊績鐞嗗紓甯镐篃鍙椽椋熴��</p>
- <p class="block">锛�3锛夊鏃忛仐浼犳�ц偉鑳栨偅鍎夸篃鏈夎椽椋熶範鎯��</p>
- <p class="block">3.寮傚棞鐧�</p>
- <p class="block">
- 寮傚棞鐧栨槸鎸囧辜鍎垮椋熺墿浠ュ鐨勯潪椋熺墿鐗╁搧琛ㄧ幇鍑轰笉鍙嚜鍒剁殑椋熸锛屽鍠滈娉ュ湡銆佺叅鏍搞�佺焊寮犮�佸鐨瓑銆傚父瑙佷簬浣撳唴閿屻�侀搧涓ラ噸缂轰箯鐨勫辜鍎匡紝鍦ㄤ腑鍥藉崡鏂逛篃鍙浜庨挬铏梾銆�
- </p>
- <p class="block"><b>涓夈�佺潯鐪犲紓甯�</b></p>
- <p class="block">
- 姝ｅ父骞煎効涓婂簥鍚庡彲寰堝揩鍏ョ潯锛岀潯鐪犲钩绋炽�佹棤榧惧０锛屽彲鏈夊井姹椼��
- </p>
- <p class="block">鐫＄湢寮傚父涓昏鍖呮嫭浠ヤ笅3绉嶃��</p>
- <p class="block">1.鍏ョ潯鍥伴毦</p>
- <p class="block">锛�1锛夎繘鍏ユ柊鐨勭幆澧冿紝涓嶈兘閫傚簲銆�</p>
- <p class="block">锛�2锛夌簿绁炵揣寮犮�佸帇鍔涜繃澶с��</p>
- <p class="block">锛�3锛夌柧鐥呯柤鐥涙墍鑷达紝濡傚墽鐑堢墮鐤煎彲鑷村叆鐫″洶闅俱��</p>
- <p class="block">2.鐫＄湢涓嶅畨</p>
- <p class="block">锛�1锛変綕鍋荤梾绛夋墍鑷淬��</p>
- <p class="block">锛�2锛変綋鍐呮湁铔茶櫕娲诲姩銆�</p>
- <p class="block">锛�3锛夊績鐞嗗洜绱犮��</p>
- <p class="block">3.鍡滅潯</p>
- <p class="block">甯歌浜庤剳鑶滅値銆佽剳鐐庣瓑鐤剧梾鐨勬棭鏈熻〃鐜般��</p>
- <p class="block"><b>鍥涖�佸ぇ渚垮紓甯�</b></p>
- <p class="block">鍖呮嫭澶т究娆℃暟寮傚父鍜屽ぇ渚挎�х姸寮傚父銆�</p>
- <p class="block">1.澶т究娆℃暟寮傚父</p>
- <p class="block">
- 鎺掍究娆℃暟杈冨钩鏃舵湁鏄庢樉鍑忓皯鎴栧澶氾紝鎺掍究鏃舵湁涓嶈垝鏈嶆劅銆�
- </p>
- <p class="block">甯歌浜庤儍鑲犻亾鐤剧梾銆�</p>
- <p class="block">2.澶т究鎬х姸寮傚父</p>
<p class="block">
锛�1锛夎渚匡細绮究甯﹁锛岃壊椴滅孩銆佹殫绾㈡垨鍛堟煆娌圭姸锛岄噺澶氬皯涓嶇瓑锛屽彲娣锋湁鑴撴恫銆侀粡娑诧紝缁熺О渚胯鎴栬渚裤��
</p>
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 1b0f7fa..b2392ea 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -171,7 +171,7 @@
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [1];
+ this.showCatalogList = [8];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
diff --git a/src/books/math/assets/main.less b/src/books/math/assets/main.less
index a735352..c201a0b 100644
--- a/src/books/math/assets/main.less
+++ b/src/books/math/assets/main.less
@@ -750,10 +750,10 @@
cursor: pointer;
text-indent: 0;
display: inline-block;
- border:1px solid #8281ED;
+ border:1px solid #00a1e9;
height: 22px;
- padding: 5px;
- background-color:#8281ED ;
+ padding: 3px;
+ background-color:#00a1e9 ;
border-radius: 5px;
svg {
fill: #fff;
@@ -761,7 +761,7 @@
&:hover {
background-color: #fff;
svg {
- fill:#8281ED ;
+ fill:#00a1e9 ;
}
}
}
diff --git a/src/books/math/view/components/chapter001.vue b/src/books/math/view/components/chapter001.vue
index 94fe450..814a932 100644
--- a/src/books/math/view/components/chapter001.vue
+++ b/src/books/math/view/components/chapter001.vue
@@ -90,15 +90,7 @@
<p class="center openImgBox">
<img class="img-c" alt="" src="../../assets/images/0100-3.jpg" />
</p>
- <p class="img fl al-cn ju-cn">
- <span>鍥�3-14 </span
- ><img
- :src="chapterData.isCollectImg ? collectCheck : collectImg"
- alt=""
- class="collect-btn"
- @click="handleCollect('img')"
- />
- </p>
+ <p class="img">鍥�3-14</p>
<p>
瑙傚療鍥�3-14锛�1锛�
鍙戠幇锛屽嚱鏁�<i>f</i>锛�<i>x</i>锛�=|<i>x</i>|鐨勫畾涔夊煙鏄紙-鈭烇紝+鈭烇級锛屽嚱鏁板浘鍍忓叧浜�<i>y</i>杞村绉�.浠庤〃3-11涓繕鍙戠幇锛屽綋鑷彉閲忓彇涓�瀵圭浉鍙嶆暟鏃讹紝瀵瑰簲鐨勫嚱鏁板�肩浉绛夛紝濡�<i>f</i>锛�-1锛�=<i>f</i>锛�1锛�=1锛�<i>f</i>锛�-2锛�=<i>f</i>锛�2锛�=2锛�<i>f</i>锛�-3锛�=<i>f</i>锛�3锛�=3锛屸�﹀疄闄呬笂锛屽浠绘剰<i>x</i>鈭堬紙-鈭烇紝+鈭烇級锛岄兘鏈�<i>f</i>锛�-<i>x</i>锛�=|-<i>x</i>|=|<i>x</i>|=<i>f</i>锛�<i>x</i>锛夛紝鍗�<i>f</i>锛�-<i>x</i>锛�=<i>f</i>锛�<i>x</i>锛�.
@@ -146,7 +138,15 @@
style="width: 40%"
/>
</p>
- <p class="img">鍥�3-15</p>
+ <p class="img fl al-cn ju-cn">
+ <span>鍥�3-15</span>
+ <img
+ :src="chapterData.isCollectImg ? collectCheck : collectImg"
+ alt=""
+ class="collect-btn"
+ @click="handleCollect('img')"
+ />
+ </p>
<video
:src="videoPath"
webkit-playsinline="true"
@@ -307,6 +307,32 @@
/>
</svg>
</span>
+ <span class="btn-box" @click="stepDialog = true">
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="19.28"
+ height="20.563"
+ viewBox="0 0 19.28 20.563"
+ >
+ <g transform="translate(-109.056 -82.941)">
+ <path
+ class="a"
+ d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z"
+ transform="translate(-3316.14 15289.201)"
+ />
+ <path
+ class="a"
+ d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z"
+ transform="translate(-196.896 -148.921)"
+ />
+ <path
+ class="a"
+ d="M763.392,793.79l3.262-3.262h-3.262Z"
+ transform="translate(-638.661 -690.634)"
+ />
+ </g>
+ </svg>
+ </span>
<span class="btn-box" @click="openMathDiaolog">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -330,32 +356,6 @@
class="a"
d="M14.936,7.489l.693,2.251a5.154,5.154,0,0,0,.236.61c.083.159.18.242.3.242a.82.82,0,0,0,.533-.457,4.849,4.849,0,0,0,.339-.817H17.8a4.849,4.849,0,0,1-.693,1.51,2.813,2.813,0,0,1-.873.852,1.766,1.766,0,0,1-.88.27,1.178,1.178,0,0,1-1.018-.464,4.357,4.357,0,0,1-.623-1.309l-.326-1.067a6.4,6.4,0,0,0-.222-.8L12.747,7c-.083-.27-.152-.478-.2-.6a1.136,1.136,0,0,0-.194-.312.4.4,0,0,0-.284-.118c-.326,0-.6.423-.817,1.261h-.769a6.671,6.671,0,0,1,.6-1.5,3.034,3.034,0,0,1,.81-.873,1.663,1.663,0,0,1,.942-.312,1.344,1.344,0,0,1,1.067.471,3.692,3.692,0,0,1,.644,1.268l.139.436C14.672,6.7,14.936,7.489,14.936,7.489Z"
transform="translate(398 948)"
- />
- </g>
- </svg>
- </span>
- <span class="btn-box" @click="stepDialog = true">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width="19.28"
- height="20.563"
- viewBox="0 0 19.28 20.563"
- >
- <g transform="translate(-109.056 -82.941)">
- <path
- class="a"
- d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z"
- transform="translate(-3316.14 15289.201)"
- />
- <path
- class="a"
- d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z"
- transform="translate(-196.896 -148.921)"
- />
- <path
- class="a"
- d="M763.392,793.79l3.262-3.262h-3.262Z"
- transform="translate(-638.661 -690.634)"
/>
</g>
</svg>
@@ -750,20 +750,26 @@
if (oldAnswer) {
oldAnswer = JSON.parse(oldAnswer);
console.log("鏃ф暟鎹�", oldAnswer);
- if(oldAnswer[9]) {
+ 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
+ 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;
});
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index 23b1a5f..5efb3b0 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -68,7 +68,7 @@
v-for="(itemText, indexText) in value.stem"
:key="indexText"
>
- <span v-if="typeof itemText == 'string'">{{ itemText }}</span>
+ <span v-if="typeof itemText == 'string'" v-html="itemText" ></span>
<!-- -->
<el-input
v-else
--
Gitblit v1.9.1