From 86d82927381c21c538d25e55380cbe7c86acd811 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Thu, 22 Aug 2024 14:11:53 +0800
Subject: [PATCH] 提交
---
gz-customerSystem/public/favicon.ico | 0
gz-customerSystem/public/index.html | 2
gz-customerSystem/src/views/mediate/mediateBigData/index.jsx | 10 +-
gz-customerSystem/src/assets/images/index.js | 8 ++
gz-customerSystem/src/views/logAndSign/index.jsx | 10 +-
gz-customerSystem/src/assets/images/logo1.png | 0
gz-customerSystem/src/api/appUrl.js | 2
gz-customerSystem/src/assets/images/backgroundImage.jpg | 0
gz-customerSystem/public/logo1.png | 0
gz-customerSystem/src/views/logAndSign/index.less | 2
gz-customerSystem/src/views/mediate/mediateAll/index.jsx | 11 ++-
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 3
gz-customerSystem/src/views/mediationWindow/index.less | 6 ++
gz-customerSystem/src/views/filesCheck/newFileCheck.jsx | 98 ++++++++++++++++++++++++++++----
gz-customerSystem/src/assets/images/backgroundImage.png | 0
gz-customerSystem/src/views/register/visit/index.jsx | 8 +-
gz-customerSystem/src/components/Layout/Header.jsx | 8 +-
gz-customerSystem/src/utils/utility.js | 4
18 files changed, 127 insertions(+), 45 deletions(-)
diff --git a/gz-customerSystem/public/favicon.ico b/gz-customerSystem/public/favicon.ico
index 4aeabc4..2455628 100644
--- a/gz-customerSystem/public/favicon.ico
+++ b/gz-customerSystem/public/favicon.ico
Binary files differ
diff --git a/gz-customerSystem/public/index.html b/gz-customerSystem/public/index.html
index ec0ecf8..81bd17d 100644
--- a/gz-customerSystem/public/index.html
+++ b/gz-customerSystem/public/index.html
@@ -31,7 +31,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
- <title>白云区矛盾纠纷多元化解平台</title>
+ <title>广州市社会治安综合治理应用平台（综治中心模块）</title>
<script type="text/javascript" src="http://120.79.193.119:8000/pageoffice/pageoffice.js"></script>
<script type="text/javascript" src="./locationSelect.js"></script>
<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=13i28TcWWSbyYIqjHaJceqQbZa1dFlOt"></script>
diff --git a/gz-customerSystem/public/logo192.png b/gz-customerSystem/public/logo1.png
similarity index 100%
rename from gz-customerSystem/public/logo192.png
rename to gz-customerSystem/public/logo1.png
Binary files differ
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index ef578d3..52282b8 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-16 09:32:18
+ * @LastEditTime: 2024-08-22 14:10:51
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: api地址
diff --git a/gz-customerSystem/src/assets/images/backgroundImage.jpg b/gz-customerSystem/src/assets/images/backgroundImage.jpg
new file mode 100644
index 0000000..7c4d815
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/backgroundImage.jpg
Binary files differ
diff --git a/gz-customerSystem/src/assets/images/backgroundImage.png b/gz-customerSystem/src/assets/images/backgroundImage.png
new file mode 100644
index 0000000..adf9199
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/backgroundImage.png
Binary files differ
diff --git a/gz-customerSystem/src/assets/images/index.js b/gz-customerSystem/src/assets/images/index.js
index 1d1ecfe..28ffb49 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: lwh
* @Date: 2023-04-24 16:12:00
- * @LastEditTime: 2024-08-15 14:37:33
+ * @LastEditTime: 2024-08-22 11:33:00
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description:
@@ -42,6 +42,8 @@
import evidenceMaterials from './evidenceMaterials.png';
import evidenceMaterials_active from './evidenceMaterials_active.png';
import closeIcon from './closeIcon.png';
+import backgroundImage from './backgroundImage.jpg'
+import logo1 from './logo1.png';
export {
ledger_1,
@@ -78,5 +80,7 @@
applyMaterials_active,
evidenceMaterials,
evidenceMaterials_active,
- closeIcon
+ closeIcon,
+ backgroundImage,
+ logo1
};
diff --git a/gz-customerSystem/src/assets/images/logo1.png b/gz-customerSystem/src/assets/images/logo1.png
new file mode 100644
index 0000000..2455628
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/logo1.png
Binary files differ
diff --git a/gz-customerSystem/src/components/Layout/Header.jsx b/gz-customerSystem/src/components/Layout/Header.jsx
index 519422a..c0d8f4a 100644
--- a/gz-customerSystem/src/components/Layout/Header.jsx
+++ b/gz-customerSystem/src/components/Layout/Header.jsx
@@ -2,8 +2,8 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-11 11:33:21
- * @LastEditTime: 2024-08-08 20:18:53
- * @LastEditors: lwh
+ * @LastEditTime: 2024-08-22 11:51:48
+ * @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 头部组件
*/
@@ -16,7 +16,7 @@
import * as $$ from '../../utils/utility';
import MyMessage from '../../views/myMessage';
import MyModal from '../MyModal';
-import logo_white from '../../assets/images/logo_white.png';
+import {logo1} from '../../assets/images';
//修改密码api
function submitModifyInfoApi(data) {
@@ -116,7 +116,7 @@
return (
<header className="header">
<div className="header-logo">
- <img src={logo_white} alt="" />
+ <img src={logo1} alt="" />
<div className="header-logo-text" style={{ color: '#fff' }}>
<div className="header-logo-title">广州市社会治安综合治理应用平台（综治中心模块）</div>
{/* <div>Guangzhou Baiyun Diversified Dispute Resolution Platform</div> */}
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index 9500459..43c3421 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:57:54
- * @LastEditTime: 2024-08-16 17:15:26
+ * @LastEditTime: 2024-08-21 16:58:17
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 公共模块方法
@@ -107,7 +107,7 @@
if (num) {
var str = num.toString();
var reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g;
- return str.replace(reg, '$1，');
+ return str.replace(reg, '$1,');
} else {
return 0;
}
diff --git a/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx b/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
index 602bc57..ccda429 100644
--- a/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
+++ b/gz-customerSystem/src/views/filesCheck/newFileCheck.jsx
@@ -2,25 +2,26 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-11 11:03:44
- * @LastEditTime: 2024-08-19 10:11:34
+ * @LastEditTime: 2024-08-22 10:36:23
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 大厅来访材料附件查看
* 附件类型对照
- NULL("22_00017-0","未分类"),
- AUDIO("22_00017-1", "音频"),
- VIDEO("22_00017-2", "视频"),
- IMAGE("22_00017-3", "图片"),
- WORD("22_00017-4", "Word文档"),
- EXCEL("22_00017-5", "Excel表格"),
- PDF("22_00017-6", "PDF"),
- TXT("22_00017-7", "txt文本"),
- ZIP("22_00017--8", "压缩文件"),
- POWERPOINT("22_00017-9", "PowerPoint"),
- UNKNOWN("22_00017-99", "其它文件");
+ NULL("22_00017-0","未分类"),
+ AUDIO("22_00017-1", "音频"),
+ VIDEO("22_00017-2", "视频"),
+ IMAGE("22_00017-3", "图片"),
+ WORD("22_00017-4", "Word文档"),
+ EXCEL("22_00017-5", "Excel表格"),
+ PDF("22_00017-6", "PDF"),
+ TXT("22_00017-7", "txt文本"),
+ ZIP("22_00017--8", "压缩文件"),
+ POWERPOINT("22_00017-9", "PowerPoint"),
+ UNKNOWN("22_00017-99", "其它文件");
*/
import React, { useState, useEffect, useRef } from 'react';
-import { Button, Menu, Tooltip } from 'antd';
+import { Button, Menu, Tooltip, Row, Col, Form, Space } from 'antd';
+import { Select, DatePicker } from '@arco-design/web-react';
import { useSearchParams } from 'react-router-dom';
import {
CaretRightOutlined,
@@ -38,7 +39,11 @@
} from '@ant-design/icons';
import * as $$ from '../../utils/utility';
+
const { SubMenu } = Menu;
+const FormItem = Form.Item;
+const Option = Select.Option;
+
// 获取附件
function getFileListDataApi(submitData) {
@@ -65,6 +70,8 @@
const imgBgRef = useRef();
const imgRef = useRef();
+ const formRef = useRef();
+
// 图片旋转
function handleRotateImg(type) {
@@ -207,7 +214,70 @@
return (
<>
- <nav className="filesCheck-nav">
+ <nav className="filesCheck-nav" style={{ borderRight: '1px solid transparent' }}>
+ <Form
+ ref={formRef}
+ layout='horizontal'
+ style={{ marginTop: '24px', marginBottom: '20px' }}
+ requiredSymbol={false}
+ scrollToFirstError={true}
+ initialValues={{
+ level: '三级',
+ isSerious: '否',
+ }}//默认值
+ >
+ <Row gutter={24} style={{ marginRight: '0px' }}>
+ <Col span={7}>
+ <FormItem label='材料类型：' field='level'>
+ <Select placeholder='Select city' allowClear>
+ {['一级', '二级', '三级', '四级'].map((option, index) => (
+ <Option key={option} value={option}>
+ {option}
+ </Option>
+ ))}
+ </Select>
+ </FormItem>
+ </Col>
+ <Col span={7}>
+ <FormItem
+ label='上传时间：'
+ field='name'
+ onChange={(e) => console.log(e.target.value, 'vvv')}
+ >
+ <DatePicker.RangePicker
+ defaultValue={['2020-08-08', '2020-08-18']}
+ separator='~'
+ style={{ width: '100%' }}
+ />
+ </FormItem>
+ </Col>
+ <Col span={7}>
+ <FormItem
+ label='上传人类型：'
+ field='name'
+ onChange={(e) => console.log(e.target.value, 'vvv')}
+ >
+ <Select placeholder='Select city' allowClear style={{ width: '100%' }}>
+ {['一级', '二级', '三级', '四级'].map((option, index) => (
+ <Option key={option} value={option}>
+ {option}
+ </Option>
+ ))}
+ </Select>
+ </FormItem>
+
+ </Col>
+ <Col span={3}>
+ <Space>
+ <Button size="middle " type='primary'>查询</Button>
+ <Button size="middle ">查询</Button>
+ </Space>
+ </Col>
+
+ </Row>
+
+ </Form>
+
<Menu
className="filesCheck-nav-menu"
style={{ width: '200px' }}
diff --git a/gz-customerSystem/src/views/logAndSign/index.jsx b/gz-customerSystem/src/views/logAndSign/index.jsx
index 9543335..8312194 100644
--- a/gz-customerSystem/src/views/logAndSign/index.jsx
+++ b/gz-customerSystem/src/views/logAndSign/index.jsx
@@ -2,8 +2,8 @@
* @Company: hugeInfo
* @Author: xzx
* @Date: 2022-03-25 11:00:36
- * @LastEditors: lwh
- * @LastEditTime: 2023-05-12 18:16:39
+ * @LastEditors: dminyi 1301963064@qq.com
+ * @LastEditTime: 2024-08-22 11:39:26
* @Version: 1.0.0
* @Description: 登录注册页 TODO:注释掉的内容代码是暂时没有开发的功能，后续看需求是否添加
*/
@@ -13,7 +13,7 @@
import { QrcodeOutlined, ScanOutlined } from '@ant-design/icons';
import * as $$ from '../../utils/utility';
import logAvatar from '../../assets/images/logAvatar.png';
-import logo from '../../assets/images/logo.png';
+import logo1 from '../../assets/images/logo1.png';
import publicDataStatus from '../../status/publicData';
import SlideTest from '../../components/SlideTest';
@@ -50,9 +50,9 @@
<div className="logAndSign">
<header className="logAndSign-header">
<div className="logAndSign-header-logo">
- <img src={logo} alt="" />
+ <img src={logo1} alt="" />
<div className="logAndSign-header-logo-text">
- <div className="header-logo-title">广州市白云区矛盾纠纷多元化解平台</div>
+ <div className="header-logo-title">广州市社会治安综合治理应用平台（综治中心模块）</div>
<div>Guangzhou Baiyun Diversified Dispute Resolution Platform</div>
</div>
</div>
diff --git a/gz-customerSystem/src/views/logAndSign/index.less b/gz-customerSystem/src/views/logAndSign/index.less
index 76e1ba4..1490eec 100644
--- a/gz-customerSystem/src/views/logAndSign/index.less
+++ b/gz-customerSystem/src/views/logAndSign/index.less
@@ -64,7 +64,7 @@
width: 100%;
height: 100%;
position: relative;
- background-image: url('../../../assets/images/background-bg.png');
+ background-image: url('../../../assets/images/backgroundImage.png');
background-size: 100% 100%;
&-beforeLog,
diff --git a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
index 0c9631b..420096a 100644
--- a/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
+++ b/gz-customerSystem/src/views/mediate/mediateAll/index.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: lwh
* @Date: 2022-03-29 14:11:57
- * @LastEditTime: 2024-08-19 16:18:45
+ * @LastEditTime: 2024-08-21 15:43:25
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 调解总览
@@ -202,7 +202,6 @@
// 获取小程序申请数据
async function getMediateAllMiniData(submitData, tableActive) {
- console.log(submitData,tableActive,'submitData','tableActive','2222')
global.setSpinning(true);
const res = await getMediateAllDataApi(submitData);
global.setSpinning(false);
@@ -393,9 +392,11 @@
const countOtherData = otherData.total || 0;
- const countPlatformData=platformData.total || 0;
+ const countPlatformData = platformData.total || 0;
const selectedRowKeys = handleGetSelectedRowKeys('selectedRowKeys');
+
+
return (
<Page pageHead={{ title: '调解总览（一本账）', subtitle: <span>汇总查看名下{<span className='ledger-main-title'>不同渠道</span>}进入多元化解平台的矛盾纠纷案件，形成白云区矛盾纠纷统一台账管理中心</span> }}>
@@ -466,8 +467,8 @@
rowKey="id"
rowSelection={mediateTab == '1' && { selectedRowKeys, onChange: onSelectChange }}
pagination={{
- current: search.page,
- pageSize: search.size,
+ current: page,
+ pageSize: size,
total: data.total,
onChange: (page, pageSize) => {
setPage(page);
diff --git a/gz-customerSystem/src/views/mediate/mediateBigData/index.jsx b/gz-customerSystem/src/views/mediate/mediateBigData/index.jsx
index 86143fd..6438bd6 100644
--- a/gz-customerSystem/src/views/mediate/mediateBigData/index.jsx
+++ b/gz-customerSystem/src/views/mediate/mediateBigData/index.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-18 10:21:49
- * @LastEditTime: 2024-06-19 11:30:51
+ * @LastEditTime: 2024-08-22 11:55:25
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 调解大数据
@@ -650,7 +650,7 @@
// 只有当大于4条数据的时候 才会滚动
if (data.length > 5) {
- const animation = v.animate([
+ const animation = v?.animate([
// 动画的初始样式
{ transform: 'translateY(0)' },
// 动画的结束样式
@@ -811,7 +811,7 @@
const submitData = { countRange: '1', timeType: '1', timeStart: formattedDate, timeEnd: timeEndtemp, mediateUnitIds: '', workTopType: '1', sortType: '1', sortField: '1', canal: '22_00001-1' };
getViewData(submitData);
let v = document.getElementsByClassName("ant-table-tbody")[0];
- const animation = v.animate([
+ const animation = v?.animate([
// 动画的初始样式
{ transform: 'translateY(0)' },
// 动画的结束样式
@@ -839,7 +839,7 @@
setThisMonthIncrease(res.data.thisMonthIncrease || []);
let v = document.getElementsByClassName("reportStatistics-table")[0];
if (res.data.realTimeDynamicList.length < 5) {
- const animation = v.animate([
+ const animation = v?.animate([
// 动画的初始样式
{ transform: 'translateY(0)' },
// 动画的结束样式
@@ -1019,7 +1019,7 @@
if (res1.data?.realTimeDynamicList.length > 0) {
if (realTimeDynamicListLength > 5) {
let v = document.getElementsByClassName("aant-table-tbody")[0];
- v.animate([
+ v?.animate([
// 动画的初始样式
{ transform: 'translateY(0)' },
// 动画的结束样式
diff --git a/gz-customerSystem/src/views/mediationWindow/index.less b/gz-customerSystem/src/views/mediationWindow/index.less
index 73384ee..5cd1b50 100644
--- a/gz-customerSystem/src/views/mediationWindow/index.less
+++ b/gz-customerSystem/src/views/mediationWindow/index.less
@@ -940,3 +940,9 @@
}
}
}
+
+//antd组件内 ResizeObserver loop limit exceeded报错隐藏
+#webpack-dev-server-client-overlay {
+ display: none !important;
+ }
+
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 68bf76c..f3a4fbc 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -561,11 +561,12 @@
/>
</FormItem>
</Col>
- <div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#EFF8FF', borderRadius: '2px', marginTop: '4px' }}>
+ <div style={{ marginLeft: '16px', padding: '12px 16px', backgroundColor: '#F2F3F5', borderRadius: '2px', marginTop: '4px',display:'flex',alignItems:'center' }}>
<FormItem
label='是否重大矛盾纠纷'
style={{ marginBottom: '-20px' }}
field='isSerious'
+ // layout='inline'
>
<RadioGroup options={['否', '是']} style={{ marginBottom: 20 }} />
</FormItem>
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 9d4473b..2521a76 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-15 11:46:01
+ * @LastEditTime: 2024-08-21 16:57:16
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -95,9 +95,9 @@
{isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
- <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存信息</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览信息</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交信息</Button>
+ <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>预览</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
<Button type='secondary' onClick={handleReview}>返回上级页面</Button>
</Space>
--
Gitblit v1.8.0