From 07107dffc51a749563516055da7da41d0c242648 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 30 Sep 2025 15:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=87=BA=E5=BA=93OC?=
 =?UTF-8?q?R=E8=AF=86=E5=88=AB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolsLease/ocrScan/ocrOutScan.vue         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/materialsStation/toolsLease/ocrScan/ocrOutScan.vue b/src/pages/materialsStation/toolsLease/ocrScan/ocrOutScan.vue
index 558dbfa..bb42f00 100644
--- a/src/pages/materialsStation/toolsLease/ocrScan/ocrOutScan.vue
+++ b/src/pages/materialsStation/toolsLease/ocrScan/ocrOutScan.vue
@@ -53,9 +53,9 @@
           </uni-forms-item>
         </uni-forms>
       </view>
-      <div style="width: 100%">
-        <ElectronicSeal :maCode="codeData?.maCode" :maId="codeData?.maId" :devType="queryParams?.jiJuType" />
-      </div>
+<!--      <div style="width: 100%">-->
+<!--        <ElectronicSeal :maCode="codeData?.maCode" :maId="codeData?.maId" :devType="queryParams?.jiJuType" />-->
+<!--      </div>-->
 
       <button type="primary" style="margin-top: 20px" @click="addCode">添加编码</button>
     </view>
@@ -106,10 +106,10 @@
 <script>
 import { decryptWithSM4 } from '@/utils/sm'
 import { getInfoByCodeApi } from '@/services/picking/outbound'
-import ElectronicSeal from '@/components/ElectronicSeal/index.vue'
+// import ElectronicSeal from '@/components/ElectronicSeal/index.vue'
 
 export default {
-  components: { ElectronicSeal },
+  // components: { ElectronicSeal },
   data() {
     return {
       showCamera: false,
@@ -136,6 +136,8 @@ export default {
       focusTimeout: null,
       // 设备信息
       systemInfo: null,
+      screenHeight: null,
+      screenWidth: null,
     }
   },
   onBackPress(options) {
@@ -205,6 +207,11 @@ export default {
         const systemInfo = uni.getSystemInfoSync()
         console.log('设备信息:', systemInfo)
         this.systemInfo = systemInfo
+        // 获取屏幕高度和宽度
+        const screenHeight = systemInfo.screenHeight; // 屏幕高度：1000
+        const screenWidth = systemInfo.screenWidth;   // 屏幕宽度：600
+        this.screenHeight = screenHeight;
+        this.screenWidth = screenWidth;
       } catch (error) {
         console.error('获取设备信息失败:', error)
       }
@@ -482,7 +489,7 @@ export default {
         console.log('拍照前聚焦...')
         console.log('开始拍照...')
         CameraPreview.takePicture(
-          { width: 640, height: 540, quality: 50 },
+          {width:this.screenWidth, height:this.screenHeight, quality: 50 },
           async (base64PictureData) => {
             console.log('拍照返回数据', base64PictureData)
             await this.processImage(base64PictureData)