From aa117c3b45b0a7770185fceb4d9efefd9642b054 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Fri, 13 Sep 2024 11:27:38 +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 | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index c23cb69..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;
@@ -35,7 +35,6 @@
const handleScaned = () => {
setScaned(true)
const content = fileView.response.data.ocrResult.wordsResult.join('\n')
-
setTimeout(() => {
console.log(formRef.current, content);
formRef.current.setFieldValue('scanContent', content)
@@ -52,8 +51,32 @@
return (
<>
+
<Modal
- style={{ width: '1200px' }}
+ // 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='识别上传材料'
@@ -84,7 +107,6 @@
}}
tip='支持png、 jpg、pdf等格式文件上传，每次上传大小不超过10M'
showUploadList={{
- // Please dont remove this comment
fileIcon: <IconLink style={{ color: '#1D2129' }} />,
}}
// onChange={(info, currentFile) => {
@@ -107,32 +129,11 @@
</Form>
- </Modal>
+ </Modal >
<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' }}
+ className='scan-modal'
+ // style={{ width: '1200px' }}
+ wrapStyle={{ zIndex: 1002 }}
visible={scaned}
onCancel={() => setScaned(false)}
footer={null}
--
Gitblit v1.8.0