From 4abafda684aaf92d01fa0128742067aff1172e52 Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Sat, 31 Aug 2024 16:41:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
similarity index 87%
rename from gz-customerSystem/src/views/register/eventFlow/component/handle.jsx
rename to gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index a72bf56..4b4fbcc 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -1,11 +1,11 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Space, Row, Tooltip, Button } from 'antd';
-import { register, fold, down, empty, link } from '../../../../assets/images';
+import { register, fold, down, empty, link } from '@/assets/images';
import { Form, Input, Tabs, Typography, Empty } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
-import ProgressStep from '../../../../components/ProgressStep/VisitStep';
-import SelectObjModal from '../../../../components/SelectObjModal/selectPerson';
-import WantUserTag from '../../../../components/WantUserTag/Handling';
+import ProgressStep from '@/components/ProgressStep/VisitStep';
+import SelectObjModal from '@/components/SelectObjModal/selectPerson';
+import WantUserTag from '@/components/WantUserTag/Handling';
import { scan } from '@/assets/images/icon'
import DocumentScanner from './FileUpLoad'
import * as $$ from '@/utils/utility';
@@ -19,6 +19,58 @@
textAlign: 'center',
marginTop: 20,
};
+
+const fakeData = [
+ {
+ handlerUserName: '天河区棠下街综治中心',
+ finishTime: new Date().getTime() - 24 * 60 * 60 * 1000, // 一天前的时间
+ handleResult: '1',
+ status: '2',
+ taskNodeName: '来访登记',
+ mediResult: '22_00025-1',
+ handleContent: '调解成功，双方达成一致意见。',
+ operationName: '李晓明'
+ },
+ {
+ handlerUserName: '系统派单',
+ finishTime: new Date().getTime() - 12 * 60 * 60 * 1000, // 半天前的时间
+ handleResult: '1',
+ status: '2',
+ taskNodeName: '事件流转',
+ mediResult: '22_00025-1',
+ handleContent: '派单至：白云区新市街市场监管所',
+ },
+ {
+ handlerUserName: '白云区新市街市场监管所',
+ finishTime: new Date().getTime() - 11 * 60 * 60 * 1000, // 半天前的时间
+ handleResult: '1',
+ status: '2',
+ taskNodeName: '事件流转',
+ mediResult: '22_00025-1',
+ handleContent: '已签收',
+ operationName: '赵菲菲'
+ },
+ {
+ handlerUserName: '白云区新市街市场监管所',
+ finishTime: new Date().getTime() - 11 * 60 * 60 * 1000, // 半天前的时间
+ handleResult: '1',
+ status: '3',
+ taskNodeName: '事件回退',
+ mediResult: '22_00025-1',
+ // handleContent: '已签收',
+ operationName: '赵菲菲'
+ },
+ {
+ handlerUserName: '天河区棠下街综治中心',
+ finishTime: new Date().getTime() - 6 * 60 * 60 * 1000, // 6小时前的时间
+ handleResult: '2',
+ status: '1',
+ taskNodeName: '事件流转',
+ mediResult: '22_00025-1',
+ handleContent: '案件已被签收，准备开始调解。',
+ operationName: '李晓明'
+ },
+];
@@ -324,7 +376,7 @@
</div>
{selectedTab === '1' &&
<div className='progress'>
- <ProgressStep caseId='202408291012566613' pageFrom="dispatchRecord" />
+ <ProgressStep progressData={fakeData} />
</div>
}
</Typography.Paragraph>
--
Gitblit v1.8.0