From fe0ef3441cd689e3679696d990b0ca1b5d7193ac Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:10:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen_standard/src/components/AppLayout.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 1083e29..fb9771d 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -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,10 +139,11 @@
document.msExitFullscreen();
}
}
- // data.isFull = !data.isFull
+ data.isFull = !data.isFull
}
onMounted(() => {
+ enterprise.setDepartId()
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -150,17 +151,21 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
+ fullChange()
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('')
@@ -181,6 +186,11 @@
height: 100%;
padding: 20px 30px;
overflow-y: scroll;
+ scrollbar-width:none;
+ -ms-overflow-style:none;
+ &::-webkit-scrollbar{
+ width: 0;
+ }
display: flex;
flex-direction: column;
--
Gitblit v1.9.3