From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 03 一月 2025 15:30:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- h5/pages/operation/device.vue | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/h5/pages/operation/device.vue b/h5/pages/operation/device.vue index 9377ebb..414be7b 100644 --- a/h5/pages/operation/device.vue +++ b/h5/pages/operation/device.vue @@ -83,7 +83,8 @@ import { uploadUrl, ywDevicePost, - ywDeviceCreate + ywDeviceCreate, + getPointRecordByCode } from '@/api' import dayjs from 'dayjs'; import { @@ -122,7 +123,7 @@ }, handleP() { const { - param, + param, fileList } = this ywDeviceCreate({ @@ -285,8 +286,19 @@ }, (decodeText, decodeResult) => { if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭 - this.$set(this.param, 'deviceCode', decodeText) - this.stopScan(); //鍏抽棴鎵爜鍔熻兘 + this.$set(this.param, 'deviceCode', decodeText) + this.stopScan(); //鍏抽棴鎵爜鍔熻兘 + getPointRecordByCode({ + // taskId: this.id, + pointCode: decodeText + }).then(ress => { + if (ress.data) { + console.log('ress', ress.data); + } else { + this.showToast('鏈尮閰嶅埌宸℃鐐�,璇烽噸鏂版壂鎻�') + } + }) + } }, (err) => { -- Gitblit v1.9.3