From 1e34d0773506d542ddcf914cdcaa94708167d89b Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 10:24:55 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/views/index.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index 369bc45..7c4172d 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -131,7 +131,7 @@
</div>
<div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
<div ref="scrollContainer3" class="scroll_container">
- <div v-for="(item, index) in 15" :key="item.id" :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
+ <div v-for="(item, index) in 6" :key="item.id" :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
<div class="scroll_item_row">闊╀紵</div>
<div class="scroll_item_row">鐢靛悏浠�</div>
<div class="scroll_item_row">CP003</div>
@@ -185,7 +185,9 @@
</template>
<script setup>
- import {reactive, ref, onMounted, onBeforeUnmount, onUnmounted, nextTick} from 'vue'
+ import { reactive, ref, onMounted, onBeforeUnmount, onUnmounted, nextTick } from 'vue'
+ import { getTop } from '@/utils/api.js'
+ import { useCounterStore } from '@/stores/counter.js'
let timer = ref(null)
let timer1 = ref(null)
@@ -213,6 +215,11 @@
activeBackground: 'tab_select@2x.png'
}
])
+
+ const enterprise = useCounterStore()
+
+ console.log(enterprise.count++)
+
start()
start1()
// start2()
@@ -235,9 +242,13 @@
// })
// }
- // onMounted(()=> {
- // getSensorData()
- // })
+ onMounted(()=> {
+ // getSensorData()
+ getTop(8, 36)
+ .then(res => {
+ console.log(res)
+ })
+ })
onBeforeUnmount(()=>{
clearTimeout(timer.value)
@@ -332,7 +343,7 @@
clearTimeout(timer4.value)
// 瀹氭椂鍣ㄨЕ鍙戝懆鏈�
let speed4 = ref(25)
- timer3.value = setInterval(ListScroll4, speed4.value)
+ timer4.value = setInterval(ListScroll4, speed4.value)
}
function ListScroll() {
let scrollDom = scrollContainer.value
@@ -341,14 +352,14 @@
scrollDom = scrollContainer.value
}else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if(scrollDom.children.length < 4) {
+ if(scrollDom.children.length < 8) {
clearTimeout(timer.value)
return
}
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if(scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -372,7 +383,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if(scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -396,7 +407,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if(scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -413,14 +424,14 @@
scrollDom = scrollContainer3.value
}else {
// 濡傛灉鍒楄〃鏁伴噺杩囧皯涓嶈繘琛屾粴鍔�
- if(scrollDom.children.length < 7) {
+ if(scrollDom.children.length < 6) {
clearTimeout(timer3.value)
return
}
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if(scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -444,7 +455,7 @@
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 1
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if(scrollDom.scrollTop == (scrollDom.scrollHeight - scrollDom.clientHeight)) {
+ if(scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -718,7 +729,7 @@
}
.scroll_item {
width: 100%;
- height: 57px;
+ height: 58px;
display: flex;
align-items: center;
.scroll_item_row {
@@ -897,7 +908,7 @@
}
.main_container {
width: 100%;
- height: calc(100% - 34px);
+ height: calc(100% - 33px);
.scroll_container {
width: 100%;
height: 100%;
@@ -910,7 +921,7 @@
}
.scroll_item {
width: 100%;
- height: 36px;
+ height: 37px;
display: flex;
align-items: center;
.scroll_item_row {
--
Gitblit v1.9.3