From 4b39710e41760807527cba66c248c0939c3427b0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 20 九月 2025 10:58:38 +0800
Subject: [PATCH] 巡检上传页面
---
src/pages/inspectionUpload/index.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/pages/inspectionUpload/index.vue b/src/pages/inspectionUpload/index.vue
index 5c57b4e..aed4e6e 100644
--- a/src/pages/inspectionUpload/index.vue
+++ b/src/pages/inspectionUpload/index.vue
@@ -317,9 +317,11 @@
const startScan = async () => {
try {
+ scanLoading.value = true
// 浣跨敤uniapp鐨勬壂鐮丄PI
uni.scanCode({
success: (res) => {
+ console.log('鎵爜鎴愬姛:', res)
handleScanSuccess(res)
},
fail: (err) => {
@@ -328,10 +330,14 @@
title: '鎵爜澶辫触',
icon: 'error'
})
+ },
+ complete: () => {
+ scanLoading.value = false
}
})
} catch (e) {
console.error('鍚姩鎵爜澶辫触:', e)
+ scanLoading.value = false
uni.showToast({
title: '鍚姩鎵爜澶辫触',
icon: 'error'
@@ -346,6 +352,8 @@
// 鎵爜鎴愬姛澶勭悊
const handleScanSuccess = async (result) => {
try {
+ console.log('澶勭悊鎵爜缁撴灉:', result)
+
uni.showToast({
title: '璇嗗埆鎴愬姛',
icon: 'success'
@@ -355,12 +363,28 @@
let qrData
try {
qrData = JSON.parse(result.result)
+ console.log('瑙ｆ瀽鐨勪簩缁寸爜鏁版嵁:', qrData)
} catch (e) {
- qrData = { deviceName: result.result, location: '' }
+ // 濡傛灉涓嶆槸JSON鏍煎紡锛岀洿鎺ヤ娇鐢ㄦ壂鐮佺粨鏋滀綔涓鸿澶囧悕绉�
+ qrData = {
+ deviceName: result.result,
+ location: '',
+ qrCodeId: result.result // 娣诲姞浜岀淮鐮両D
+ }
+ console.log('浣跨敤榛樿鏁版嵁鏍煎紡:', qrData)
+ }
+
+ // 纭繚鏁版嵁瀹屾暣鎬�
+ if (!qrData.deviceName) {
+ qrData.deviceName = result.result
+ }
+ if (!qrData.qrCodeId) {
+ qrData.qrCodeId = result.result
}
callBackendAPI(qrData)
} catch (error) {
+ console.error('澶勭悊鎵爜缁撴灉澶辫触:', error)
uni.showToast({
title: error.message || '鏁版嵁瑙ｆ瀽澶辫触',
icon: 'error'
@@ -369,11 +393,33 @@
}
const callBackendAPI = (result) => {
- nextTick(() => {
- qrCodeFormDia.value?.openDialog(result)
- })
+ console.log('鍑嗗鎵撳紑寮规锛屾暟鎹�:', result)
+ console.log('寮规缁勪欢寮曠敤:', qrCodeFormDia.value)
+
+ // 纭繚缁勪欢寮曠敤瀛樺湪
+ if (qrCodeFormDia.value) {
+ console.log('鐩存帴璋冪敤寮规openDialog鏂规硶')
+ qrCodeFormDia.value.openDialog(result)
+ } else {
+ // 濡傛灉缁勪欢寮曠敤涓嶅瓨鍦紝绛夊緟涓嬩竴涓猼ick
+ console.log('缁勪欢寮曠敤涓嶅瓨鍦紝绛夊緟nextTick')
+ nextTick(() => {
+ console.log('nextTick鍚庡脊妗嗙粍浠跺紩鐢�:', qrCodeFormDia.value)
+ if (qrCodeFormDia.value) {
+ console.log('nextTick鍚庤皟鐢ㄥ脊妗唎penDialog鏂规硶')
+ qrCodeFormDia.value.openDialog(result)
+ } else {
+ console.error('寮规缁勪欢寮曠敤涓嶅瓨鍦�')
+ uni.showToast({
+ title: '寮规缁勪欢鏈噯澶囧ソ',
+ icon: 'error'
+ })
+ }
+ })
+ }
}
+
// 鎵爜澶勭悊
const handleScanCode = (result) => {
console.log('鎵爜缁撴灉:', result)
--
Gitblit v1.9.3