From 6f2e1f380b4bfdcc43dcac731226ccab49e17706 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 24 八月 2023 13:42:49 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/views/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
index fdfbaa9..c9970c2 100644
--- a/screen_standard/src/views/index.vue
+++ b/screen_standard/src/views/index.vue
@@ -59,7 +59,7 @@
:content="'宸叉姤宸ヨ壇鍝佹暟' + child.doneNum + '锛涘伐搴忚鍒掓暟' + child.planNum" placement="top">
<div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
<div class="scroll_item_row_item_x"></div>
- <span v-if="child.rate < 100">{{ child.rate.toFixed(0) }}%</span>
+ <span v-if="child.rate < 100">{{ Math.floor(child.rate) }}%</span>
<img v-else src="@/assets/img/ic_complete@2x.png" alt="" />
<span class="scroll_item_row_item_wz">{{ child.procedureName.substring(0, 3) }}</span>
</div>
@@ -385,11 +385,15 @@
let option;
option = {
title: {
- text: `杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.num}`,
+ text: ` 杩戜竷鏃ヤ笉鑹搧鎬绘暟锛�${data.num}`,
textStyle: {
color: '#fff',
fontSize: 12
}
+ },
+ grid: {
+ top: 40,
+ bottom: 30
},
xAxis: {
type: 'category',
@@ -636,8 +640,11 @@
}
// 缁勪欢杩涜婊氬姩
scrollDom.scrollTop += 2
+
// 鍒ゆ柇鏄惁婊氬姩鍒板簳閮�
- if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
+ if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight-0.5)) {
+ console.log(scrollDom.scrollTop);
+ console.log(scrollDom.scrollHeight, scrollDom.clientHeight);
// 鑾峰彇缁勪欢绗竴涓妭鐐�
let first = scrollDom.children[0]
// 鍒犻櫎鑺傜偣
@@ -768,9 +775,7 @@
$fixed-height: 690px;
.content1 {
- scrollbar-width:none;
- -ms-overflow-style:none;
- ::-webkit-scrollbar{display:none}
+
flex: 1;
width: 100%;
height: auto;
--
Gitblit v1.9.3