From deaa638544da41dbc8b46f158e600e74ebbb26e3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 18:03:03 +0800
Subject: [PATCH] 大屏

---
 screen_standard/src/views/index.vue |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 7339346..2f482fd 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -740,12 +740,15 @@
     scrollDom = scrollContainer3.value
   } else {
     // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
-    if (scrollDom.children.length <= 5) {
+    let num = scrollContainer3.value.offsetHeight / 35;
+    // alert(scrollDom.children.length  +"---------------"+num)
+    // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
+    if (scrollDom.children.length <= num) {
       clearTimeout(timer3.value)
       return
     }
     // 缁勪欢杩涜婊氬姩
-    scrollDom.scrollTop += 1
+    scrollDom.scrollTop = scrollDom.scrollTop+2
     // 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
     if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -764,13 +767,16 @@
   if (scrollDom.offsetHeight == 0) {
     scrollDom = scrollContainer4.value
   } else {
+    // console.log(bottom1.value.height);
+    let num = scrollContainer4.value.offsetHeight / 35;
+    // alert(scrollDom.children.length  +"---------------"+num)
     // 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
-    if (scrollDom.children.length < 5) {
+    if (scrollDom.children.length <= num) {
       clearTimeout(timer4.value)
       return
     }
     // 缁勪欢杩涜婊氬姩
-    scrollDom.scrollTop += 1
+    scrollDom.scrollTop += 2
     // 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
     if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -972,7 +978,7 @@
 
         .main_container {
           width: 100%;
-          height: calc(100% - 35px);
+          height: calc(100% - 38px);
 
           .scroll_container {
             width: 100%;

--
Gitblit v1.9.3