From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- screen/src/views/PlatformCall.vue | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue index 0bf36df..e042bff 100644 --- a/screen/src/views/PlatformCall.vue +++ b/screen/src/views/PlatformCall.vue @@ -21,9 +21,17 @@ const initData = () => { getLargeScreenData().then(res => { if (res.data && res.data.allList) { - contentList.value = res.data.allList.map(item => { + contentList.value = res.data.allList.map((item, index) => { + item.index = index + 1 if (item.optTime) { item.optTimeTemp = dayjs(item.optTime).format('HH:mm') + if(item.status == 4){ + if(item.optTime >= new Date().getTime()){ + item.optTimeTemp = dayjs.duration(item.optTime - new Date().getTime()).format('HH:mm') + }else{ + item.optTimeTemp = '-' + } + } // item.optTimeTemp = dayjs.duration(Math.abs(new Date().getTime() - item.optTime)).format('HH:mm') } return item @@ -108,7 +116,7 @@ var qr = new UQRCode() // 璁剧疆浜岀淮鐮佸唴瀹� qr.data = qrcode.value - qr.size = 220 + qr.size = 268 // 璋冪敤鍒朵綔浜岀淮鐮佹柟娉� qr.make() var canvas = document.getElementById("qrcode") @@ -153,7 +161,7 @@ const handler = () => { isFullscreen.value = document.fullscreenElement !== null if (!isFullscreen) { - // 閫�鍑哄叏灞忔椂鍊欒В闄ょ洃鍚紝涓嶇劧姣忔鐩戝惉閮戒細娣诲姞涓�娆$粦瀹� + // 閫�鍑哄叏灞忔椂鍊欒В闄ょ洃鍚紝涓嶇劧姣忔鐩戝惉閮戒細娣诲姞涓�娆$粦瀹� document.removeEventListener("fullscreenchange", handler) } } @@ -185,7 +193,7 @@ </script> <template> - <v-scale-screen width="1920" height="1080" :fullScreen="true"> + <v-scale-screen width="1920" height="1080"> <div class="main_app"> <div class="main_header"> <img class="bg" src="@/assets/images/call/title@2x.png" alt=""> @@ -207,8 +215,8 @@ <div class="item">鍋滈潬鏈堝彴</div> <div class="item">鏃堕棿</div> </div> - <div class="line" v-for="item in contentTempList" :key="item.id"> - <div class="item no">{{ item.signNum }}</div> + <div class="line" v-for="(item, index) in contentTempList" :key="index"> + <div class="item no">{{ item.index }}</div> <div class="item">{{ item.carCodeFront }}</div> <div class="item"> <div :class="{ @@ -219,7 +227,9 @@ </div> <div class="item">{{ item.platformName || '-' }}</div> <div class="item"> - <div v-if="item.optTimeTemp" class="time_place">棰勮瀹屾垚鏃堕棿</div> + <div v-if="item.optTimeTemp" class="time_place"> + {{ item.status == 4 ? '鍓╀綑绛夊緟鏃堕棿' : '棰勮瀹屾垚鏃堕棿' }} + </div> <div>{{ item.optTimeTemp || '-' }}</div> </div> </div> @@ -248,7 +258,7 @@ </div> <div class="qrcode_wrap"> <div class="qrcode"> - <canvas id="qrcode" width="220" height="220"></canvas> + <canvas id="qrcode" width="268" height="268"></canvas> </div> <div class="title">璇锋壂鐮佺鍒�</div> </div> @@ -501,7 +511,7 @@ justify-content: center; .qrcode { - padding: 6px; + padding: 6px 6px 4px; background-color: #fff; } @@ -536,4 +546,4 @@ } } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.3