From 5424fb6cc7c907ec12025e96bb41146b28e5582c Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 08 Sep 2024 10:00:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index ec1a057..5d1dba2 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
@@ -30,15 +30,16 @@
...currentFile,
url: URL.createObjectURL(currentFile.originFile),
});
- setScanContent(fileView.response.data.ocrResult.wordsResult[0])
-
-
};
const handleScaned = () => {
setScaned(true)
- formRef.current.setFieldValue('scanContent', scanContent)
-
+ const content = fileView.response.data.ocrResult.wordsResult.join('\n')
+ setTimeout(() => {
+ console.log(formRef.current, content);
+ formRef.current.setFieldValue('scanContent', content)
+ }, 0)
+ setScanContent(content)
}
const handleText = () => {
@@ -46,16 +47,20 @@
setScanFile(false);
setScanImage(false);
setScaned(false);
-
}
-
-
- console.log(fileView, 'fileView')
- console.log(scanContent, 'scanContent')
return (
<>
- <Modal style={{ width: '1200px' }} visible={visible} onCancel={onCancel} title='识别上传材料' centered footer={null}>
+ <Modal
+ style={{ width: '1200px' }}
+ visible={visible}
+ onCancel={onCancel}
+ title='识别上传材料'
+ centered
+ footer={null}
+ unmountOnExit={true}
+ maskClosable={false}
+ >
<Form
layout='vertical'
requiredSymbol={false}
@@ -78,7 +83,6 @@
}}
tip='支持png、 jpg、pdf等格式文件上传，每次上传大小不超过10M'
showUploadList={{
- // Please dont remove this comment
fileIcon: <IconLink style={{ color: '#1D2129' }} />,
}}
// onChange={(info, currentFile) => {
@@ -102,7 +106,16 @@
</Form>
</Modal>
- <Modal style={{ width: '944px' }} visible={scanImage} onCancel={() => setScanImage(false)} footer={null} title='选择识别范围' centered>
+ <Modal
+ style={{ width: '944px' }}
+ visible={scanImage}
+ onCancel={() => setScanImage(false)}
+ footer={null}
+ title='选择识别范围'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ >
<img
src={fileView?.url}
alt=""
@@ -116,7 +129,17 @@
/>
<div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
</Modal>
- <Modal style={{ width: '1200px' }} visible={scaned} onCancel={() => setScaned(false)} footer={null} title='识别上传材料' centered>
+ <Modal
+ style={{ width: '1200px' }}
+ visible={scaned}
+ onCancel={() => setScaned(false)}
+ footer={null}
+ title='识别上传材料'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ mountOnEnter={false}
+ >
<Form
ref={formRef}
layout='vertical'
@@ -136,9 +159,8 @@
wrapperStyle={{ width: '100%' }}
onChange={(v) => console.log(v, 'vvvvvv')}
/>
- <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { handleText() }}>使用文字</Button></div>
</FormItem>
-
+ <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { handleText() }}>使用文字</Button></div>
</Form>
</Modal>
--
Gitblit v1.8.0