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 | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index fb9771d..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浜戝伐鍘傝溅闂村ぇ灞�'
@@ -115,9 +115,9 @@
}
const fullChange = () => {
- // data.isFull = !data.isFull
+ data.isFull = !data.isFull
let element = document.documentElement;
- if (!data.isFull) { // 鍏ㄥ睆
+ if (data.isFull) { // 鍏ㄥ睆
if (element.requestFullscreen) {
element.requestFullscreen();
} else if (element.webkitRequestFullScreen) {
@@ -139,11 +139,10 @@
document.msExitFullscreen();
}
}
- data.isFull = !data.isFull
+ // data.isFull = !data.isFull
}
onMounted(() => {
- enterprise.setDepartId()
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -151,21 +150,17 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
- fullChange()
const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
- 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()
+ let date = new Date()
data.tempDate = {
- 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]
+ time: `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`,
+ date: `${date.getFullYear()}/${date.getMonth()+1}/${date.getDate()}`,
+ day: week[date.getDay()-1]
}
}, 1000)
+ // console.log(date.getDay());
+
})
const back = () => {
enterprise.setProcedureName('')
@@ -179,27 +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;
- scrollbar-width:none;
- -ms-overflow-style:none;
- &::-webkit-scrollbar{
- width: 0;
- }
- 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;
@@ -267,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