From 23ebc0d9ee7d4b06916478f84b411d0406f11a3a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 05 六月 2024 18:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter002.vue | 104 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/src/books/lifeCare/view/chapter002.vue b/src/books/lifeCare/view/chapter002.vue
index ad7d79a..2f8ecad 100644
--- a/src/books/lifeCare/view/chapter002.vue
+++ b/src/books/lifeCare/view/chapter002.vue
@@ -1,7 +1,7 @@
<template>
<div class="chapter" num="3">
- <div class="page-box" page="16">
- <div v-if="showPageList.indexOf(16) > -1">
+ <div class="page-box" page="19">
+ <div v-if="showPageList.indexOf(19) > -1">
<div class="bodystyle topImg">
<h2 id="b002"><img class="img-0" alt="" src="../image/dy2.jpg" /></h2>
<div class="bk">
@@ -53,8 +53,8 @@
</div>
</div>
</div>
- <div class="page-box" page="17">
- <div v-if="showPageList.indexOf(17) > -1">
+ <div class="page-box" page="20">
+ <div v-if="showPageList.indexOf(20) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -75,13 +75,8 @@
<img class="img-gn" alt="" src="../image/dy-xxdh.jpg" />
</p>
</div>
- <p class="center">
- <el-image
- class="chapter002-img-0035"
- :src="picOneUrl"
- :preview-src-list="picArr"
- />
- <!-- <img class="img-a" alt="" src="../image/0027-1.jpg" /> -->
+ <p class="center openImgBox">
+ <img class="img-a" alt="" src="../image/0027-1.jpg" />
</p>
</div>
<div class="bk">
@@ -98,8 +93,8 @@
</div>
</div>
</div>
- <div class="page-box" page="18">
- <div v-if="showPageList.indexOf(18) > -1">
+ <div class="page-box" page="21">
+ <div v-if="showPageList.indexOf(21) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -205,8 +200,8 @@
</div>
</div>
</div>
- <div class="page-box" page="19">
- <div v-if="showPageList.indexOf(19) > -1">
+ <div class="page-box" page="22">
+ <div v-if="showPageList.indexOf(22) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -374,8 +369,8 @@
</div>
</div>
</div>
- <div class="page-box" page="20">
- <div v-if="showPageList.indexOf(20) > -1">
+ <div class="page-box" page="23">
+ <div v-if="showPageList.indexOf(23) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -476,8 +471,8 @@
</div>
</div>
</div>
- <div class="page-box" page="21">
- <div v-if="showPageList.indexOf(21) > -1">
+ <div class="page-box" page="24">
+ <div v-if="showPageList.indexOf(24) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -537,8 +532,8 @@
</div>
</div>
</div>
- <div class="page-box" page="22">
- <div v-if="showPageList.indexOf(22) > -1">
+ <div class="page-box" page="25">
+ <div v-if="showPageList.indexOf(25) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -643,8 +638,8 @@
</div>
</div>
</div>
- <div class="page-box" page="23">
- <div v-if="showPageList.indexOf(23) > -1">
+ <div class="page-box" page="26">
+ <div v-if="showPageList.indexOf(26) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -836,8 +831,8 @@
</div>
</div>
</div>
- <div class="page-box" page="24">
- <div v-if="showPageList.indexOf(24) > -1">
+ <div class="page-box" page="27">
+ <div v-if="showPageList.indexOf(27) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -928,8 +923,8 @@
</div>
</div>
</div>
- <div class="page-box" page="25">
- <div v-if="showPageList.indexOf(25) > -1">
+ <div class="page-box" page="28">
+ <div v-if="showPageList.indexOf(28) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -1064,20 +1059,15 @@
4.浠嬬粛銆佸垎浜紝缁勯暱浠嬬粛璁捐澧欓潰鐨勬�濊矾銆佹剰涔変笌鐩殑锛岀粍鍛樺垎浜嚜宸卞湪娲诲姩杩囩▼涓殑蹇冨緱銆�
</p>
<p>5.璇勫垎锛岀敱鍏朵粬缁勬寜鐓ц璁℃潵鍥彁绀哄崱鐨勮瘎鍒嗘爣鍑嗘墦鍒嗐��</p>
- <p class="center">
- <el-image
- class="chapter002-img-0035"
- :src="picOneUrl"
- :preview-src-list="picArr"
- />
- <!-- <img class="img-b" alt="" src="../image/0035-2.jpg" /> -->
+ <p class="center openImgBox">
+ <img class="img-b" alt="" src="../image/0035-2.jpg" />
</p>
<p class="img">鍥�1-2-1銆�鏉ュ洯鎻愮ず鍗�</p>
</div>
</div>
</div>
- <div class="page-box" page="26">
- <div v-if="showPageList.indexOf(26) > -1">
+ <div class="page-box" page="29">
+ <div v-if="showPageList.indexOf(29) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -1141,8 +1131,8 @@
</div>
</div>
</div>
- <div class="page-box" page="27">
- <div v-if="showPageList.indexOf(27) > -1">
+ <div class="page-box" page="30">
+ <div v-if="showPageList.indexOf(30) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -1214,8 +1204,8 @@
</div>
</div>
</div>
- <div class="page-box" page="28">
- <div v-if="showPageList.indexOf(28) > -1">
+ <div class="page-box" page="31">
+ <div v-if="showPageList.indexOf(31) > -1">
<div class="header">
<div class="pageHeader-first">
<div class="header-bj"></div>
@@ -1291,8 +1281,8 @@
</div>
</div>
</div>
- <div class="page-box" page="29">
- <div v-if="showPageList.indexOf(29) > -1">
+ <div class="page-box" page="32">
+ <div v-if="showPageList.indexOf(32) > -1">
<div class="header">
<div class="pageHeader-second">
<div class="second-con">
@@ -1420,7 +1410,7 @@
</div>
</template>
<script>
-import getResourcePath from "@/assets/methods/resources.js";
+import { getResourcePath } from "@/assets/methods/resources.js";
import examinations from "@/components/examinations/index.vue";
export default {
@@ -1432,6 +1422,10 @@
},
questionData: {
type: Object,
+ },
+ isSearch: {
+ type: Boolean,
+ default: false,
},
},
data() {
@@ -1673,20 +1667,18 @@
examinations,
},
async created() {
- const localData = JSON.parse(localStorage.getItem("chapter002"));
- if (localData) {
- this.chapter002 = { ...Object.assign(this.chapter002, localData) };
+ if (!this.isSearch) {
+ const localData = JSON.parse(localStorage.getItem("chapter002"));
+ if (localData) {
+ this.chapter002 = { ...Object.assign(this.chapter002, localData) };
+ }
+ this.chapter002.videOneUrl = await getResourcePath(
+ "6e471afdbeb95a8891f1551cbb0cd4fd"
+ );
+ this.chapter002.videOneUrl116 = await getResourcePath(
+ "b727b78f8036a38cbd054816a81da7f8"
+ );
}
- this.chapter002.videOneUrl = getResourcePath(
- "6e471afdbeb95a8891f1551cbb0cd4fd"
- );
- this.chapter002.videOneUrl116 = getResourcePath(
- "b727b78f8036a38cbd054816a81da7f8"
- );
- this.chapter002.videOneUrl116 =
- "https:/jsek.bnuic.com/file/api/ApiDownload?md5=b727b78f8036a38cbd054816a81da7f8";
- this.chapter002.videOneUrl =
- "https:/jsek.bnuic.com/file/api/ApiDownload?md5=6e471afdbeb95a8891f1551cbb0cd4fd";
},
methods: {
activityOne() {
--
Gitblit v1.9.1