Commit 14642d42 by zhujian

fix

parent 52a7b420
import React, { useEffect, useState } from 'react';
export default function DataCenter(){
return <div className="page">
eweew
</div>
}
\ No newline at end of file
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
*/ */
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import TrainFilter from './components/TrainFilter'; import TrainFilter from './components/TrainFilter';
import { Route, withRouter } from 'react-router-dom'
import TrainList from './components/TrainList'; import TrainList from './components/TrainList';
// import PlanList from './components/PlanList' // import PlanList from './components/PlanList'
import PlanService from '@/domains/plan-domain/planService'; import PlanService from '@/domains/plan-domain/planService';
import DataCenter from '../data-center/Index';
import User from '@/common/js/user'; import User from '@/common/js/user';
function TrainTaskPage() { function TrainTaskPage(props) {
const [trainListData, setTrainListData] = useState([]); // 培训任务列表 const [trainListData, setTrainListData] = useState([]); // 培训任务列表
const [query, setQuery] = useState({ const [query, setQuery] = useState({
issueState: 'ALL', // 发布状态 issueState: 'ALL', // 发布状态
...@@ -22,6 +24,7 @@ function TrainTaskPage() { ...@@ -22,6 +24,7 @@ function TrainTaskPage() {
storeUserId: User.getStoreUserId(), storeUserId: User.getStoreUserId(),
}); });
const [totalCount, setTotalCount] = useState(0); // 总数 const [totalCount, setTotalCount] = useState(0); // 总数
const { match } = props;
useEffect(() => { useEffect(() => {
handleFetchTrainList(); handleFetchTrainList();
...@@ -50,7 +53,8 @@ function TrainTaskPage() { ...@@ -50,7 +53,8 @@ function TrainTaskPage() {
<TrainFilter onChange={queryChange} /> <TrainFilter onChange={queryChange} />
<TrainList trainListData={trainListData} query={query} totalCount={totalCount} onChange={queryChange} /> <TrainList trainListData={trainListData} query={query} totalCount={totalCount} onChange={queryChange} />
</div> </div>
<Route path={`${match.url}/data`} component={DataCenter} />
</div> </div>
); );
} }
export default TrainTaskPage; export default withRouter(TrainTaskPage);
...@@ -14,12 +14,13 @@ import { sortableContainer, sortableElement, sortableHandle } from 'react-sortab ...@@ -14,12 +14,13 @@ import { sortableContainer, sortableElement, sortableHandle } from 'react-sortab
function TrainContent(props) { function TrainContent(props) {
const SortableTaskContainer = sortableContainer((props) => <div {...props}></div>); const SortableTaskContainer = sortableContainer((props) => <div {...props}></div>);
return ( return (
<div className='train-content__warp'> <div className='train-content__warp'>
<SortableTaskContainer useDragHandle disableAutoscroll helperClass='row-dragging' onSortEnd={this.onTaskSortEnd} className='plan-task-sort-container'> <SortableTaskContainer useDragHandle disableAutoscroll helperClass='row-dragging' onSortEnd={this.onTaskSortEnd} className='plan-task-sort-container'>
{dataSource.map((item, index) => ( {/* {dataSource.map((item, index) => (
<SortableTaskItem taskitem={this.renderTaskItem(item, index)} index={index} key={index}></SortableTaskItem> <SortableTaskItem taskitem={this.renderTaskItem(item, index)} index={index} key={index}></SortableTaskItem>
))} ))} */}
</SortableTaskContainer> </SortableTaskContainer>
</div> </div>
); );
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Route, withRouter } from 'react-router-dom'
import { Tabs, Tooltip, Checkbox, Dropdown, Radio, Button, Space } from 'antd'; import { Tabs, Tooltip, Checkbox, Dropdown, Radio, Button, Space } from 'antd';
import './TrainList.less'; import './TrainList.less';
import { XMTable, PageControl } from '@/components'; import { XMTable, PageControl } from '@/components';
...@@ -280,4 +281,4 @@ function TrainList(props) { ...@@ -280,4 +281,4 @@ function TrainList(props) {
); );
} }
export default TrainList; export default withRouter(TrainList);
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