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

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

diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 7b7a115..80b418b 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -170,7 +170,7 @@
         </div>
       </div>
       <!-- 璁惧宸℃璁板綍 -->
-      <div class="content_right_bottom">
+      <div class="content_right_bottom" ref="bottom1">
         <div class="content_right_bottom_head">
           <span>璁惧宸℃璁板綍</span>
         </div>
@@ -229,11 +229,13 @@
 let timer3 = ref(null)
 let timer4 = ref(null)
 let timer5 = ref(null)
+let bottomAuthHeight = 284;
 let scrollContainer = ref(null)
 let scrollContainer1 = ref(null)
 let scrollContainer2 = ref(null)
 let scrollContainer3 = ref(null)
 let scrollContainer4 = ref(null)
+let bottom1 = ref(null)
 let cate = ref([
   {
     name: '鎴愬搧璁″垝杩涘害',
@@ -274,6 +276,7 @@
 start1()
 
 const init = () => {
+  setBottomHeight();
   // 褰撴棩鍛樺伐浜ч噺TOP10
   getTop(companyId.value, departId.value)
     .then(res => {
@@ -370,6 +373,11 @@
     .then(res => {
       enterprise.setNum(res)
     })
+}
+function  setBottomHeight(){
+  const pageHeight = window.innerHeight;
+  bottomAuthHeight = pageHeight -700;
+  // bottom1.style.height=bottomAuthHeight;
 }
 
 /**
@@ -737,12 +745,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)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
@@ -761,15 +772,18 @@
   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)) {
+    if (scrollDom.scrollTop <(scrollDom.scrollHeight - scrollDom.clientHeight)) {
       // 鑾峰彇缁勪欢绗竴涓妭鐐�
       let first = scrollDom.children[0]
       // 鍒犻櫎鑺傜偣
@@ -804,7 +818,8 @@
     margin-right: 20px;
     .content_left_item1 {
       width: 100%;
-      height: 284px;
+      height:  calc(100vh - 690px);
+    //  height: 284px;
       margin-bottom: 20px;
       .content_left_item1_head {
         background: url('@/assets/img/home_title_short@2x.png');
@@ -828,7 +843,7 @@
 
       .content_left_item1_content {
         width: 100%;
-        height: 246px;
+        height: calc(100% - 38px);
         padding: 20px;
         overflow: hidden;
         box-sizing: border-box;
@@ -965,7 +980,7 @@
 
         .main_container {
           width: 100%;
-          height: calc(100% - 35px);
+          height: calc(100% - 38px);
 
           .scroll_container {
             width: 100%;
@@ -1276,7 +1291,8 @@
 
     .content_center_bottom {
       width: 100%;
-      height: 284px;
+     // height: 284px;
+      height:  calc(100vh - 690px);
       flex: 2;
       .content_center_bottom_head {
         width: 100%;
@@ -1460,8 +1476,9 @@
 
     .content_right_bottom {
       width: 100%;
-      height: 284px;
+     // height: 284px;
 
+      height:  calc(100vh - 690px);
       .content_right_bottom_head {
         width: 100%;
         height: 38px;

--
Gitblit v1.9.3