diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 4f05d179e..e7bd0b0e7 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -143,6 +143,7 @@
height: 30px;
line-height: 30px;
background:none;
+ color:#666;
}
.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
@@ -173,4 +174,39 @@
.teamsLayoutleft{
background: transparent !important;
+}
+
+.Competitioncharts{
+ font-size: 24px;
+ color: rgba(5,16,26,1);
+}
+.Competitionfirst{
+ width:233px;
+ height:298px;
+ background:rgba(250,250,250,1);
+ box-shadow:0px 2px 8px 2px rgba(255,134,34,0.5);
+ border-radius:5px;
+}
+.Competitionsecondary{
+ width:234px;
+ height:277px;
+ background:rgba(250,250,250,1);
+ box-shadow:0px 3px 5px 0px rgba(254,190,154,1);
+ border-radius:5px;
+}
+
+.Competitionthird{
+ width: 234px;
+ height: 270px;
+ background: rgba(250,250,250,1);
+ box-shadow: 0px 4px 5px 0px rgba(200,200,202,1);
+ border-radius: 5px;
+}
+
+.Competition399{
+ height:399px;
+}
+
+.Competitiontransparent table{
+ background: transparent;
}
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 9439d3991..210f1abca 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -3,6 +3,8 @@ import { Breadcrumb,Layout,Table, Divider, Tag,Badge,Row, Col,Button, Menu, Icon
import { Link } from 'react-router-dom';
import axios from 'axios';
import {markdownToHTML,getImageUrl} from 'educoder';
+import CompetitionContents from './CompetitionContents';
+import CompetitionContentsChart from './CompetitionContentsChart';
import NoneData from "../../courses/shixunHomework/shixunHomework";
import './CompetitionCommon.css';
@@ -57,7 +59,7 @@ class CompetitionCommon extends Component{
在线竞赛
- 全国高校计算机大赛
+ {data&&data.name}
@@ -126,10 +128,8 @@ class CompetitionCommon extends Component{
-
-
-
-
+
+
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
new file mode 100644
index 000000000..5ba381b24
--- /dev/null
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
@@ -0,0 +1,38 @@
+import React, { Component } from 'react';
+import {Button,Layout} from 'antd';
+import axios from 'axios';
+import {markdownToHTML,getImageUrl} from 'educoder';
+import NoneData from "../../courses/shixunHomework/shixunHomework";
+
+const { Header, Footer, Sider, Content } = Layout;
+class CompetitionContents extends Component{
+ constructor(props) {
+ super(props)
+ this.state={
+
+ }
+ }
+
+ componentDidMount(){
+ window.document.title = '竞赛';
+
+ }
+
+
+
+ render() {
+
+ return (
+
+
+
+
+
+
+
+ )
+ }
+}
+export default CompetitionContents;
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
new file mode 100644
index 000000000..9d7a10f18
--- /dev/null
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -0,0 +1,189 @@
+import React, { Component } from 'react';
+import {Button,Layout,Tabs,Icon, Card, Avatar, Row, Col ,Table} from 'antd';
+import axios from 'axios';
+import {markdownToHTML,getImageUrl} from 'educoder';
+import NoneData from "../../courses/shixunHomework/shixunHomework";
+
+const { Header, Footer, Sider, Content } = Layout;
+const { TabPane } = Tabs;
+const { Meta } = Card;
+
+class CompetitionContents extends Component{
+ constructor(props) {
+ super(props)
+ this.state={
+
+ }
+ }
+
+ componentDidMount(){
+ window.document.title = '竞赛';
+
+ }
+
+
+
+ render() {
+ const operations =
;
+ const columns = [
+ {
+ title: 'Name',
+ dataIndex: 'name',
+ key: 'name',
+ render: text =>
{text},
+ },
+ {
+ title: 'Age',
+ dataIndex: 'age',
+ key: 'age',
+ },
+ {
+ title: 'Address',
+ dataIndex: 'address',
+ key: 'address',
+ },
+ {
+ title: 'Tags',
+ key: 'tags',
+ dataIndex: 'tags',
+ render: tags => (
+
+ 123123
+
+ ),
+ },
+ {
+ title: 'Action',
+ key: 'action',
+ render: (text, record) => (
+
+ Invite {record.name}
+ Delete
+
+ ),
+ },
+ {
+ title: 'Values',
+ key: 'values',
+ dataIndex: 'values',
+ render: tags => (
+
+ 123123
+
+ ),
+ },
+ ];
+
+ const data = [
+ {
+ key: '1',
+ name: 'John Brown',
+ age: 32,
+ address: 'New York No. 1 Lake Park',
+ tags: ['nice', 'developer'],
+ values:123
+ },
+ {
+ key: '2',
+ name: 'Jim Green',
+ age: 42,
+ address: 'London No. 1 Lake Park',
+ tags: ['loser'],
+ values:123
+ },
+ {
+ key: '3',
+ name: 'Joe Black',
+ age: 32,
+ address: 'Sidney No. 1 Lake Park',
+ tags: ['cool', 'teacher'],
+ values:123
+ },
+ ];
+
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 总排名
+
+
+
+
+
+ }
+ >
+
+
+
+
+
+ }
+ >
+
+
+
+
+
+
+ }
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+export default CompetitionContents;
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitions.js b/public/react/src/modules/competitions/Competitions.js
index 4fab546c6..cde00dc4c 100644
--- a/public/react/src/modules/competitions/Competitions.js
+++ b/public/react/src/modules/competitions/Competitions.js
@@ -58,12 +58,15 @@ class Competitions extends Component {
}
>
+
+ {/*新版竞赛报名*/}
()
}
/>
+
{/*新版竞赛详情页面*/}