From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen_standard/src/components/AppLayout.vue | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 1083e29..22f0e80 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -82,7 +82,7 @@
return enterprise.deviceNum
})
const unqualifiedRate = computed(() => {
- return +enterprise.unqualifiedRate.toFixed(2)
+ return enterprise.unqualifiedRate
})
const title = computed(() => {
return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�'
@@ -160,7 +160,7 @@
}
}, 1000)
// console.log(date.getDay());
-
+
})
const back = () => {
enterprise.setProcedureName('')
@@ -174,22 +174,18 @@
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
-
// width: 1920px;
// height: 1080px;
width: 100%;
height: 100%;
- padding: 20px 30px;
- overflow-y: scroll;
- display: flex;
- flex-direction: column;
-
+ padding: 30px;
+ // overflow-y: scroll;
box-sizing: border-box;
.header {
background-image: url('@/assets/img/bg_maintitle@2x.png');
- background-size: 100% 70px;
+ background-size: 100% 74px;
width: 100%;
- height: 70px;
+ height: 74px;
display: flex;
padding-top: 1px;
padding-left: 20px;
@@ -257,15 +253,14 @@
}
}
.num-list {
- margin-top: 20px;
- margin-bottom: 20px;
+ margin-top: 24px;
+ margin-bottom: 27px;
display: flex;
justify-content: space-between;
- height: 80px;
+ height: 88px;
color: white;
.num-item {
width: calc(25% - 50px);
- height: 80px;
background-size: 100% 100%;
margin-right: 25px;
padding-left: 30px;
--
Gitblit v1.9.3