From 3d27635c7ac693c461dd2ca01e8f5bebb1f0c642 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 17:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/lifeCare/index.vue |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index 20f1269..978878f 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -8,6 +8,9 @@
         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" />
@@ -52,11 +55,12 @@
 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 {
   data() {
     return {
-      catalogLength: 7, // 鎬荤珷鑺傛暟
+      catalogLength: 18, // 鎬荤珷鑺傛暟
       showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
       loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
       throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -147,6 +151,7 @@
     // }, 3000);
   },
   components: {
+    drawflow,
     front001,
     ChapterOne,
     ChapterTwo,
@@ -334,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;
         }

--
Gitblit v1.9.1