From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111
---
screen_standard/src/views/index.vue | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 3ed7c45..975400e 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -714,14 +714,17 @@
scrollDom = scrollContainer1.value
} else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if (scrollDom.children.length < 6) {
+ if (scrollDom.children.length <= 6) {
clearTimeout(timer1.value)
return
}
+ // console.log(data.plannedProgress);
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
+ // scrollDom.scrollTo(0, scrollDom.scrollTop + 3)
+ // console.log('2-----',scrollDom.scrollTop, scrollDom.scrollHeight, scrollDom.clientHeight );
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop+2 >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -739,16 +742,17 @@
scrollDom = scrollContainer2.value
} else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if (scrollDom.children.length < 10) {
+ if (scrollDom.children.length <= 10) {
clearTimeout(timer2.value)
return
}
// 缁勪欢杩涜婊氬姩
- scrollDom.scrollTop += 1
+ scrollDom.scrollTo(0, scrollDom.scrollTop + 1) // += 1
+ // scrollDom.scrollTop(scrollDom.scrollTop + 1)
// console.log('scrollDom.scrollTop', scrollDom.scrollTop);
// console.log('scrollDom.scrollHeight - scrollDom.clientHeight', scrollDom.scrollHeight - scrollDom.clientHeight);
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop &&scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -776,7 +780,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop = scrollDom.scrollTop+2
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -790,18 +794,12 @@
let scrollDom = scrollContainer4.value
if (!scrollDom) return
// 鍒よ缁勪欢鏄惁娓叉煋瀹屾垚
- if (scrollDom.offsetHeight == 0) {
+ if (scrollDom.scrollTop && scrollDom.offsetHeight == 0) {
scrollDom = scrollContainer4.value
} else {
// console.log(scrollDom.offsetHeight);
let num = scrollDom.offsetHeight / 35;
num = num + (scrollDom.offsetHeight % 35 > 0 ? 1 : 0)
- // console.log('----------');
- // console.log('scrollDom.children.length', scrollDom.children.length)
- // console.log('scrollDom.offsetHeight % 35', scrollDom.offsetHeight % 35)
- // console.log('num', num)
- // console.log('----------');
- // // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
if (scrollDom.children.length <= num) {
clearTimeout(timer4.value)
return
@@ -810,10 +808,7 @@
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
- console.log('scrollDom.scrollTop', scrollDom.scrollTop);
- console.log('scrollDom.scrollHeight', scrollDom.scrollHeight);
- console.log('scrollDom.clientHeight', scrollDom.clientHeight );
+ if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// if (scrollDom.scrollTop >= 35) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -835,7 +830,7 @@
console.log('onMounted');
init()
timer5.value = setInterval(init, 60000)
- timer.value = setInterval(scrillAction, 100)
+ // timer.value = setInterval(scrillAction, 100)
}
window.addEventListener('resize', () => {
setTypeChart()
--
Gitblit v1.9.3