From c64df82202faf901a8c332652bb2bbd0b6e80f59 Mon Sep 17 00:00:00 2001 From: njdaoyehu Date: Wed, 23 Apr 2025 10:27:38 +0800 Subject: [PATCH] fixed --- src/views/data/device/schema.ts | 1 + src/views/data/task/index.vue | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/data/device/schema.ts b/src/views/data/device/schema.ts index e708065..2e4da5f 100644 --- a/src/views/data/device/schema.ts +++ b/src/views/data/device/schema.ts @@ -60,6 +60,7 @@ export const schema = { }, colProps, component: 'Input', + rules: [{ required: true, message: '请输入设备序列号!' }], }, table: { }, diff --git a/src/views/data/task/index.vue b/src/views/data/task/index.vue index 785edae..5a15180 100644 --- a/src/views/data/task/index.vue +++ b/src/views/data/task/index.vue @@ -288,15 +288,25 @@ pdfView.value.show(); }; + let wallCode = null; const handleCapture = (base64ImageString: any) => { isLoading.value = true; - OCRService.importByOCR(base64ImageString).then( + OCRService.importByOCR(base64ImageString, wallCode).then( (res: any) => { + if (res === "") { + isLoading.value = false; + return; + } const data = JSON.parse(res); if (data.length === 0) { isLoading.value = false; return; } + if (data[0].length > 5) { + wallCode = data[0].code.substring(0, data.length - 5); + } else { + wallCode = null; + } if (ocrData === null) { const record = { name: '',