From 9e5a098d71e7023d155597dde69de887e63add3d Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 14 Aug 2025 16:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.2' into feature/v5.0/5.0.2
---
src/components/CreateQRcode/CreateQRcode.vue | 6 +++---
src/views/tickets/ticket.vue | 6 ++----
src/assets/images/dataCenter/qrCode.png | 0
src/assets/images/dataCenter/qrCode.svg | 17 +++++++++++++++++
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/assets/images/dataCenter/qrCode.png b/src/assets/images/dataCenter/qrCode.png
new file mode 100644
index 0000000..fd402f0
--- /dev/null
+++ b/src/assets/images/dataCenter/qrCode.png
Binary files differ
diff --git a/src/assets/images/dataCenter/qrCode.svg b/src/assets/images/dataCenter/qrCode.svg
new file mode 100644
index 0000000..0ec5174
--- /dev/null
+++ b/src/assets/images/dataCenter/qrCode.svg
@@ -0,0 +1,17 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315688">
+<g id="Frame" clip-path="url(#clip0_1238_1817)">
+<g id="Frame_2" clip-path="url(#clip1_1238_1817)">
+<path id="Vector" d="M4.83697 10.163H3.10692V8.43298H1.37593V11.029H3.10692V11.894H4.83697V11.029H6.56795V8.43298H4.83697V10.163ZM12.625 8.43298H7.43298V13.625H12.625V8.43298ZM10.894 10.164V11.8949H9.16303V10.163L10.894 10.164ZM12.625 2.375H7.43298V7.56982H12.625V2.375ZM10.894 4.10598V5.83697H9.16303V4.10598H10.894ZM6.56702 2.375H1.375V7.56982H6.56795L6.56702 2.375ZM4.83604 4.10598V5.83697H3.10692V4.10598H4.83604ZM3.10692 11.894H1.37593V13.625H3.10692V11.894ZM6.56795 11.894H4.83697V13.625H6.56795V11.894Z" fill="#212121"/>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1238_1817">
+<rect width="11" height="11" fill="white" transform="translate(1.5 2.13086)"/>
+</clipPath>
+<clipPath id="clip1_1238_1817">
+<rect width="12" height="12" fill="white" transform="matrix(-1 0 0 1 13 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/CreateQRcode/CreateQRcode.vue b/src/components/CreateQRcode/CreateQRcode.vue
index 3131fcd..fc18491 100644
--- a/src/components/CreateQRcode/CreateQRcode.vue
+++ b/src/components/CreateQRcode/CreateQRcode.vue
@@ -4,6 +4,7 @@
</template>
<script setup>
+import { wgs84ToGcj02 } from '@/utils/coordinateTransformation';
import QRCode from 'qrcodejs2-fix'
const props = defineProps(['latAndLon'])
@@ -11,8 +12,7 @@
let qrCodeInstance = null
const createQRcode = content => {
-console.log('this.currentDetail.content',content);
-
+ const transformed = wgs84ToGcj02(content[0], content[1])
if (!content) return
if (qrCodeInstance) {
myQrCode.value.innerHTML = ''
@@ -21,7 +21,7 @@
qrCodeInstance = new QRCode(myQrCode.value, {
width: 92,
height: 91,
- text: `https://uri.amap.com/marker?position=${content}&name=%E4%BA%8B%E4%BB%B6%E7%82%B9`,
+ text: `https://uri.amap.com/marker?position=${transformed}&name=%E4%BA%8B%E4%BB%B6%E7%82%B9`,
})
}
watch(
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 93a433a..87c2bf8 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -649,7 +649,7 @@
>
<template #reference>
- <img @click.stop="handleQRCode(currentDetail)" class="QRCodeImg" src="@/assets/images/dataCenter/positionicon.png" 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>
@@ -884,7 +884,6 @@
</template>
<script>
-
import { getSmallImg, getShowImg } from '@/utils/util';
import { ElMessageBox, ElLoading } from 'element-plus';
import { calculateDefaultRange } from '@/utils/util';
@@ -1439,8 +1438,6 @@
},
async handleQRCode (val){
val.showQR = !val.showQR
-console.log('this.currentDetailvvvvv',val);
-
},
async loadAMapScripts() {
try {
@@ -3452,6 +3449,7 @@
width: 18px;
height: 18px;
cursor: pointer;
+ padding-bottom: 1px;
}
}
--
Gitblit v1.9.3