From 6b30b9fa671bf207b0268749a19b7ccda0ec5d8b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 八月 2023 17:17:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
screen_standard/src/views/index.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 7b7a115..b996fd3 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;
}
/**
@@ -804,7 +812,8 @@
margin-right: 20px;
.content_left_item1 {
width: 100%;
- height: 284px;
+ height: calc(100vh - 700px);
+ // height: 284px;
margin-bottom: 20px;
.content_left_item1_head {
background: url('@/assets/img/home_title_short@2x.png');
@@ -1276,7 +1285,8 @@
.content_center_bottom {
width: 100%;
- height: 284px;
+ // height: 284px;
+ height: calc(100vh - 700px);
flex: 2;
.content_center_bottom_head {
width: 100%;
@@ -1460,8 +1470,9 @@
.content_right_bottom {
width: 100%;
- height: 284px;
+ // height: 284px;
+ height: calc(100vh - 700px);
.content_right_bottom_head {
width: 100%;
height: 38px;
--
Gitblit v1.9.3