From 530f8bc6a8438a95ad6582f85362da87b911dcf8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 23 五月 2024 15:24:05 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter006.vue | 30 +++---
src/books/lifeCare/view/chapter005.vue | 48 ++++++------
src/books/lifeCare/view/chapter002.vue | 60 ++------------
src/books/lifeCare/view/chapter001.vue | 2
src/books/lifeCare/view/chapter003.vue | 51 ++++++++----
src/books/lifeCare/view/chapter004.vue | 46 +++++-----
6 files changed, 105 insertions(+), 132 deletions(-)
diff --git a/src/books/lifeCare/view/chapter001.vue b/src/books/lifeCare/view/chapter001.vue
index 4a64bf7..99521c7 100644
--- a/src/books/lifeCare/view/chapter001.vue
+++ b/src/books/lifeCare/view/chapter001.vue
@@ -1370,7 +1370,7 @@
v-if="chapter001.idOpenThree && chapter001.qustionData[9]"
class="tips-file"
>
- <examinations :cardList="chapter001.qustionData[9]" />
+ <examinations :primaryColor="'#f49a4c'" :cardList="chapter001.qustionData[9]" />
</div>
</div>
</div>
diff --git a/src/books/lifeCare/view/chapter002.vue b/src/books/lifeCare/view/chapter002.vue
index 3330b47..496c05d 100644
--- a/src/books/lifeCare/view/chapter002.vue
+++ b/src/books/lifeCare/view/chapter002.vue
@@ -1,5 +1,5 @@
<template>
- <div class="chapter" num='2'>
+ <div class="chapter" num="2">
<div class="page-box" page="16">
<div class="bodystyle topImg">
<h2 id="b002"><img class="img-0" alt="" src="../image/dy2.jpg" /></h2>
@@ -1273,10 +1273,13 @@
/>
</div>
<div
- v-if="chapter002.idOpenThree && chapter002.qustionData[2]"
+ v-if="chapter002.idOpenThree && chapter002.qustionData[23]"
class="tips-file"
>
- <examinations :cardList="chapter002.qustionData[2]" />
+ <examinations
+ :primaryColor="'#f49a4c'"
+ :cardList="chapter002.qustionData[23]"
+ />
</div>
</div>
</div>
@@ -1306,53 +1309,8 @@
isInspectOpen: true,
isInspectOpen: true,
qustionData: {},
- textAreaItem: {
- text1: "",
- text2: "",
- text3: "",
- text4: "",
- text5: "",
- text6: "",
- text7: "",
- text8: "",
- text9: "",
- text10: "",
- text11: "",
- text12: "",
- text13: "",
- text14: "",
- text15: "",
- text16: "",
- text17: "",
- text18: "",
- text19: "",
- text20: "",
- text21: "",
- text22: "",
- text23: "",
- text24: "",
- text25: "",
- },
- table121: {
- text1: "",
- text2: "",
- text3: "",
- text4: "",
- text5: "",
- text6: "",
- text7: "",
- text8: "",
- text9: "",
- text10: "",
- text11: "",
- text12: "",
- text13: "",
- text14: "",
- text15: "",
- text16: "",
- text17: "",
- text18: "",
- },
+ textAreaItem: {},
+ table121: {},
// 琛ㄦ牸1-2-1
headersData: [
"妫�鏌ュ璞�",
@@ -1586,7 +1544,7 @@
"https:/jsek.bnuic.com/file/api/ApiDownload?md5=b727b78f8036a38cbd054816a81da7f8";
this.chapter002.videOneUrl =
"https:/jsek.bnuic.com/file/api/ApiDownload?md5=6e471afdbeb95a8891f1551cbb0cd4fd";
- this.qustionData = await getQuestionData("2",testData[2],this.config.activeBook);
+ this.chapter002.qustionData = await getQuestionData("2",testData[2],this.config.activeBook);
},
methods: {
activityOne() {
diff --git a/src/books/lifeCare/view/chapter003.vue b/src/books/lifeCare/view/chapter003.vue
index b752559..1319c71 100644
--- a/src/books/lifeCare/view/chapter003.vue
+++ b/src/books/lifeCare/view/chapter003.vue
@@ -2275,7 +2275,7 @@
<h4 id="d031">
鈻垛柖 搴旂敤涓庡疄璺�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
</h4>
- <div class="tips-bk">
+ <!-- <div class="tips-bk">
<div class="bj-tip">
浜戞祴璇曪細鍗曞厓涓夊簲鐢ㄤ笌瀹炶返<img
src="../icons/sub.png"
@@ -2289,7 +2289,7 @@
>
<examinations :cardList="chapter003.qustionData[3]" />
</div>
- </div>
+ </div> -->
<!-- <div class="bk-sys">
<div class="bj1-sys">
<p class="left">
@@ -2412,15 +2412,30 @@
@blur="onBlurChange('desc')"
></textarea>
</div>
+ <div class="tips-bk">
+ <div class="bj-tip">
+ 浜戞祴璇曪細鍗曞厓涓夊簲鐢ㄤ笌瀹炶返<img
+ src="../icons/sub.png"
+ @click="activityThree"
+ alt=""
+ />
+ </div>
+ <div
+ v-if="chapter003.idOpenThree && chapter003.qustionData[48]"
+ class="tips-file"
+ >
+ <examinations :cardList="chapter003.qustionData[48]" />
+ </div>
+ </div>
</div>
</div>
</div>
</template>
<script>
-// import getResourcePath from "@/assets/methods/resources.js";
-// import getQuestionData from "@/assets/methods/examination.js";
+import getResourcePath from "@/assets/methods/resources.js";
+import getQuestionData from "@/assets/methods/examination.js";
import testData from "../js/examinationList.js";
-// import examinations from "@/components/examinations/index.vue";
+import examinations from "@/components/examinations/index.vue";
export default {
name: "chapter003",
@@ -2807,24 +2822,24 @@
};
},
components: {
- // examinations,
+ examinations,
},
created() {
const localData = JSON.parse(localStorage.getItem("chapter003"));
if (localData) {
this.chapter003 = { ...Object.assign(this.chapter003, localData) };
}
- // this.chapter003.videOneUrl = getResourcePath("459ab85d46207bfcca4801dc9b319b9b");
- // this.chapter003.videoTwoUrl = getResourcePath("3817bea302b25b865ff938140939a8de");
- // this.chapter003.videoFourUrl = getResourcePath("7af72da649f6656c3b2164e708f5c132");
- // this.chapter003.videoFiveUrl = getResourcePath("e24de9b0cdd889cb73e9b472ad6f4731");
- // this.chapter003.videoSixUrl = getResourcePath("d95740ab777d9c7ca074c33317a835c4");
- // this.chapter003.videoSevenUrl = getResourcePath("0b330926f3e6ed510b48144a83199fb3");
- // this.chapter003.videoEigthUrl = getResourcePath("9f63cc4dcba6a87cbfe82a9ec4d7c77e");
- // this.chapter003.videoNineUrl = getResourcePath("c2ecf6f102a6e9b210f3db49b17b58a4");
- // this.chapter003.videoTenUrl = getResourcePath("b6943018923c0cbad4e414dc2097cb9a");
- // this.chapter003.videoEleUrl = getResourcePath("eb604885f7c01cdf2d95df839c9c233a");
- // this.chapter003.videoTevUrl = getResourcePath("f12a50c2ac57da78ff02f3d5f430163b");
+ this.chapter003.videOneUrl = getResourcePath("459ab85d46207bfcca4801dc9b319b9b");
+ this.chapter003.videoTwoUrl = getResourcePath("3817bea302b25b865ff938140939a8de");
+ this.chapter003.videoFourUrl = getResourcePath("7af72da649f6656c3b2164e708f5c132");
+ this.chapter003.videoFiveUrl = getResourcePath("e24de9b0cdd889cb73e9b472ad6f4731");
+ this.chapter003.videoSixUrl = getResourcePath("d95740ab777d9c7ca074c33317a835c4");
+ this.chapter003.videoSevenUrl = getResourcePath("0b330926f3e6ed510b48144a83199fb3");
+ this.chapter003.videoEigthUrl = getResourcePath("9f63cc4dcba6a87cbfe82a9ec4d7c77e");
+ this.chapter003.videoNineUrl = getResourcePath("c2ecf6f102a6e9b210f3db49b17b58a4");
+ this.chapter003.videoTenUrl = getResourcePath("b6943018923c0cbad4e414dc2097cb9a");
+ this.chapter003.videoEleUrl = getResourcePath("eb604885f7c01cdf2d95df839c9c233a");
+ this.chapter003.videoTevUrl = getResourcePath("f12a50c2ac57da78ff02f3d5f430163b");
this.chapter003.videOneUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=459ab85d46207bfcca4801dc9b319b9b";
this.chapter003.videoTwoUrl =
@@ -2847,7 +2862,7 @@
"https://jsek.bnuic.com/file/api/ApiDownload?md5=eb604885f7c01cdf2d95df839c9c233a";
this.chapter003.videoTevUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=f12a50c2ac57da78ff02f3d5f430163b";
- // this.chapter003.qustionData = await getQuestionData("3",testData[3]);
+ this.chapter003.qustionData = await getQuestionData("3",testData[3],this.config.activeBook);
},
methods: {
activityOne() {
diff --git a/src/books/lifeCare/view/chapter004.vue b/src/books/lifeCare/view/chapter004.vue
index 951bcd7..b9f9313 100644
--- a/src/books/lifeCare/view/chapter004.vue
+++ b/src/books/lifeCare/view/chapter004.vue
@@ -1111,21 +1111,6 @@
<h4 id="d042">
鈻垛柖 搴旂敤涓庡疄璺�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
</h4>
- <div class="tips-bk">
- <div class="bj-tip">
- 浜戞祴璇曪細鍗曞厓鍥涘簲鐢ㄤ笌瀹炶返<img
- src="../icons/sub.png"
- @click="activityThree"
- alt=""
- />
- </div>
- <div
- v-if="chapter004.idOpenThree && chapter004.qustionData[4]"
- class="tips-file"
- >
- <examinations :cardList="chapter004.qustionData[4]" />
- </div>
- </div>
<p><br /></p>
<!-- <p><br /></p>
<div class="bk-sys">
@@ -1242,19 +1227,34 @@
<p class="block">B.鐢ㄦ俯姘存礂灞佽偂</p>
<p class="block">C.渚垮悗渚跨泦娓呮礂娑堟瘨</p>
<p class="block">D.濂冲┐澶т究鍚庝竴瀹氳浠庡悗鍚戝墠鎿�</p>
+ <div class="tips-bk">
+ <div class="bj-tip">
+ 浜戞祴璇曪細鍗曞厓鍥涘簲鐢ㄤ笌瀹炶返<img
+ src="../icons/sub.png"
+ @click="activityThree"
+ alt=""
+ />
+ </div>
+ <div
+ v-if="chapter004.idOpenThree && chapter004.qustionData[65]"
+ class="tips-file"
+ >
+ <examinations :cardList="chapter004.qustionData[65]" />
+ </div>
+ </div>
</div>
</div>
</div>
</template>
<script>
-// import getResourcePath from "@/assets/methods/resources.js";
-// import getQuestionData from "@/assets/methods/examination.js";
+import getResourcePath from "@/assets/methods/resources.js";
+import getQuestionData from "@/assets/methods/examination.js";
import testData from "../js/examinationList.js";
-// import examinations from "@/components/examinations/index.vue";
+import examinations from "@/components/examinations/index.vue";
export default {
name: "chapter004",
components: {
- // examinations
+ examinations
},
data() {
return {
@@ -1317,16 +1317,16 @@
if (localData) {
this.chapter004 = { ...Object.assign(this.chapter004, localData) };
}
- // this.chapter004.videOneUrl = getResourcePath("c276be12bae3b1df0b3ce4aa01b14e1e");
- // this.chapter004.videoTwoUrl = getResourcePath("7eb7fe2e3c13885a96143110ca4f5654");
- // this.chapter004.videoFourUrl = getResourcePath("1b04691b60e5b5b207b3a4967c495d29");
+ this.chapter004.videOneUrl = getResourcePath("c276be12bae3b1df0b3ce4aa01b14e1e");
+ this.chapter004.videoTwoUrl = getResourcePath("7eb7fe2e3c13885a96143110ca4f5654");
+ this.chapter004.videoFourUrl = getResourcePath("1b04691b60e5b5b207b3a4967c495d29");
this.chapter004.videOneUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=c276be12bae3b1df0b3ce4aa01b14e1e";
this.chapter004.videoTwoUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=7eb7fe2e3c13885a96143110ca4f5654";
this.chapter004.videoFourUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=1b04691b60e5b5b207b3a4967c495d29";
- // this.chapter004.qustionData = await getQuestionData("4",testData[4]);
+ this.chapter004.qustionData = await getQuestionData("4",testData[4],this.config.activeBook);
},
methods: {
activityOne() {
diff --git a/src/books/lifeCare/view/chapter005.vue b/src/books/lifeCare/view/chapter005.vue
index 4f16150..eb49198 100644
--- a/src/books/lifeCare/view/chapter005.vue
+++ b/src/books/lifeCare/view/chapter005.vue
@@ -2611,21 +2611,6 @@
<h4 id="d061">
鈻垛柖 搴旂敤涓庡疄璺�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
</h4>
- <div class="tips-bk">
- <div class="bj-tip">
- 浜戞祴璇曪細鍗曞厓浜斿簲鐢ㄤ笌瀹炶返<img
- src="../icons/sub.png"
- @click="activityThree"
- alt=""
- />
- </div>
- <div
- v-if="chapter005.idOpenThree && chapter005.qustionData[3]"
- class="tips-file"
- >
- <examinations :cardList="chapter005.qustionData[3]" />
- </div>
- </div>
<p><br /></p>
<!-- <p><br /></p>
<div class="bk-sys">
@@ -2739,15 +2724,30 @@
@blur="onBlurChange('desc')"
></textarea>
</div>
+ <div class="tips-bk">
+ <div class="bj-tip">
+ 浜戞祴璇曪細鍗曞厓浜斿簲鐢ㄤ笌瀹炶返<img
+ src="../icons/sub.png"
+ @click="activityThree"
+ alt=""
+ />
+ </div>
+ <div
+ v-if="chapter005.idOpenThree && chapter005.qustionData[94]"
+ class="tips-file"
+ >
+ <examinations :cardList="chapter005.qustionData[94]" />
+ </div>
+ </div>
</div>
</div>
</div>
</template>
<script>
-// import getResourcePath from "@/assets/methods/resources.js";
-// import getQuestionData from "@/assets/methods/examination.js";
+import getResourcePath from "@/assets/methods/resources.js";
+import getQuestionData from "@/assets/methods/examination.js";
import testData from "../js/examinationList.js";
-// import examinations from "@/components/examinations/index.vue";
+import examinations from "@/components/examinations/index.vue";
export default {
name: "chapter005",
@@ -3172,17 +3172,17 @@
};
},
components: {
- // examinations,
+ examinations,
},
created() {
const localData = JSON.parse(localStorage.getItem("chapter005"));
if (localData) {
this.chapter005 = { ...Object.assign(this.chapter005, localData) };
}
- // this.chapter005.videOneUrl = getResourcePath("439b0bde62a5098875c77e2492676577");
- // this.chapter005.videoTwoUrl = getResourcePath("1a878261410b01ee8e4e0602a1fe935f");
- // this.chapter005.videoFourUrl = getResourcePath("6cf2619beb704b3d79de04f0775c8ba3");
- // this.chapter005.videoFiveUrl = getResourcePath("8400384441ad9236d5eab24f500ec2c7");
+ this.chapter005.videOneUrl = getResourcePath("439b0bde62a5098875c77e2492676577");
+ this.chapter005.videoTwoUrl = getResourcePath("1a878261410b01ee8e4e0602a1fe935f");
+ this.chapter005.videoFourUrl = getResourcePath("6cf2619beb704b3d79de04f0775c8ba3");
+ this.chapter005.videoFiveUrl = getResourcePath("8400384441ad9236d5eab24f500ec2c7");
this.chapter005.videOneUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=439b0bde62a5098875c77e2492676577";
this.chapter005.videoTwoUrl =
@@ -3191,7 +3191,7 @@
"https://jsek.bnuic.com/file/api/ApiDownload?md5=6cf2619beb704b3d79de04f0775c8ba3";
this.chapter005.videoFiveUrl =
"https://jsek.bnuic.com/file/api/ApiDownload?md5=8400384441ad9236d5eab24f500ec2c7";
- // this.chapter005.qustionData = await getQuestionData("5",testData[5]);
+ this.chapter005.qustionData = await getQuestionData("5",testData[5],this.config.activeBook);
},
methods: {
activityOne() {
diff --git a/src/books/lifeCare/view/chapter006.vue b/src/books/lifeCare/view/chapter006.vue
index 673da6b..03a7278 100644
--- a/src/books/lifeCare/view/chapter006.vue
+++ b/src/books/lifeCare/view/chapter006.vue
@@ -1,6 +1,6 @@
锘�<template>
- <div class="chapter">
- <div class="page-box">
+ <div class="chapter" num="6">
+ <div class="page-box" page="100">
<div class="bodystyle topImg">
<h2 id="b006"><img class="img-0" alt="" src="../image/dy6.jpg" /></h2>
<div class="bk">
@@ -47,7 +47,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="101">
<div class="bodystyle">
<div class="bk">
<div class="bj1">
@@ -93,7 +93,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="102">
<div class="bodystyle">
<div class="bk-qjms">
<p class="bj1-qjms">鈯欍��鎯呭鎻忚堪2銆�鈯�</p>
@@ -147,7 +147,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="103">
<div class="bodystyle">
<p>3.瀛︿範闃呰鎵嬪唽锛屽～鍐欒〃1-6-1骞跺洖绛旈棶棰樸��</p>
<p class="img">琛�1-6-1銆�鍚勫勾榫勬濠村辜鍎夸竴鏃ラギ姘撮噺缁熻琛�</p>
@@ -241,7 +241,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="104">
<div class="bodystyle">
<p>浣犺涓鸿繖鏍风殑璇存硶瀵瑰悧锛熻鍐欐槑鐞嗙敱銆�</p>
<div class="bk-tx">
@@ -290,7 +290,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="105">
<div class="bodystyle">
<div class="bk-qjms">
<p class="bj1-qjms">鈯欍��鎯呭鎻忚堪4銆�鈯�</p>
@@ -333,7 +333,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="106">
<div class="bodystyle">
<div class="bk-qjms">
<p class="bj1-qjms">鈯欍��鎯呭鎻忚堪2銆�鈯�</p>
@@ -377,7 +377,7 @@
</p>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="107">
<div class="bodystyle">
<h4 id="d066">
鈻垛柖 娲诲姩1锛氭壘鍑哄┐骞煎効鑷富楗按鐨勯棶棰�<span class="fontsz1"
@@ -425,7 +425,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="108">
<div class="bodystyle">
<div class="bk-qjms">
<p class="bj1-qjms">鈯欍��鎯呭鎻忚堪3銆�鈯�</p>
@@ -476,7 +476,7 @@
</div>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="109">
<div class="bodystyle">
<p>
1.鏍规嵁浠ヤ笂鎯呭锛岄拡瀵规煇涓�骞撮緞娈碉紝浠ュ皬缁勫悎浣滅殑鏂瑰紡鍏卞悓璁捐涓�涓富棰樺楗帮紝浣垮┐骞煎効鑳藉叿浣撱�佺洿瑙傚湴鐪嬪埌鑷繁鐨勯ギ姘撮噺锛屽悓鏃朵篃渚夸簬鎵樿偛鍥搷浣溿�傚湪涓嬫柟鐢诲嚭璁捐鑽夊浘锛屽苟鍒朵綔瀹屾垚銆�
@@ -612,7 +612,7 @@
<p><br /></p>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="110">
<div class="bodystyle">
<h3 id="c023">
<span class="bk-h3"
@@ -659,7 +659,7 @@
<p>5.鏁寸悊銆傚皢鎵�鐢ㄧ墿鍝佹竻鐞嗗共鍑�锛屾憜鏀炬暣榻愩��</p>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="111">
<div class="bodystyle">
<p><b>鈶㈠疄璁粌涔�</b></p>
<p>
@@ -827,7 +827,7 @@
</p>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="112">
<div class="bodystyle">
<p>5.甯姪鎴栬�呮彁閱掑┐骞煎効灏嗗槾宸存摝骞插噣銆�</p>
<p>6.濠村辜鍎垮枬瀹屽悗锛屾寚瀵煎┐骞煎効灏嗘按鏉斁鍥炴按鏉灦鐨勫搴斾綅缃��</p>
@@ -989,7 +989,7 @@
<p class="block">D.浠ヤ笂閮芥槸</p>
</div>
</div>
- <div class="page-box">
+ <div class="page-box" page="113">
<div class="bodystyle">
<p>
4.涓嬪垪鏄负濠村辜鍎挎彁渚涚殑楗敤姘达紝涓嶅畨鍏ㄧ殑鏄紙銆�<input
--
Gitblit v1.9.1