From 1a74c4ab9c4f1fff15e85e57743f6967c4898b91 Mon Sep 17 00:00:00 2001 From: Mr.Zhang <710666463@qq.com> Date: 星期三, 23 八月 2023 16:23:46 +0800 Subject: [PATCH] 大屏适配 --- screen_standard/src/components/AppLayout.vue | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue index ad01b2c..1083e29 100644 --- a/screen_standard/src/components/AppLayout.vue +++ b/screen_standard/src/components/AppLayout.vue @@ -16,10 +16,10 @@ </template> </el-dropdown> - <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="router.go(-1)"> + <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"> @@ -46,17 +46,19 @@ </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 { getDepartmentList } from '@/utils/api.js' import { reactive, toRefs, onMounted, computed } from 'vue'; import { useCounterStore } from '@/stores/counter.js' -import { RouterView, useRoute, useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' const enterprise = useCounterStore() const route = useRoute() const router = useRouter() @@ -80,9 +82,11 @@ return enterprise.deviceNum }) const unqualifiedRate = computed(() => { - return enterprise.unqualifiedRate + return +enterprise.unqualifiedRate.toFixed(2) }) - +const title = computed(() => { + return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�' +}) const data = reactive({ tempCom: { name: '璞嗙背绉戞妧' }, isFull: false, @@ -139,7 +143,6 @@ } onMounted(() => { - console.log(route.name); getDepartmentList(enterprise.companyId) .then(res => { data.comList = res @@ -147,7 +150,7 @@ enterprise.setDepartId(data.tempCom.id) }) .catch(err => {}) - const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',] + const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�'] setInterval(() => { let date = new Date() data.tempDate = { @@ -159,24 +162,34 @@ // 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; + 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; @@ -244,14 +257,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