From 221d9dfd1634d5fab98a686b0b8a83f6f1e088b5 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 24 八月 2023 10:56:56 +0800
Subject: [PATCH] 大屏 08.24

---
 screen_standard/src/components/AppLayout.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index b123f0f..88f8907 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
+    return +enterprise.unqualifiedRate.toFixed(2)
 })
 const title = computed(() => {
     return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` :  'DM浜戝伐鍘傝溅闂村ぇ灞�'
@@ -152,15 +152,18 @@
     .catch(err => {})
   const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
   setInterval(() => {
-    let date = new Date()
+    let tempDate = new Date()
+    let month = tempDate.getMonth()+1
+    let day = tempDate.getDate()
+    let hours = tempDate.getHours()
+    let minute = tempDate.getMinutes()
+    let seconds = tempDate.getSeconds()
     data.tempDate = {
-      time: `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`,
-      date: `${date.getFullYear()}/${date.getMonth()+1}/${date.getDate()}`,
-      day: week[date.getDay()-1]
+      time: `${hours<10?`0${hours}`:hours}:${minute<10?`0${minute}`:minute}:${seconds<10?`0${seconds}`:seconds}`,
+      date: `${tempDate.getFullYear()}/${month<10?`0${month}`:month}/${day<10?`0${day}`:day}`,
+      day: week[tempDate.getDay()-1]
     }
   }, 1000)
-  // console.log(date.getDay());
- 
 })
 const back = () => {
   enterprise.setProcedureName('')
@@ -174,18 +177,22 @@
   background-position: center;
   background-size: 100% 100%;
   background-repeat: no-repeat;
+
   // width: 1920px;
   // height: 1080px;
   width: 100%;
   height: 100%;
-  padding: 30px;
-  // overflow-y: scroll;
+  padding: 20px 30px;
+  overflow-y: scroll;
+  display: flex;
+  flex-direction: column;
+
   box-sizing: border-box;
   .header {
     background-image: url('@/assets/img/bg_maintitle@2x.png');
-    background-size: 100% 74px;
+    background-size: 100% 70px;
     width: 100%;
-    height: 74px;
+    height: 70px;
     display: flex;
     padding-top: 1px;
     padding-left: 20px;
@@ -253,14 +260,15 @@
     }
   }
   .num-list {
-    margin-top: 24px;
-    margin-bottom: 27px;
+    margin-top: 20px;
+    margin-bottom: 20px;
     display: flex;
     justify-content: space-between;
-    height: 88px;
+    height: 80px;
     color: white;
     .num-item {
       width: calc(25% - 50px);
+      height: 80px;
       background-size: 100% 100%;
       margin-right: 25px;
       padding-left: 30px;

--
Gitblit v1.9.3