From 2e664020f32a0eda87139bc1363fa34b7b5697ba Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 15 五月 2024 23:11:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index c3cfb15..6e37da0 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -51,7 +51,7 @@
},
watch: {
showCatalogList: {
- handler(newVal) {
+ handler(newVal, oldVal) {
if (
this.$store.state.qiankun &&
this.$store.state.qiankun.catalogChange
@@ -96,10 +96,17 @@
// this.gotoPage(5, 100);
// setTimeout(() => {
// this.renderSign("Note", {
- // page: 100,
- // txt: "鍓嶅効绔ョ敓闀垮彂鑲茬殑褰卞搷鏄竴涓笎",
+ // id: "2ACA9359",
+ // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
+ // page: "100",
+ // type: "Highlight",
// color: "#F5E12A"
// });
+ // setTimeout(() => {
+ // this.delSign({
+ // ids: ["2ACA9359"]
+ // });
+ // }, 2000);
// }, 1000);
// }, 3000);
},
@@ -145,18 +152,17 @@
}
}
// showCatalogList 褰撳墠鏄剧ず鐨勪笁涓珷鑺傦紝watch鐩戝惉浼犻�掔粰涓诲簲鐢�
- console.log(this.showCatalogList);
// 鏇存柊涓婁竴娆℃粴鍔ㄧ殑浣嶇疆
this.previousScrollTop = event.target.scrollTop;
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
- if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
- this.$store.state.qiankun.pageChange({
- page: 100,
- catalog: 5,
- catalogId: "",
- catalogName: ""
- });
+ // if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
+ // this.$store.state.qiankun.pageChange({
+ // page: 100,
+ // catalog: 5,
+ // catalogId: "",
+ // catalogName: ""
+ // });
},
gotoPage(catalog, page) {
if (catalog >= 0 && catalog <= this.catalogLength) {
@@ -202,33 +208,24 @@
// 楂樹寒
pageDom.innerHTML = pageDom.innerHTML.replace(
reg,
- `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight">${data.txt}</span>`
+ `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight" onclick="signClick('Highlight','${data.id}')">${data.txt}</span>`
);
break;
case "Dashing":
// 鍒掔嚎
pageDom.innerHTML = pageDom.innerHTML.replace(
reg,
- `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline">${data.txt}</span>`
+ `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline" onclick="signClick('Dashing','${data.id}')">${data.txt}</span>`
);
break;
case "Note":
// 绗旇
pageDom.innerHTML = pageDom.innerHTML.replace(
reg,
- `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline">${data.txt}</span><img src="${NoteIcon}" style="cursor: pointer" />`
+ `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}')">${data.txt}<img src="${NoteIcon}" style="cursor: pointer" /></span>`
);
break;
}
- // 缁戝畾浜嬩欢
- const thisAddDom = (
- this.container ? this.container : document
- ).querySelector(`[dataid="${data.id}"]`);
- thisAddDom.addEventListener("click", function (e) {
- console.log("鐐瑰嚮浜嬩欢鍥炶皟鐨勫疄渚嬶紝閫氳繃杩欎釜鍙傛暟鑾峰彇绫诲瀷", e);
- if (this.$store.state.qiankun && this.$store.state.qiankun.signClick)
- this.$store.state.qiankun.signClick(type, data);
- });
}
},
delSign({ ids, type }) {
--
Gitblit v1.9.1