From eed91ca4a835d46fcf200b11ed4785398d585f59 Mon Sep 17 00:00:00 2001 From: ZhangAo Date: Tue, 19 May 2026 17:33:26 +0800 Subject: [PATCH] 20260519173325 --- .../src/main/resources/application.yml | 2 +- .../main/resources/dbconfigs/g3hd.properties | 14 +++++------ .../ocr-uniapp/src/pages-sub/upload/edit.vue | 23 ++++++++----------- .../ocr-uniapp/src/pages-sub/upload/index.vue | 17 ++++++++------ code/container-ocr/ocr-vue/components.d.ts | 8 +++++++ 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/code/container-ocr/ocr-springboot/src/main/resources/application.yml b/code/container-ocr/ocr-springboot/src/main/resources/application.yml index 38dff4da..0e5ca111 100644 --- a/code/container-ocr/ocr-springboot/src/main/resources/application.yml +++ b/code/container-ocr/ocr-springboot/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: time-zone: "Asia/Shanghai" date-format: yyyy-MM-dd HH:mm:ss profiles: - active: dev + active: build file: base-dir: D:/data/file diff --git a/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties b/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties index 8d6733ef..05bead7b 100644 --- a/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties +++ b/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties @@ -1,10 +1,10 @@ -url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR -username=sa -password=zhang520.. -driver=com.microsoft.sqlserver.jdbc.SQLServerDriver - -#url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR +#url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR #username=sa -#password=123456@aaa +#password=zhang520.. #driver=com.microsoft.sqlserver.jdbc.SQLServerDriver +url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR +username=sa +password=123456@aaa +driver=com.microsoft.sqlserver.jdbc.SQLServerDriver + diff --git a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/edit.vue b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/edit.vue index 417e12e3..64d27d68 100644 --- a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/edit.vue +++ b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/edit.vue @@ -162,11 +162,8 @@ async function handleConfirm() { // ========================= // 当前上传组件文件 // ========================= - const subFiles - = subFileListRef.value?.$.setupState.uploadFiles || [] - - const subFiles2 - = subFileListRef2.value?.$.setupState.uploadFiles || [] + const subFiles = subFileListRef.value?.getUploadFiles() || [] + const subFiles2 = subFileListRef2.value?.getUploadFiles() || [] // 当前所有文件 const allFiles = [ @@ -247,16 +244,16 @@ async function handleConfirm() { try { // 上传路径 - let uploadPath - = fileItem.path - || fileItem.url - || fileItem.tempFilePath + let uploadPath = fileItem.url + let uploadSize = fileItem.size + const fileName = fileItem.name // 图片压缩 - if (isImage(fileItem.name)) { + if (isImage(fileName)) { const compressRes = await imageCompress(uploadPath) uploadPath = compressRes.path + uploadSize = compressRes.size } // 上传文件 @@ -265,7 +262,7 @@ async function handleConfirm() { { jobId: form.value.b_id, containerNo: form.value.b_container_no, - fileName: fileItem.name, + fileName, }, ) @@ -279,8 +276,8 @@ async function handleConfirm() { father: form.value.b_id, mx_xh, mx_filename: res.data.fileName, - mx_filesize: fileItem.size, - mx_fileext: getFileExtension(fileItem.name), + mx_filesize: uploadSize, + mx_fileext: getFileExtension(fileName), mx_mapfilename: res.data.path, mx_moduleid: 'b_container', mx_cate_id: cate, diff --git a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue index b79fcf9e..e74f1e0b 100644 --- a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue +++ b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue @@ -206,8 +206,8 @@ async function handleConfirm() { // ========================= // 获取附件 // ========================= - const subFiles = subFileListRef.value?.$.setupState.uploadFiles || [] - const subFiles2 = subFileListRef2.value?.$.setupState.uploadFiles || [] + const subFiles = subFileListRef.value?.getUploadFiles() || [] + const subFiles2 = subFileListRef2.value?.getUploadFiles() || [] const allFiles = [ ...subFiles.map(item => ({ @@ -226,17 +226,20 @@ async function handleConfirm() { for (const fileItem of allFiles) { try { let uploadPath = fileItem.url + let uploadSize = fileItem.size + const fileName = fileItem.name // 图片压缩 - if (isImage(fileItem.name)) { - const compressRes = await imageCompress(fileItem.url) + if (isImage(fileName)) { + const compressRes = await imageCompress(uploadPath) uploadPath = compressRes.path + uploadSize = compressRes.size } const res = await uploadContainerFileApi(uploadPath, { jobId: form.value.b_id, containerNo: form.value.b_container_no, - fileName: fileItem.name, + fileName, }) if (!res.success) { @@ -248,8 +251,8 @@ async function handleConfirm() { father: form.value.b_id, mx_xh: getNextIndex(fileItem.cate), mx_filename: res.data.fileName, - mx_filesize: fileItem.size, - mx_fileext: getFileExtension(fileItem.name), + mx_filesize: uploadSize, + mx_fileext: getFileExtension(fileName), mx_mapfilename: res.data.path, mx_moduleid: 'b_container', mx_cate_id: fileItem.cate, diff --git a/code/container-ocr/ocr-vue/components.d.ts b/code/container-ocr/ocr-vue/components.d.ts index 39ff9c4a..52fa9721 100644 --- a/code/container-ocr/ocr-vue/components.d.ts +++ b/code/container-ocr/ocr-vue/components.d.ts @@ -18,6 +18,7 @@ declare module 'vue' { ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] + ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] @@ -27,16 +28,23 @@ declare module 'vue' { ElInput: typeof import('element-plus/es')['ElInput'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElResult: typeof import('element-plus/es')['ElResult'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] ElSplitter: typeof import('element-plus/es')['ElSplitter'] ElSplitterPanel: typeof import('element-plus/es')['ElSplitterPanel'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTabPane: typeof import('element-plus/es')['ElTabPane'] + ElTabs: typeof import('element-plus/es')['ElTabs'] + ElText: typeof import('element-plus/es')['ElText'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] G3Column: typeof import('./src/components/g3-table/g3-column.vue')['default']