From 10cd77285a9d54b0e889e2917c0a5e3e55e83cf6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 14:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/PlatformCall.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue
index 0bf36df..98a699d 100644
--- a/screen/src/views/PlatformCall.vue
+++ b/screen/src/views/PlatformCall.vue
@@ -24,6 +24,14 @@
contentList.value = res.data.allList.map(item => {
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")
@@ -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;
}
--
Gitblit v1.9.3