From a0de35930e6eb6ba7d91ed7c0ae72a95be1f1f0a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 14 Aug 2025 09:06:10 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.2' into feature/v5.0/5.0.3
---
src/components/CreateQRcode/CreateQRcode.vue | 6 +++---
src/views/tickets/ticket.vue | 3 ---
src/views/wel/index.vue | 18 ++++++++++--------
3 files changed, 13 insertions(+), 14 deletions(-)
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 6dabe98..23c8073 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -884,7 +884,6 @@
</template>
<script>
-
import { getSmallImg, getShowImg } from '@/utils/util';
import { ElMessageBox, ElLoading } from 'element-plus';
import { calculateDefaultRange } from '@/utils/util';
@@ -1438,8 +1437,6 @@
},
async handleQRCode (val){
val.showQR = !val.showQR
-console.log('this.currentDetailvvvvv',val);
-
},
async loadAMapScripts() {
try {
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index ae808f9..1881964 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1,26 +1,26 @@
<template>
<wel-container>
- <div class="workbench">
+ <div class="workbench" v-if="display">
<div class="workleft">
<!-- 设备统计 -->
<statistics></statistics>
<!-- 综合统计分析 -->
<div class="comprehensiveCon">
<div class="comprehensive">
-
+
<div class="center">
<div class="centerLeft">
<!-- 工单统计 -->
<proportionStatic></proportionStatic>
<!-- 飞行统计 -->
<flightStatistics></flightStatistics>
-
+
</div>
<div class="centerRight">
<!-- 机巢工单数量排名(件) -->
<flyratio></flyratio>
<!-- 任务成果 -->
- <taskOutcome></taskOutcome>
+ <taskOutcome></taskOutcome>
</div>
</div>
</div>
@@ -53,6 +53,7 @@
import statistics from './components/statistics.vue'
import { ElMessage } from 'element-plus'
let checked = ref('CURRENT_YEAR')
+const display = ref(false)
let timeListStr = ['本周', '本月', '本年']
let timeListEnum = ['CURRENT_WEEK', 'CURRENT_MONTH', 'CURRENT_YEAR']
const params = ref({
@@ -68,7 +69,7 @@
dateSelect.value = item
-
+
}
const refresh = () => {
params.value.date_enum = 'CURRENT_YEAR'
@@ -89,8 +90,9 @@
getJobEventTotal().then(res => {
eventTotal.value = res?.data?.data || 0
})
-
-
+ setTimeout(() => {
+ display.value = true
+ },100)
})
</script>
@@ -194,7 +196,7 @@
.centerLeft {
width: 50%;
-
+
}
.centerRight {
--
Gitblit v1.9.3