Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

zhangyongtian

2024-08-17 74b57df17b4f57105f0be567aa13eb29ffdc6f01

Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

 gz-customerSystem/src/api/appUrl.js

@@ -2,20 +2,20 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-16 11:25:57
 * @LastEditTime: 2024-08-15 14:23:32
 * @LastEditTime: 2024-08-16 09:32:18
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: api地址
 */
export const debug = {
    // web服务
    baseUrl: 'http://gz.hugeinfo.com.cn',
    // baseUrl: 'http://192.168.3.108:9002',
    // baseUrl: 'http://gz.hugeinfo.com.cn',
    baseUrl: 'http://192.168.3.108:9002',
    // baseUrl: 'http://mdqgnh.natappfree.cc',

    // 附件服务
    // fileUrl: 'http://192.168.3.108:9002',
    fileUrl: 'http://gz.hugeinfo.com.cn',
    fileUrl: 'http://192.168.3.108:9002',
    // fileUrl: 'http://gz.hugeinfo.com.cn',


    // 文件查看url 后面接附件编号

 gz-customerSystem/src/assets/images/closeIcon.png

 gz-customerSystem/src/assets/images/index.js

@@ -41,6 +41,7 @@
import applyMaterials_active from './applyMaterials_active.png';
import evidenceMaterials from './evidenceMaterials.png';
import evidenceMaterials_active from './evidenceMaterials_active.png';
import closeIcon from './closeIcon.png';

export {
  ledger_1,
@@ -76,5 +77,6 @@
  applyMaterials,
  applyMaterials_active,
  evidenceMaterials,
  evidenceMaterials_active
  evidenceMaterials_active,
  closeIcon
};

 gz-customerSystem/src/components/MyModal/index.jsx

@@ -2,14 +2,15 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-06-21 10:11:01
 * @LastEditTime: 2023-05-12 20:43:00
 * @LastEditors: lwh
 * @LastEditTime: 2024-08-15 18:04:15
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 我的Modal
 */
import React from 'react';
import PropTypes from 'prop-types';
import { Button, Modal, Space } from 'antd';
import { CloseCircleFilled, } from '@ant-design/icons';
import './index.less';

const MyModal = ({
@@ -38,6 +39,7 @@
            onCancel={onCancel}
            zIndex={zIndex}
            centered={centered}
            closeIcon={<CloseCircleFilled style={{color:'#86909C'}}/>}
        >
            {!!title && (
                <div className="myModal-header">

 gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx

@@ -136,6 +136,8 @@
                }}
                tip='支持png、 jpg、excel、word、pdf等格式的文件上传，每次上传大小不超过10M'
              />
                
              
            </FormItem>
          </Col>
        </>
@@ -517,6 +519,7 @@
          rows={5}
          placeholder=''
          wrapperStyle={{ width: '100%' }}
          defaultValue='识别内容'
        />
        <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => setScaned(true)}>使用文字</Button></div>
      </MyModal>