Commit ba62a90d authored by 熊成伟's avatar 熊成伟

debug

parent 35520687
Pipeline #15240 passed with stages
in 57 seconds
This diff is collapsed.
...@@ -14,7 +14,7 @@ const Index = (props) => { ...@@ -14,7 +14,7 @@ const Index = (props) => {
</div> </div>
<div className="address-user"> <div className="address-user">
<img alt="" className='smallIco mr-5' src='/img/tel.png' /> <img alt="" className='smallIco mr-5' src='/img/tel.png' />
{item.YDDH || '无'} <a className="address-phone" href={item.YDDH ? `tel:${item.YDDH}` : null}>{item.YDDH || '无'}</a>
</div> </div>
</div> </div>
))} ))}
......
.address-item{ .address-item{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -15,3 +16,6 @@ ...@@ -15,3 +16,6 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.address-phone{
color: rgba(0, 0, 0, 1) !important;
}
...@@ -15,8 +15,8 @@ const Backlog = (props) => { ...@@ -15,8 +15,8 @@ const Backlog = (props) => {
const [data, setData] = useState([]); const [data, setData] = useState([]);
const checkLog = (OPERATEID) => { const checkLog = (OPERATEID, UUID) => {
props.history.push(`/blank/info/${OPERATEID}`) props.history.push(`/blank/info/${OPERATEID}/${UUID}`)
}; };
const getData = () => { const getData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10}; const pageMap ={searchWord, nowPage: current + 1, pageSize: 10};
...@@ -64,7 +64,6 @@ const Backlog = (props) => { ...@@ -64,7 +64,6 @@ const Backlog = (props) => {
getData() getData()
}, [searchWord]); }, [searchWord]);
console.log(current)
return ( return (
<Document title="待办"> <Document title="待办">
<WingBlank> <WingBlank>
...@@ -79,7 +78,7 @@ const Backlog = (props) => { ...@@ -79,7 +78,7 @@ const Backlog = (props) => {
data.length > 0 ? data.map((item, index) => ( data.length > 0 ? data.map((item, index) => (
<div key={index}> <div key={index}>
<WhiteSpace/> <WhiteSpace/>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID)}/> <TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div> </div>
)) : <Empty/> )) : <Empty/>
......
...@@ -14,7 +14,7 @@ const Notice = (props) => { ...@@ -14,7 +14,7 @@ const Notice = (props) => {
const [data, setData] = useState([]); const [data, setData] = useState([]);
const getData = () => { const getData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10}; const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
setLoading(true) setLoading(true)
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
...@@ -56,10 +56,25 @@ const Notice = (props) => { ...@@ -56,10 +56,25 @@ const Notice = (props) => {
}, []); }, []);
//tab已读未读切换 //tab已读未读切换
const [tab, setTab] = useState('N') const [tab, setTab] = useState('N');
const tabData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
setLoading(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: pageMap,
}).then(res => {
setLoading(false);
let result = end && res.rows ? [].concat(res.rows) : [];
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('当前是最后一页', 1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
};
const tabChange = val => { const tabChange = val => {
setTab(val); setTab(val);
setData([]) tabData()
}; };
useEffect(() => { useEffect(() => {
......
...@@ -56,10 +56,25 @@ const WorkDetail = (props) => { ...@@ -56,10 +56,25 @@ const WorkDetail = (props) => {
}, []); }, []);
//tab已读未读切换 //tab已读未读切换
const [tab, setTab] = useState('N') const [tab, setTab] = useState('N');
const tabData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
setLoading(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: pageMap,
}).then(res => {
setLoading(false);
let result = end && res.rows ? [].concat(res.rows) : [];
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('当前是最后一页', 1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
};
const tabChange = val => { const tabChange = val => {
setTab(val); setTab(val);
setData([]) tabData()
}; };
useEffect(() => { useEffect(() => {
......
...@@ -37,7 +37,7 @@ const ReactRouter = () => { ...@@ -37,7 +37,7 @@ const ReactRouter = () => {
<BlankLayout> <BlankLayout>
<Route path="/blank/work/:id" component={WorkDetail}/> <Route path="/blank/work/:id" component={WorkDetail}/>
<Route path="/blank/submit/:type" component={SubmitDetail}/> <Route path="/blank/submit/:type" component={SubmitDetail}/>
<Route path="/blank/info/:id" component={Process}/> <Route path="/blank/info/:id/:UUID" component={Process}/>
</BlankLayout> </BlankLayout>
}/> }/>
<Route component={NoFound}/> <Route component={NoFound}/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment