From b7d7ba71ac11b10d6cd8dedca24ffaf751dc81e1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 16:17:26 +0800
Subject: [PATCH] 大屏优化
---
src/views/screen/components/screen-video/index.vue | 6 +++---
src/views/screen/newPage/index.vue | 4 ++--
src/views/screen/index.vue | 21 ++++++++++++---------
src/views/screen/components/screen-table/index.vue | 12 ++++++------
src/views/screen/components/screen-car/index.vue | 6 +++---
src/views/screen/components/screen-face/index.vue | 6 +++---
6 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/views/screen/components/screen-car/index.vue b/src/views/screen/components/screen-car/index.vue
index 5a3f04e..a884f9d 100644
--- a/src/views/screen/components/screen-car/index.vue
+++ b/src/views/screen/components/screen-car/index.vue
@@ -22,7 +22,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧姝ｅ父鏁�</div>
+ <div class="data-lable">姝ｅ父鏁�</div>
<div class="data-num type2" v-roll>{{ 2000 }}</div>
</div>
</div>
@@ -34,7 +34,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧寮傚父鏁�</div>
+ <div class="data-lable">寮傚父鏁�</div>
<div class="data-num type3" v-roll>{{ 1000 }}</div>
</div>
</div>
@@ -136,4 +136,4 @@
.width-img {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/screen/components/screen-face/index.vue b/src/views/screen/components/screen-face/index.vue
index e1d0982..8c1f54a 100644
--- a/src/views/screen/components/screen-face/index.vue
+++ b/src/views/screen/components/screen-face/index.vue
@@ -22,7 +22,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧姝ｅ父鏁�</div>
+ <div class="data-lable">姝ｅ父鏁�</div>
<div class="data-num type2" v-roll>{{ 2000 }}</div>
</div>
</div>
@@ -34,7 +34,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧寮傚父鏁�</div>
+ <div class="data-lable">寮傚父鏁�</div>
<div class="data-num type3" v-roll>{{ 1000 }}</div>
</div>
</div>
@@ -134,4 +134,4 @@
.width-img {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue
index be0de28..c3d8812 100644
--- a/src/views/screen/components/screen-table/index.vue
+++ b/src/views/screen/components/screen-table/index.vue
@@ -15,13 +15,13 @@
<el-tooltip placement="top">
<div slot="content">
<div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-label">姝ｅ父鏁�:</div>
<div class="tip-info tip-success">
{{ scope.row.faceNormalNum }}
</div>
</div>
<div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-label">寮傚父鏁�:</div>
<div class="tip-info tip-danger">
{{ scope.row.faceErrorNum }}
</div>
@@ -39,13 +39,13 @@
<el-tooltip placement="top">
<div slot="content">
<div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-label">姝ｅ父鏁�:</div>
<div class="tip-info tip-success">
{{ scope.row.carNormalNum }}
</div>
</div>
<div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-label">寮傚父鏁�:</div>
<div class="tip-info tip-danger">
{{ scope.row.carErrorNum }}
</div>
@@ -63,13 +63,13 @@
<el-tooltip placement="top">
<div slot="content">
<div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-label">姝ｅ父鏁�:</div>
<div class="tip-info tip-success">
{{ scope.row.videoNormalNum }}
</div>
</div>
<div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-label">寮傚父鏁�:</div>
<div class="tip-info tip-danger">
{{ scope.row.videoErrorNum }}
</div>
diff --git a/src/views/screen/components/screen-video/index.vue b/src/views/screen/components/screen-video/index.vue
index 46b2e44..c7ff5e1 100644
--- a/src/views/screen/components/screen-video/index.vue
+++ b/src/views/screen/components/screen-video/index.vue
@@ -22,7 +22,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧姝ｅ父鏁�</div>
+ <div class="data-lable">姝ｅ父鏁�</div>
<div class="data-num type2" v-roll>{{ 2000 }}</div>
</div>
</div>
@@ -34,7 +34,7 @@
<img src="@/assets/images/screen/icon/icon2.png" alt="" class="width-img">
</div>
<div class="data-info">
- <div class="data-lable">璁惧寮傚父鏁�</div>
+ <div class="data-lable">寮傚父鏁�</div>
<div class="data-num type3" v-roll>{{ 1000 }}</div>
</div>
</div>
@@ -130,4 +130,4 @@
.width-img {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue
index 0f5f718..93572eb 100644
--- a/src/views/screen/index.vue
+++ b/src/views/screen/index.vue
@@ -114,9 +114,9 @@
<div class="normal-statistics-content">
<ul class="list-title-container">
<li>鍦板尯</li>
- <li>瑙嗛璁惧</li>
- <li>杞﹁締璁惧</li>
- <li>浜鸿劯璁惧</li>
+ <li>瑙嗛</li>
+ <li>杞﹁締</li>
+ <li>浜鸿劯</li>
</ul>
<div class="list-content">
<div class="list-content-to is-scroll-bar">
@@ -396,14 +396,14 @@
item1.value1 = this.workOrderData.doneNum
item1.value2 = this.workOrderData.totalNum - this.workOrderData.doneNum
item1.color = '#5cff9a'
- item1.title = '宸插鐞嗗伐鍗曟暟'
+ item1.title = '宸插鐞�'
this.statistics.push(item1)
let item2 = {value1: 0, value2: 0, title: "", color: ""}
item2.value1 = this.workOrderData.todoNum
item2.value2 = this.workOrderData.totalNum - this.workOrderData.todoNum
item2.color = '#ff7b72'
- item2.title = '鏈鐞嗗伐鍗曟暟'
+ item2.title = '鏈鐞�'
this.statistics.push(item2)
console.log( this.statistics)
},
@@ -976,6 +976,7 @@
display: flex;
flex-direction: column;
height: 0;
+ overflow: hidden;
.title {
width: 100%;
@@ -989,7 +990,7 @@
position: relative;
border-bottom: 1px solid #3e97e4;
border-right: 1px solid #3e97e4;
- padding: 4% 4% 4% 0;
+ padding: 0 4% 4% 0;
box-sizing: border-box;
height: 0;
@@ -1017,6 +1018,7 @@
.list-title-container {
width: 100%;
height: 45px;
+ margin: 4px 0 0 0;
line-height: 45px;
list-style-type: none;
display: flex;
@@ -1092,6 +1094,7 @@
height: 100%;
overflow-y: auto;
overflow-x: hidden;
+ padding: 10px 0;
}
.item-list {
@@ -1100,7 +1103,7 @@
align-items: center;
list-style-type: none;
border-bottom: 1px dashed #223654;
-
+ margin: 10px 0;
li {
width: 25%;
text-align: center;
@@ -1111,8 +1114,8 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- height: 44px;
- line-height: 44px;
+ height: 28px;
+ line-height: 28px;
}
.name {
diff --git a/src/views/screen/newPage/index.vue b/src/views/screen/newPage/index.vue
index 298f604..4e2d483 100644
--- a/src/views/screen/newPage/index.vue
+++ b/src/views/screen/newPage/index.vue
@@ -45,13 +45,13 @@
</div>
</div>
<div class="data-info">
- <div class="data-lable center">璁惧姝ｅ父鏁�</div>
+ <div class="data-lable center">姝ｅ父鏁�</div>
<div class="data-num type2 center">
<span v-roll>{{ item.normalNum }}</span>
</div>
</div>
<div class="data-info">
- <div class="data-lable center">璁惧寮傚父鏁�</div>
+ <div class="data-lable center">寮傚父鏁�</div>
<div class="data-num type3 center">
<span v-roll>{{ item.errorNum }}</span>
</div>
--
Gitblit v1.8.0