From 64b3ee8aebe765c668b7f04b2bc1ee9a3919bdfb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 24 八月 2023 14:31:01 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/components/AppLayout.vue | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 7604b4d..22f0e80 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -25,10 +25,6 @@
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
<img v-else src="@/assets/img/ic_exitfullscreen@2x.png" class="full-ic" @click="fullChange">
<img src="@/assets/img/title_line@2x.png" class="right-line" alt="">
-
- <template>
- <v-mini-weather></v-mini-weather>
- </template>
<div class="date">
<div class="time">{{ tempDate.time }}</div>
<div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
@@ -63,8 +59,6 @@
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
import { useRoute, useRouter } from 'vue-router'
-import { vMiniWeather } from 'vue-mini-weather'
-// export default { components: {vMiniWeather }}
const enterprise = useCounterStore()
const route = useRoute()
const router = useRouter()
@@ -88,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浜戝伐鍘傝溅闂村ぇ灞�'
@@ -166,7 +160,7 @@
}
}, 1000)
// console.log(date.getDay());
-
+
})
const back = () => {
enterprise.setProcedureName('')
@@ -180,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;
@@ -263,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