From d53f8346128633356e0b0996a78d2a039c97f4d7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 20 一月 2025 18:39:53 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
h5/pages/operation/device.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue
index 414be7b..25d7921 100644
--- a/h5/pages/operation/device.vue
+++ b/h5/pages/operation/device.vue
@@ -84,7 +84,7 @@
uploadUrl,
ywDevicePost,
ywDeviceCreate,
- getPointRecordByCode
+ getFindByCode
} from '@/api'
import dayjs from 'dayjs';
import {
@@ -285,15 +285,14 @@
qrbox: 280 //璁剧疆浜岀淮鐮佹壂鎻忔澶у皬
},
(decodeText, decodeResult) => {
- if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.$set(this.param, 'deviceCode', decodeText)
+ if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
this.stopScan(); //鍏抽棴鎵爜鍔熻兘
- getPointRecordByCode({
- // taskId: this.id,
- pointCode: decodeText
- }).then(ress => {
+ getFindByCode(decodeText).then(ress => {
if (ress.data) {
console.log('ress', ress.data);
+ this.$set(this.param, 'deviceCode', ress.data.code)
+ this.$set(this.param, 'deviceId', ress.data.id)
+ this.$set(this.param, 'deviceName', ress.data.name)
} else {
this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�')
}
--
Gitblit v1.9.3