From 6f5f11a93fc056b0fe77f91522245cc45a1fb4fa Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Wed, 04 Sep 2024 19:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index ef729ea..046bba9 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -1,8 +1,10 @@
-import React, { useState } from 'react';
-import { Button, Modal, Tabs } from '@arco-design/web-react';
+import React, { useState, useRef, useEffect } from 'react';
+import { Button, Modal, Tabs, Badge } from '@arco-design/web-react';
import { Space } from 'antd';
import ProgressStep from '@/components/ProgressStep/VisitStep';
import BackModel from "./BackModel";
+import { Scrollbars } from "react-custom-scrollbars";
+import { getOffset, getSize } from '@/utils/utility';
const TabPane = Tabs.TabPane;
@@ -69,11 +71,25 @@
];
export default function EventFlow(props) {
+ const scrollRef = useRef(null)
const [backVisible, setBackVisible] = useState(false)
- const tabs = [
- { index: '1', label: '流转进度' },
- { index: '2', label: '督办信息' },
- ];
+ const [height, setHeight] = useState(500)
+
+ useEffect(() => {
+ onWindowResize()
+ window.addEventListener("resize", onWindowResize);
+ }, [])
+
+ const onWindowResize = () => {
+ let offsetLeft = 0;
+ let offsetTop = 0;
+ if (scrollRef.current.container) {
+ offsetLeft = getOffset(scrollRef.current.container).left;
+ offsetTop = getOffset(scrollRef.current.container).top;
+ }
+ setHeight(getSize().windowH - offsetTop - 65)
+ };
+
return (
<div className='dataSync'>
<div className='dataSync-hasTabPage' >
@@ -86,16 +102,27 @@
</span>
}
>
- <div styles={{ height: "400px" }}><ProgressStep progressData={fakeData} /></div>
+ <Scrollbars
+ style={{ height: height }}
+ ref={scrollRef}
+ autoHide
+ >
+ <ProgressStep progressData={fakeData} />
+ </Scrollbars>
</TabPane>
<TabPane
key='2'
title={
<span style={{ fontSize: '15px' }}>
督办信息
+ <Badge maxCount={99} count={1000} />
</span>
}
>
+ <Scrollbars
+ style={{ height: height }}
+ ref={scrollRef}
+ ></Scrollbars>
</TabPane>
</Tabs>
--
Gitblit v1.8.0