Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/elearning/YslDetailCards.js

@@ -388,6 +388,13 @@ class YslDetailCards extends Component{
 							margin-bottom: 20px;
 							background-color: #fff;
 					}
+					.lessonvalue{
+								max-width: 556px;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+								display: inline-block;
+					 }
 					`
 				}</style>
 

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -3,7 +3,8 @@ import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn} from 'educoder';
 import axios from 'axios';
 import {
-	notification
+	notification,
+	Spin
 } from "antd";
 import '../css/members.css';
 import "../common/formCommon.css";
@@ -38,6 +39,7 @@ class ShixunHomeworkPage extends Component {
 			Modalstopval:"你在该实训的学习记录将被清空，无法恢复",
 			ModalsBottomval:"是否确认重做？",
 			ModalsType:false,
+			mylistisSpin:false,
 		}
 
 	}
@@ -146,13 +148,21 @@ class ShixunHomeworkPage extends Component {
 	}
 	//重置按钮
 	resetshixunCombat=(id)=>{
-		console.log(id);
+	    this.setState({
+				mylistisSpin:true,
+			})
 	    let zrl=`/myshixuns/${id}/reset_my_game.json`;
 	    axios.get(zrl).then((response) => {
 	        // window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
+				this.setState({
+					mylistisSpin:false,
+				})
 				this.child.Isupdatass();
 				this.props.showNotification("重置成功");
 	    }).catch((error) => {
+				this.setState({
+					mylistisSpin:false,
+				})
 	        console.log(error)
 	    });
 	}
@@ -183,9 +193,8 @@ class ShixunHomeworkPage extends Component {
 					loadtype={false}
 				>
 				</Modals>
-
 				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
-
+					<Spin size="large" spinning={this.state.mylistisSpin}>
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">
 							<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
@@ -211,7 +220,6 @@ class ShixunHomeworkPage extends Component {
 
 
 					</div>
-
 					<div className="edu-back-white ">
 						<div className="stud-class-set bor-bottom-greyE ">
 							<div className=" clearfix edu-back-white poll_list">
@@ -301,35 +309,31 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16"
 											 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 								}
-								{this.props.isStudent() ?
-									(
-										teacherdatapage&&teacherdatapage.redo_work===true?
-								<a className="fr color-blue font-16" onClick={()=>this.Modalcancelss()}>重做</a>
-										:""
-								)
-									: "" }
 								{teacherdatapage === undefined ? "" : <Startshixuntask
 									{...this.props}
 									data={teacherdatapage}
 								/>}
-
+								{this.props.isStudent() ?
+									(
+										teacherdatapage&&teacherdatapage.redo_work===true?
+											<a className="fr color-blue font-16" onClick={()=>this.Modalcancelss()}>重做</a>
+											:""
+								 )
+								 : "" }
 							</div>
 						</div>
 					</div>
-
 					{/*<DownloadMessageysl*/}
 						{/*{...this.props}*/}
 						{/*value={this.state.DownloadMessageval}*/}
 						{/*modalCancel={this.Downloadcal}*/}
 						{/*modalsType={this.state.DownloadType}*/}
-
 					{/*/>*/}
-
 					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
 					{parseInt(tab) === 1 ?<Workquestionandanswer  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}
 					{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
 					{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
-
+				</Spin>
 				</div>
 			</div>
 		)