From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
src/views/equipmentManagement/ledger/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 331cb37..7356ada 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -291,8 +291,8 @@
};
const showQRCode = async (row) => {
- // 浣犲彲浠ヨ嚜瀹氫箟浜岀淮鐮佸唴瀹癸紝姣斿 row.id 鎴� row.deviceName
- const qrContent = JSON.stringify(row); // 鎴� `${row.id}`
+ // 鐩存帴浣跨敤URL锛屼笉瑕佺敤JSON.stringify鍖呰
+ const qrContent = proxy.javaApi + '/device-info?deviceId=' + row.id;
qrCodeUrl.value = await QRCode.toDataURL(qrContent);
qrRowData.value = row;
qrDialogVisible.value = true;
--
Gitblit v1.9.3