From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Fri, 13 Sep 2024 19:10:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx | 86 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 30 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index cc97d1f..4afdef4 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
@@ -3,7 +3,7 @@
import * as $$ from '@/utils/utility';
import { Form, Input, Modal, Upload } from '@arco-design/web-react';
import { IconLink } from '@arco-design/web-react/icon';
-
+import './index.less'
const FormItem = Form.Item;
const appUrl = $$.appUrl;
@@ -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,44 @@
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: '944px' }}
+ visible={scanImage}
+ onCancel={() => setScanImage(false)}
+ footer={null}
+ title='选择识别范围'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ >
+ <img
+ src={fileView?.url}
+ alt=""
+ style={{
+ display: 'block',
+ margin: 'auto',
+ maxWidth: '100%',
+ maxHeight: '100%',
+ objectFit: 'contain',
+ }}
+ />
+ <div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
+ </Modal>
+ <Modal
+ // style={{ width: '1200px' }}
+ visible={visible}
+ onCancel={onCancel}
+ title='识别上传材料'
+ centered
+ footer={null}
+ unmountOnExit={true}
+ maskClosable={false}
+ >
<Form
layout='vertical'
requiredSymbol={false}
@@ -100,22 +129,20 @@
</Form>
- </Modal>
- <Modal style={{ width: '944px' }} visible={scanImage} onCancel={() => setScanImage(false)} footer={null} title='选择识别范围' centered>
- <img
- src={fileView?.url}
- alt=""
- style={{
- display: 'block',
- margin: 'auto',
- maxWidth: '100%',
- maxHeight: '100%',
- objectFit: 'contain',
- }}
- />
- <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 >
+ <Modal
+ className='scan-modal'
+ // style={{ width: '1200px' }}
+ wrapStyle={{ zIndex: 1002 }}
+ visible={scaned}
+ onCancel={() => setScaned(false)}
+ footer={null}
+ title='识别上传材料'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ mountOnEnter={false}
+ >
<Form
ref={formRef}
layout='vertical'
@@ -135,9 +162,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