From 624fb6bbcdea6dee41c47d5246e95318013ca726 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Mon, 4 Aug 2025 15:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/back/backCodeScan.vue | 5 +- src/pages/devicesSearch/ocrSearch.nvue | 2 +- .../repair/equipAssessment/batch-repair.vue | 65 +------------------ .../repair/equipAssessment/num-operate.vue | 1 + .../repair/repairManage/batch-repair.vue | 1 + .../repair/repairManage/code-operate.vue | 1 + src/pages/repair/repairManage/num-operate.vue | 1 + 7 files changed, 9 insertions(+), 67 deletions(-) diff --git a/src/pages/back/backCodeScan.vue b/src/pages/back/backCodeScan.vue index 9c30e36..0879142 100644 --- a/src/pages/back/backCodeScan.vue +++ b/src/pages/back/backCodeScan.vue @@ -315,7 +315,7 @@ export default { // 附件拍照 getCameraFj(){ - navigator.camera.getPicture(onCameraSuccessFj, onCameraErrorFj, { + navigator.camera.getPicture(this.onCameraSuccessFj, this.onCameraErrorFj, { quality: 50, destinationType: window.Camera.DestinationType.DATA_URL, sourceType: window.Camera.PictureSourceType.CAMERA, @@ -323,7 +323,7 @@ export default { }, // 附件从相册选择 getPhotoFj(){ - navigator.camera.getPicture(onCameraSuccessFj, onCameraErrorFj, { + navigator.camera.getPicture(this.onCameraSuccessFj, this.onCameraErrorFj, { quality: 50, destinationType: window.Camera.DestinationType.DATA_URL, sourceType: window.Camera.PictureSourceType.SAVEDPHOTOALBUM, @@ -412,6 +412,7 @@ export default { typeId: this.codeData.typeId, apDetection: this.apDetection, bmFileInfos: this.bmFileInfos, + maVos:[{maId:this.codeData.maId,maCode:this.codeData.maCode}] } let param = { backApplyInfo: this.queryParams, diff --git a/src/pages/devicesSearch/ocrSearch.nvue b/src/pages/devicesSearch/ocrSearch.nvue index e4e385b..1ea399f 100644 --- a/src/pages/devicesSearch/ocrSearch.nvue +++ b/src/pages/devicesSearch/ocrSearch.nvue @@ -360,7 +360,7 @@ export default { // 相机预览配置 - 始终使用全屏背景模式 let cameraY = 0; let cameraHeight = screenHeight; - let toBack = true; // 设置为背景层，让UI元素显示在上方 + let toBack = false; // 设置为背景层，让UI元素显示在上方 console.log('屏幕信息:', { platform: systemInfo.platform, diff --git a/src/pages/repair/equipAssessment/batch-repair.vue b/src/pages/repair/equipAssessment/batch-repair.vue index 90086f9..2e21b30 100644 --- a/src/pages/repair/equipAssessment/batch-repair.vue +++ b/src/pages/repair/equipAssessment/batch-repair.vue @@ -139,6 +139,7 @@ import { baseURL } from '@/utils/http' import treeSelect from '../tree-select/tselectTwo.vue' import { onLoad } from '@dcloudio/uni-app' import PreviewImg from '@/components/PreviewImg/index.vue' +import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' const queryParams = ref({}) const rowIndex = ref(-1) // 计算属性：将选中的编码用逗号拼接显示 @@ -242,70 +243,6 @@ const uploadImg2 = () => { console.error('操作菜单选择失败:', err) }, }) - -// uni.chooseImage({ -// count: 3 - imgList2.value.length, // 最多选择3张，减去已选数量 -// sizeType: ['original', 'compressed'], -// sourceType: ['album', 'camera'], -// success: async (res) => { -// const tempFiles = res.tempFiles -// if (imgList2.value.length + tempFiles.length > 3) { -// uni.showToast({ title: '最多只能上传3张图片', icon: 'none' }) -// return -// } - -// // 显示选择的图片 -// for (let i = 0; i < tempFiles.length; i++) { -// imgList2.value.push({ -// url: tempFiles[i].path, -// uploading: true -// }) -// } - -// // 上传所有图片 -// const uploadPromises = tempFiles.map(file => { -// return new Promise((resolve, reject) => { -// uni.uploadFile({ -// url: '/file/upload', -// filePath: file.path, -// name: 'file', -// success: (uploadRes) => { -// const resData = JSON.parse(uploadRes.data) -// if (resData.code === 200) { -// resolve({ -// name: resData.data.name, -// url: resData.data.url -// }) -// } else { -// reject(new Error('上传失败')) -// } -// }, -// fail: (err) => { -// reject(err) -// } -// }) -// }) -// }) - -// try { -// const results = await Promise.all(uploadPromises) -// fileData.value.fileList = [...bmFileInfos.value, ...results] -// uni.showToast({ title: '上传成功', icon: 'none' }) - -// // 更新图片状态 -// imgList2.value = imgList2.value.map(img => { -// return { -// ...img, -// uploading: false -// } -// }) -// } catch (error) { -// uni.showToast({ title: '部分图片上传失败', icon: 'none' }) -// // 移除上传失败的图片 -// imgList2.value = imgList2.value.filter(img => !img.uploading) -// } -// } -// }) } const generateRandomString = (length) => { diff --git a/src/pages/repair/equipAssessment/num-operate.vue b/src/pages/repair/equipAssessment/num-operate.vue index 0456d9a..d0fe85c 100644 --- a/src/pages/repair/equipAssessment/num-operate.vue +++ b/src/pages/repair/equipAssessment/num-operate.vue @@ -220,6 +220,7 @@ import { import { baseURL } from '@/utils/http' import treeSelect from '../tree-select/tselectTwo.vue'; import { onLoad } from '@dcloudio/uni-app' +import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' import PreviewImg from '@/components/PreviewImg/index.vue' // const query = defineProps() // 获取上级页面传递的路由参数 // const queryParams = JSON.parse(query.queryParams) diff --git a/src/pages/repair/repairManage/batch-repair.vue b/src/pages/repair/repairManage/batch-repair.vue index f705f31..84e8e81 100644 --- a/src/pages/repair/repairManage/batch-repair.vue +++ b/src/pages/repair/repairManage/batch-repair.vue @@ -142,6 +142,7 @@ import { baseURL } from '@/utils/http' import treeSelect from '../tree-select/tselectTwo.vue' import { onLoad,onShow } from '@dcloudio/uni-app' import PreviewImg from '@/components/PreviewImg/index.vue' +import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' const queryParams = ref({}) const rowIndex = ref(-1) // 计算属性：将选中的编码用逗号拼接显示 diff --git a/src/pages/repair/repairManage/code-operate.vue b/src/pages/repair/repairManage/code-operate.vue index 9d7f040..ff7d72b 100644 --- a/src/pages/repair/repairManage/code-operate.vue +++ b/src/pages/repair/repairManage/code-operate.vue @@ -273,6 +273,7 @@ import { import { baseURL } from '@/utils/http' import treeSelect from '../tree-select/tselectTwo.vue' import { onLoad,onShow } from '@dcloudio/uni-app' +import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' import PreviewImg from '@/components/PreviewImg/index.vue' const queryParams = ref({}) const rowIndex = ref(-1) diff --git a/src/pages/repair/repairManage/num-operate.vue b/src/pages/repair/repairManage/num-operate.vue index f343e1f..ffce119 100644 --- a/src/pages/repair/repairManage/num-operate.vue +++ b/src/pages/repair/repairManage/num-operate.vue @@ -261,6 +261,7 @@ import { } from '@/services/repair/repair.js' import treeSelect from '../tree-select/tselectTwo.vue'; import {onLoad, onShow} from '@dcloudio/uni-app' +import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm' import PreviewImg from '@/components/PreviewImg/index.vue' // const query = defineProps() // 获取上级页面传递的路由参数 // const queryParams = JSON.parse(query.queryParams)