From 54ac91e349f3a76c72cc38e18f532ed030c14397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 24 Oct 2019 17:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitimain/CompetitionsIndex.js        |   2 +-
 .../Competitioncommon/CompetitionCommon.css   | 125 ++++++++++++-
 .../Competitioncommon/CompetitionCommon.js    |  33 ++--
 .../CompetitionContentsChart.js               | 176 ++++++++++--------
 .../graduation/tasks/GraduationTasksedit.js   |  15 +-
 5 files changed, 251 insertions(+), 100 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index f84260496..cd2870ac8 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -79,7 +79,7 @@ class CompetitionsIndex extends Component{
 	render() {
 		let {datas,page,count}=this.state;
 
-		console.log(this.props.current_user&&this.props.current_user.business)
+
 		return (
 			<div>
 				<div className="clearfix">
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 5f6a96173..129ee4e00 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -1,4 +1,5 @@
 .teamsLayout{background: transparent !important;}
+
 .teamsLayout .ant-layout-sider{
     background: transparent !important;
     flex: 0 0 180px !important;
@@ -213,4 +214,126 @@
     right: -5px;
     width:93px;
     top: 20px;
-}
\ No newline at end of file
+}
+
+.Competitionthirdbox{
+    width:234px;
+    height:163px;
+    background:rgba(223,223,225,1);
+}
+
+.Competitionthirdbox{
+    width:234px;
+    height:163px;
+    background:rgba(223,223,225,1);
+}
+
+.Competitionthirdbox{
+    width:234px;
+    height:163px;
+    background:rgba(223,223,225,1);
+    position: relative;
+}
+
+.Competitionfirstbox{
+    width:233px;
+    height:167px;
+    background:rgba(255,231,160,1);
+    position: relative;
+}
+
+.Competitionsecondarybox{
+    width:234px;
+    height:155px;
+    background:rgba(253,230,217,1);
+    position: relative;
+}
+
+.rankingimg{
+    width: 60px;
+    height: 60px;
+    border-radius: 50% !important;
+    box-shadow: 0px 0px 12px rgba(0,0,0,0.2);
+}
+
+.Competitioncenter{
+    text-align: center;
+    padding-top: 20px;
+}
+
+
+.jinshaifont{
+    font-size: 16px;
+    color: rgba(5,16,26,1);
+    margin-top: 13px !important;
+}
+
+.Competitionthird .ant-card-body {
+    padding: 12px;
+    zoom: 1;
+}
+
+.Competitionthird .ant-card-meta-title{
+    margin-bottom: 0px !important;
+}
+
+.Competitionfirst .ant-card-body {
+    padding: 12px;
+    zoom: 1;
+}
+
+.Competitionsecondary .ant-card-body {
+    padding: 12px;
+    zoom: 1;
+}
+
+.center{
+    text-align: center;
+}
+
+.rankfonttop{
+    font-size:14px;
+    color:rgba(102,102,102,1);
+}
+
+.rankfontmid{
+    font-size:18px;
+    color:rgba(102,102,102,1);
+}
+
+.rankfontbottom{
+    font-size:26px;
+    color:rgba(165,91,41,1);
+    text-align: center;
+}
+
+.rankfontbottoms{
+    font-size:28px;
+    color:rgba(165,91,41,1);
+    text-align: center;
+}
+
+.Competitionuserimg{
+    width: 64px;
+    height: 63px;
+    border-radius: 50%;
+}
+
+.CompetitionsListzhezhao{
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 1206px;
+    height: 100%;
+    z-index: 10000;
+    display: none;
+    background: rgba(51, 51, 51,0.7);
+    text-align: center;
+    line-height: 416px;
+    color: #fff;
+    font-size: 50px;
+}
+
+.relative{position: relative;}
+
+.relative:hover .CompetitionsListzhezhao{   display: block;}
\ 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 96600534c..a60e91adb 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -64,16 +64,19 @@ class CompetitionCommon extends Component{
 			module_id:id,
 			module_type:typeid
 		})
-		let url=`${module_url}.json`;
-		axios.get(url).then((response) => {
-			if(response.status===200){
-      this.setState({
-				mdContent:response.data
+		if(has_url===false){
+			let url=`${module_url}`;
+			axios.get(url).then((response) => {
+				if(response.status===200){
+					this.setState({
+						mdContent:response.data
+					})
+				}
+			}).catch((error) => {
+				console.log(error)
 			})
-			}
-		}).catch((error) => {
-			console.log(error)
-		})
+		}
+
 	}
 
 	render() {
@@ -87,8 +90,11 @@ class CompetitionCommon extends Component{
 						<Breadcrumb.Item href="">{data&&data.name}</Breadcrumb.Item>
 					</Breadcrumb>
 
-					<div className={"mt10"}>
+					<div className={"mt10 relative"}>
+					 
 						<Row className={"CompetitionCommonbanner"}>
+							{data.competition_status==="nearly_published"?
+								this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
 							<img className={"Commonimg"}
 									 src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
 							<Col span={15}>
@@ -155,7 +161,8 @@ class CompetitionCommon extends Component{
 										   已结束
 									  </Button>:
 										<Button type="primary" block className={"Competitionfontsize22"}>
-								    	<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>
+											{data.competition_status==="nearly_published"?
+												this.props.current_user&&this.props.current_user.admin===true?<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>:this.props.current_user&&this.props.current_user.business===true?<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>:<a>立即发布</a>:<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>}
 										</Button>}
 									</Col>
 									<Col className={"mt10 Competitionfontsize16"}>{data&&data.enroll_end_time===null?"":`报名截止时间：${data&&data.enroll_end_time}`}</Col>
@@ -190,6 +197,10 @@ class CompetitionCommon extends Component{
 									{...this.props}
 									{...this.state}
 								/>}
+								{/*<CompetitionContentsChart*/}
+									{/*{...this.props}*/}
+									{/*{...this.state}*/}
+								{/*/>*/}
 							</Layout>
 
 						</Layout>
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index 9d7a10f18..730fae89b 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -18,87 +18,69 @@ class CompetitionContents extends Component{
 
 	componentDidMount(){
 		window.document.title = '竞赛';
-
+		this.gettitledata()
+	}
+	gettitledata=()=>{
+		let url=`/competitions/${this.props.match.params.identifier}/chart_rules.json`;
+		axios.get(url)
+			.then((response) => {
+	     console.log(response)
+			}).catch((error) => {
+			console.log(error)
+		})
 	}
-
 
 
 	render() {
-		const operations = <Icon type="form" />;
+		const operations = <Button className={"fr"} type="primary" ghost>编辑</Button>;
 		const columns = [
 			{
-				title: 'Name',
-				dataIndex: 'name',
+				title: 'usersum',
+				dataIndex: 'usersum',
 				key: 'name',
-				render: text => <a>{text}</a>,
+				render: text => <a className={"color-blue"}>{text}</a>,
 			},
 			{
-				title: 'Age',
-				dataIndex: 'age',
-				key: 'age',
+				title: 'userimg',
+				dataIndex: 'userimg',
+				key: 'userimg',
+				render: text => <img className={"Competitionuserimg"} src={getImageUrl("images/avatars/User/60969?t=1569488691")}/>,
 			},
 			{
-				title: 'Address',
-				dataIndex: 'address',
-				key: 'address',
+				title: 'username',
+				dataIndex: 'username',
+				key: 'username',
+				render: text => <a>{text}</a>,
 			},
 			{
-				title: 'Tags',
-				key: 'tags',
-				dataIndex: 'tags',
-				render: tags => (
-					<span>
-      123123
-      </span>
-				),
+				title: 'school',
+				dataIndex: 'school',
+				key: 'school',
+				render: text => <a>{text}</a>,
 			},
 			{
-				title: 'Action',
-				key: 'action',
-				render: (text, record) => (
-					<span>
-        <a>Invite {record.name}</a>
-        <a>Delete</a>
-      </span>
-				),
+				title: 'spendtime',
+				dataIndex: 'spendtime',
+				key: 'spendtime',
+				render: text => <a>{text}</a>,
 			},
 			{
-				title: 'Values',
-				key: 'values',
-				dataIndex: 'values',
-				render: tags => (
-					<span>
-      123123
-      </span>
-				),
+				title: 'score',
+				dataIndex: 'score',
+				key: 'score',
+				render: text => <a className={"color-blue"}>{text}</a>,
 			},
 		];
 
 		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
-			},
+				usersum: '1',
+				userimg: 'John Brown',
+				username: "小头鹰",
+				school: '吉首大学',
+				spendtime: '15：00：00',
+				score:123123
+			}
 		];
 
 
@@ -129,15 +111,27 @@ class CompetitionContents extends Component{
 						<Card
 							className={"Competitionthird"}
 							cover={
-								<img
-									alt="example"
-									src="https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png"
-								/>
+								<div className={"Competitionthirdbox center"}>
+										<li className="pr Competitioncenter">
+											<img src={getImageUrl("/images/educoder/huangguan-two.png")}/>
+											<div className={"mt10"}>
+												<a href="/users/p45296381" className="color-dark">
+													<img className={"rankingimg"} src={getImageUrl("/images/avatars/User/45459?t=1566570434")} />
+													<p className="task-hide rankName mt5 jinshaifont">蒙睿</p>
+												</a>
+											</div>
+										</li>
+								</div>
 							}
 						>
 							<Meta
-								title="Card title"
-								description="This is the description"
+								title={<div className={"center"}>
+									<div className={"rankfonttop"}>吉首大学</div>
+									<div className={"rankfontmid"}>78:01:02</div>
+								</div>}
+								description={
+									<div className={"rankfontbottom"}>3423.45分</div>
+								}
 							/>
 						</Card>
 					</Col>
@@ -145,32 +139,58 @@ class CompetitionContents extends Component{
 						<Card
 							className={"Competitionfirst"}
 							cover={
-								<img
-									alt="example"
-									src="https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png"
-								/>
+								<div className={"Competitionfirstbox center"}>
+								<li className="pr Competitioncenter">
+									<img src={getImageUrl("/images/educoder/huangguan.png")}/>
+									<div className={"mt10"}>
+										<a href="/users/p37219480" className="color-dark">
+										  <img className={"rankingimg"} src={getImageUrl("/images/avatars/User/46128?t=1561087919")} />
+											<p className="task-hide rankName mt5 jinshaifont">李羿锟</p>
+										</a>
+									</div>
+									</li>
+								</div>
 							}
 						>
 							<Meta
-								title="Card title"
-								description="This is the description"
+								title={<div className={"center"}>
+									<div className={"rankfonttop"}>吉首大学</div>
+									<div className={"rankfontmid"}>78:01:02</div>
+								</div>}
+								description={
+									<div className={"rankfontbottoms"}>3423.45分</div>
+								}
+
 							/>
 						</Card>
 
 					</Col>
 					<Col className="mt30" xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 1 }}>
 						<Card
-							className={"Competitionsecondary"}
+							className={"Competitionsecondary "}
 							cover={
-								<img
-									alt="example"
-									src="https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png"
-								/>
+								<div className={"Competitionsecondarybox center"}>
+									<li className=" pr Competitioncenter ">
+										<img src={getImageUrl("/images/educoder/huangguan-three.png")}/>
+										<div className={"mt10"}>
+											<a href="/users/p53601847" className="color-dark">
+												<img className={"rankingimg"} src={getImageUrl("/images/avatars/User/26650?t=1561087884")} />
+												<p className="task-hide rankName mt5 jinshaifont">陈翊</p>
+											</a>
+										</div>
+									</li>
+								</div>
 							}
 						>
 							<Meta
-								title="Card title"
-								description="This is the description"
+								title={<div className={"center"}>
+									<div className={"rankfonttop"}>吉首大学</div>
+									<div className={"rankfontmid"}>78:01:02</div>
+								</div>}
+								description={
+									<div className={"rankfontbottom"}>3423.45分</div>
+								}
+
 							/>
 						</Card>
 					</Col>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 8b480258d..7458d0089 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -385,10 +385,7 @@ class GraduationTasksedit extends Component{
 
               {description===undefined?"":
                 <div>
-                {/*<Form   >*/}
-                {/*  <Form   >*/}
 
-                  {/*内容*/}
                 <div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 pb0 edu-back-white">
 
                   <Form.Item label="类型">
@@ -407,12 +404,12 @@ class GraduationTasksedit extends Component{
                   <style>
                     {
                       `
-                .yslgraduainputedit .ant-input{
-																		border-right: none !important;
-																		height: 40px !important;
-																		}
-                
-                `
+											.yslgraduainputedit .ant-input{
+																					border-right: none !important;
+																					height: 40px !important;
+																					}
+
+											`
                     }
                   </style>
                   <Form.Item label="任务标题"  >