From a3bc1499023bfcca59d823aefae8c546e36e7a45 Mon Sep 17 00:00:00 2001 From: zhangchunxia <746626068@qq.com> Date: 星期一, 06 五月 2024 10:04:00 +0800 Subject: [PATCH] 大屏改版代码提交 --- src/views/largeScreen/index.vue | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/views/largeScreen/index.vue b/src/views/largeScreen/index.vue index 4c23435..80247b4 100644 --- a/src/views/largeScreen/index.vue +++ b/src/views/largeScreen/index.vue @@ -3,7 +3,8 @@ <div class="content-head"> <div class="content-titles"> <div class="img-container"> - <img :src="titleUrl" alt="鍚夋湪涔冨幙浜洪ギ椤圭洰鐩戞祴骞冲彴"> + <!-- <img :src="titleUrl" :alt="titleAlt"> --> + {{titleAlt}} </div> <!-- <img style="width: 100%" src="../../image/screen/image_head.png" alt="" /> --> @@ -22,9 +23,10 @@ <div class="content-body flex" style="padding: 0 0.1rem"> <!-- 宸︿晶鍐呭 --> <div class="flex-item" style="width: 4.8rem"> - <left-top :baseInfos="baseInfos" class="item-area" style="height: 24vh"></left-top> + <left-top :baseInfos="baseInfos" class="item-area" style="height: 29vh"></left-top> <left-middle class="item-area" style="height: 29vh"></left-middle> - <left-bottom class="item-area" style="height: 29vh"></left-bottom> + <!-- <left-bottom class="item-area" style="height: 29vh"></left-bottom> --> + <right-top :baseInfos="baseInfos" class="item-area" style="height: 24vh"></right-top> </div> <!-- 涓棿閮ㄥ垎 --> <div class="flex-main" style="width: 9.2rem"> @@ -32,9 +34,11 @@ </div> <!-- 鍙充晶鍐呭 --> <div class="flex-item" style="width: 4.8rem"> - <right-top :baseInfos="baseInfos" class="item-area" style="height: 24vh"></right-top> + <!-- <right-top :baseInfos="baseInfos" class="item-area" style="height: 24vh"></right-top> --> + <!-- <right-tophubiao :baseInfos="baseInfos" class="item-area" style="height: 24vh"></right-tophubiao> --> <right-middle class="item-area" style="height: 29vh"></right-middle> - <right-bottom :wxMiniQrClientUrl="wxMiniQrClientUrl" class="item-area" style="height: 29vh"></right-bottom> + <left-bottom class="item-area" style="height: 29vh"></left-bottom> + <right-bottom :wxMiniQrClientUrl="wxMiniQrClientUrl" class="item-area" style="height: 24vh"></right-bottom> </div> </div> </div> @@ -42,11 +46,13 @@ <script> import leftTop from './component/leftTop' import leftMiddle from './component/leftMiddle' -import leftBottom from './component/leftBottom' -import middleArea from './component/middleArea' +import leftBottom from './component/leftBottom.vue' import rightTop from './component/rightTop' +import middleArea from './component/middleArea' +import rightTophubiao from './component/rightTophubiao' import rightMiddle from './component/rightMiddle' import rightBottom from './component/rightBottom' + import './index.scss' import { getProjectInfo } from '@/api/largeScreen' @@ -59,8 +65,9 @@ leftTop, leftMiddle, leftBottom, - middleArea, rightTop, + middleArea, + rightTophubiao, rightMiddle, rightBottom }, @@ -90,6 +97,7 @@ fullScreen: false, baseInfos: {}, // 椤圭洰鍩烘湰淇℃伅&杩愯惀姒傚喌 titleUrl: '', + titleAlt: '', wxMiniQrClientUrl: '' // 灏忕▼搴忎俊鎭� } }, @@ -109,7 +117,6 @@ }, // 鍏ㄥ睆 toggleFullScreen() { - console.log(document.fullscreenElement) if (!document.fullscreenElement) { document.documentElement.requestFullscreen() } else { @@ -127,6 +134,9 @@ getProjectInfo() { getProjectInfo({orgTag: 'dy'}).then((res) => { if(res.succ==1){ + console.log('........', res) + + this.titleAlt = res.title this.titleUrl = res.wxMiniQrManageUrl || '' this.wxMiniQrClientUrl = res.wxMiniQrClientUrl || '' }else{ -- Gitblit v1.8.0