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 | 112 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 31 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index bcf8abb..fb9771d 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -2,7 +2,7 @@
<div class="content">
<div class="header">
<div class="header-item" style="font-size: 20px;">
- <el-dropdown trigger="click">
+ <el-dropdown trigger="click" v-if="route.name=='home'">
<div class="eare-title">
{{ tempCom.name}}
<div class="right-icon">
@@ -15,9 +15,11 @@
</el-dropdown-menu>
</template>
</el-dropdown>
-
+
+ <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="back">
</div>
- <div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</div>
+
+ <div class="title">{{ title }}</div>
<div class="header-item right">
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
@@ -30,7 +32,6 @@
<!-- <img src="@/assets/img/title_line@2x.png" class="right-line" alt=""> -->
</div>
</div>
- <!-- 'background': `url(${getAssets(item.bgImg)})`, -->
<div class="num-list">
<div
v-for="(item, index) in layoutList"
@@ -41,23 +42,26 @@
<img :src="getAssets(item.logo)" alt="">
<div class="item-right">
<div class="item-title">{{ item.name }}</div>
- <div class="num-value">1</div>
+ <div class="num-value">{{ countList[index] }}</div>
</div>
-
</div>
</div>
- <RouterView />
+ <KeepAlive>
+ <router-view></router-view>
+ </KeepAlive>
</div>
</template>
<script setup>
import { getAssets } from '@/utils'
-import { getDepartmentList } from '@/utils/apis.js'
-import { reactive, toRefs, ref, onMounted } from 'vue';
+import { getDepartmentList } from '@/utils/api.js'
+import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
-import { RouterView } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
const enterprise = useCounterStore()
+const route = useRoute()
+const router = useRouter()
const layoutList = [
{ bgImg: 'bg_zhixingzhong@2x.png', name: '鎵ц涓鍒掓暟(涓�)', logo: 'ic_zhixingzhong@2x.png' },
{ bgImg: 'bg_yanqijihua@2x.png', name: '寤舵湡璁″垝鏁�(涓�)', logo: 'ic_yanqijihua@2x.png' },
@@ -65,7 +69,24 @@
{ bgImg: 'bg_jinrishebei@2x.png', name: '浠婃棩鐢熶骇璁惧(鍙�)', logo: 'ic_jinrishebei@2x.png' },
{ bgImg: 'bg_jinribuliang@2x.png', name: '浠婃棩涓嶈壇鍝佺巼(%)', logo: 'ic_jinribuliang@2x.png' },
]
-
+const ingNum = computed(() => {
+ return enterprise.ingNum
+})
+const delayNum = computed(() => {
+ return enterprise.delayNum
+})
+const prouserNum = computed(() => {
+ return enterprise.prouserNum
+})
+const deviceNum = computed(() => {
+ return enterprise.deviceNum
+})
+const unqualifiedRate = computed(() => {
+ return +enterprise.unqualifiedRate.toFixed(2)
+})
+const title = computed(() => {
+ return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�'
+})
const data = reactive({
tempCom: { name: '璞嗙背绉戞妧' },
isFull: false,
@@ -74,21 +95,29 @@
date: '',
day: ''
},
- comList: []
+ comList: [],
+ countList: [
+ ingNum||0,
+ delayNum||0,
+ prouserNum||0,
+ deviceNum||0,
+ unqualifiedRate||0
+ ]
})
-let { tempCom, isFull, tempDate, comList } = toRefs(data)
+
+
+let { tempCom, isFull, tempDate, comList, countList } = toRefs(data)
const selectCom = (item, index) => {
- console.log(item);
data.tempCom = item
enterprise.setDepartId(data.tempCom.id)
}
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) {
@@ -110,10 +139,11 @@
document.msExitFullscreen();
}
}
- // data.isFull = !data.isFull
+ data.isFull = !data.isFull
}
onMounted(() => {
+ enterprise.setDepartId()
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -121,36 +151,55 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
- const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',]
+ 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('')
+ router.go(-1)
+}
</script>
<style lang="scss" scoped>
.content {
- background-image: url('@/assets/img/bg@2x.png');
+ background-image: url('@/assets/img/bg.png');
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
+
+ // width: 1920px;
+ // height: 1080px;
width: 100%;
height: 100%;
- padding: 30px;
+ padding: 20px 30px;
overflow-y: scroll;
+ scrollbar-width:none;
+ -ms-overflow-style:none;
+ &::-webkit-scrollbar{
+ width: 0;
+ }
+ 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;
@@ -218,14 +267,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