From 1b89c6d9b6626e09cf3c30a2f2d7354c9f18151f Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 27 五月 2024 17:20:17 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/lifeCare/index.vue |   77 +++++++++++++++++++++-----------------
 1 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index 1a46089..978878f 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -1,33 +1,36 @@
 <template>
-  <div
-    class="public-books"
-    @scroll="throttledScrollHandler"
-    @mouseup="handleMouseUp"
-    :style="{
-      fontSize: fontSize ? fontSize + 'px' : '16px',
-      transform: `scale(${pageZoom ? pageZoom : 1})`,
-    }"
-  >
-    <front001 v-if="showCatalogList.indexOf(0) > -1" />
-    <ChapterOne v-if="showCatalogList.indexOf(1) > -1" />
-    <ChapterTwo v-if="showCatalogList.indexOf(2) > -1" />
-    <ChapterThree v-if="showCatalogList.indexOf(3) > -1" />
-    <ChapterFour v-if="showCatalogList.indexOf(4) > -1" />
-    <ChapterFive  v-if="showCatalogList.indexOf(5) > -1" />
-    <chapterSix v-if="showCatalogList.indexOf(6) > -1" />
-    <!-- <chapterSix /> -->
-    <!-- <chapterSeven /> -->
-    <!-- <chapterEight /> -->
-    <!-- <chapterNine /> -->
-    <!-- <chapter010 /> -->
-    <!-- <chapter011 /> -->
-    <!-- <chapter012 /> -->
-    <!-- <chapter013 /> -->
-    <!-- <chapter014 /> -->
-    <!-- <chapter015 /> -->
-    <!-- <chapter016 /> -->
-    <!-- <chapter017 /> -->
-    <!-- <topic008 /> -->
+  <div class="page-main" @scroll="throttledScrollHandler">
+    <div
+      class="public-books"
+      @mouseup="handleMouseUp"
+      :style="{
+        fontSize: fontSize ? fontSize + 'px' : '16px',
+        transform: `scale(${pageZoom ? pageZoom : 1})`,
+      }"
+    >
+      <div style="width: 100%; height: 800px;">
+        <drawflow />
+      </div>
+      <front001 v-if="showCatalogList.indexOf(0) > -1" />
+      <ChapterOne v-if="showCatalogList.indexOf(1) > -1" />
+      <ChapterTwo v-if="showCatalogList.indexOf(2) > -1" />
+      <ChapterThree v-if="showCatalogList.indexOf(3) > -1" />
+      <ChapterFour v-if="showCatalogList.indexOf(4) > -1" />
+      <ChapterFive v-if="showCatalogList.indexOf(5) > -1" />
+      <chapterSix v-if="showCatalogList.indexOf(6) > -1" />
+      <chapterSeven v-if="showCatalogList.indexOf(7) > -1" />
+      <chapterEight v-if="showCatalogList.indexOf(8) > -1" />
+      <chapterNine v-if="showCatalogList.indexOf(9) > -1" />
+      <chapter010 v-if="showCatalogList.indexOf(10) > -1" />
+      <chapter011 v-if="showCatalogList.indexOf(11) > -1" />
+      <chapter012 v-if="showCatalogList.indexOf(12) > -1" />
+      <chapter013 v-if="showCatalogList.indexOf(13) > -1" />
+      <chapter014 v-if="showCatalogList.indexOf(14) > -1" />
+      <chapter015 v-if="showCatalogList.indexOf(15) > -1" />
+      <chapter016 v-if="showCatalogList.indexOf(16) > -1" />
+      <chapter017 v-if="showCatalogList.indexOf(17) > -1" />
+      <chapter018 v-if="showCatalogList.indexOf(18) > -1" />
+    </div>
   </div>
 </template>
 
@@ -50,12 +53,14 @@
 import chapter015 from "./view/chapter015";
 import chapter016 from "./view/chapter016";
 import chapter017 from "./view/chapter017";
-
+import chapter018 from "./view/chapter018";
+import NoteIcon from "@/assets/images/biji.png";
+import drawflow from "@/components/drawflow";
+import _ from "lodash";
 export default {
-  name: "temp-book",
   data() {
     return {
-      catalogLength: 13, // 鎬荤珷鑺傛暟
+      catalogLength: 18, // 鎬荤珷鑺傛暟
       showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
       loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
       throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -76,6 +81,7 @@
             showCatalogList: newVal,
           });
         }
+
         // 鍚姩椤电爜瑙傚療
         setTimeout(() => {
           this.initObservation();
@@ -145,6 +151,7 @@
     // }, 3000);
   },
   components: {
+    drawflow,
     front001,
     ChapterOne,
     ChapterTwo,
@@ -163,6 +170,7 @@
     chapter015,
     chapter016,
     chapter017,
+    chapter018,
   },
   computed: {
     fontSize() {
@@ -231,6 +239,7 @@
         // 鍚戜笅
         const currentScrollTop =
           event.target.scrollTop + event.target.offsetHeight;
+
         if (
           currentScrollTop >=
           event.target.scrollHeight - this.loadThreshold
@@ -330,7 +339,7 @@
             // 绗旇
             pageDom.innerHTML = pageDom.innerHTML.replace(
               reg,
-              `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')">${data.txt}<img src="${NoteIcon}" style="cursor: pointer" /></span>`
+              `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')" onmouseover="noteHover('Note','${data.id}','${data.chapterNum}')">${data.txt}<img src="${NoteIcon}" style="cursor: pointer" /></span>`
             );
             break;
         }
@@ -387,7 +396,6 @@
       const borderColorDom = (
         this.container ? this.container : document
       ).querySelectorAll(".theme-border");
-      console.log(this.config, "this.configthis.config");
       // 鑾峰彇閰嶇疆鐨勪富棰樿壊
       const bookThemeColor =
         this.config.activeBook && this.config.activeBook.bookThemeColor
@@ -477,7 +485,6 @@
             "chapter"
           );
           const catalog = catalogDom.getAttribute("num");
-          console.log("page", page, catalog);
           // 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
           if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
             this.$store.state.qiankun.pageChange({

--
Gitblit v1.9.1