fix:解决合并代码的冲突

src/modules/task-center/data-center/Index.tsx

+import React, { useEffect, useState } from 'react';
+
+export default function DataCenter(){
+
+    return <div className="page">
+        eweew
+    </div>
+}
\ No newline at end of file

src/modules/task-center/train-task/TrainTaskPage.jsx

@@ -8,11 +8,13 @@
  */
 import React, { useEffect, useState } from 'react';
 import TrainFilter from './components/TrainFilter';
+import { Route, withRouter } from 'react-router-dom'
 import TrainList from './components/TrainList';
 // import PlanList from './components/PlanList'
 import PlanService from '@/domains/plan-domain/planService';
+import DataCenter from '../data-center/Index';
 import User from '@/common/js/user';
-function TrainTaskPage() {
+function TrainTaskPage(props) {
   const [trainListData, setTrainListData] = useState([]); // 培训任务列表
   const [query, setQuery] = useState({
     issueState: 'ALL', // 发布状态
@@ -22,6 +24,7 @@ function TrainTaskPage() {
     storeUserId: User.getStoreUserId(),
   });
   const [totalCount, setTotalCount] = useState(0); // 总数
+  const { match } = props;
 
   useEffect(() => {
     handleFetchTrainList();
@@ -50,7 +53,8 @@ function TrainTaskPage() {
         <TrainFilter onChange={queryChange} />
         <TrainList trainListData={trainListData} query={query} totalCount={totalCount} onChange={queryChange} />
       </div>
+      <Route path={`${match.url}/data`} component={DataCenter} />
     </div>
   );
 }
-export default TrainTaskPage;
+export default withRouter(TrainTaskPage);

src/modules/task-center/train-task/components/TrainContent.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-07-30 16:33:58
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-02 10:58:34
+ * @LastEditTime: 2021-08-02 11:13:55
  * @Description: 任务中心-培训任务-新建-培训内容
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有

src/modules/task-center/train-task/components/TrainList.jsx

@@ -7,6 +7,7 @@
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 import React, { useState, useEffect } from 'react';
+import { Route, withRouter } from 'react-router-dom'
 import { Tabs, Tooltip, Checkbox, Dropdown, Radio, Button, Space } from 'antd';
 import './TrainList.less';
 import { XMTable, PageControl } from '@/components';
@@ -280,4 +281,4 @@ function TrainList(props) {
   );
 }
 
-export default TrainList;
+export default withRouter(TrainList);