From 6fa2afebb9d4e64068a9c85405f5eb8566f73ba8 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 06 Sep 2025 10:39:18 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into test
---
src/components/CreateQRcode/CreateQRcode.vue | 7 +++++--
src/views/tickets/ticket.vue | 53 ++++++++++++++++++++++++++++++++---------------------
2 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/src/components/CreateQRcode/CreateQRcode.vue b/src/components/CreateQRcode/CreateQRcode.vue
index fc18491..642de73 100644
--- a/src/components/CreateQRcode/CreateQRcode.vue
+++ b/src/components/CreateQRcode/CreateQRcode.vue
@@ -19,10 +19,13 @@
}
// 生成新二维码
qrCodeInstance = new QRCode(myQrCode.value, {
- width: 92,
- height: 91,
+ width: 130,
+ height: 130,
text: `https://uri.amap.com/marker?position=${transformed}&name=%E4%BA%8B%E4%BB%B6%E7%82%B9`,
})
+ if (myQrCode.value.hasAttribute('title')) {
+ myQrCode.value.removeAttribute('title')
+ }
}
watch(
() => props.latAndLon,
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 1071185..fdc0710 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -695,30 +695,21 @@
<template v-else>
<div class="media-title">
地图标记事件点
- <el-popover
- v-if="currentDetail.status === 3 || currentDetail.status === 0"
- popper-class="custom-qrcode-popover"
- :width="120"
- :visible="currentDetail.showQR && detailVisible"
- placement="top"
- title=""
- trigger="hover"
+ <el-popover v-if="currentDetail.status === 3 || currentDetail.status === 0"
+ popper-class="custom-qrcode-popover"
+ :width="120"
+ :visible="currentDetail.showQR && detailVisible"
+ placement="top"
+ title=""
+ trigger="click"
+
>
<template #reference>
- <img
- @mouseenter="currentDetail.showQR = true"
- @mouseleave="currentDetail.showQR = false"
- class="QRCodeImg"
- src="@/assets/images/dataCenter/qrCode.svg"
- alt=""
- title="事件导航"
- />
+ <img @click.stop="handleQRCode(currentDetail)" class="QRCodeImg" src="@/assets/images/dataCenter/qrCode.svg" alt="" title="事件导航" />
</template>
<div class="qrcode-content">
- <CreateQRcode
- v-if="currentDetail.showQR && detailVisible"
- :latAndLon="currentDetail.location"
- ></CreateQRcode>
+ <div class="close-btn" @click.stop="currentDetail.showQR = false">×</div>
+ <CreateQRcode v-if="currentDetail.showQR && detailVisible" :latAndLon="currentDetail.location"></CreateQRcode>
</div>
</el-popover>
</div>
@@ -3107,7 +3098,27 @@
max-height: 96vh;
}
.custom-qrcode-popover {
- min-width: 120px !important;
+ min-width: 160px !important;
+ min-height: 140px !important;
+ position: relative;
+ .qrcode-content{
+margin-top: 8px;
+ .close-btn {
+ position: absolute;
+ top: 2px;
+ right: 2px;
+ width: 16px;
+ height: 16px;
+ line-height: 16px;
+ text-align: center;
+ cursor: pointer;
+ color: #999;
+ font-size: 16px;
+ z-index: 10;
+
+
+ }
+ }
}
</style>
<style lang="scss" scoped>
--
Gitblit v1.9.3