调整

public/react/src/modules/courses/coursesPublic/Startshixuntask.js

@@ -1,163 +1,163 @@
-import React,{ Component } from "react";
-import { WordsBtn } from 'educoder';
-import {Tooltip,message,Modal} from 'antd';
-import {Link} from 'react-router-dom';
-import axios from 'axios';
-import Modals from '../../modals/Modals';
-
-
-
-class Startshixuntask extends Component{
-	constructor(props){
-		super(props);
-		this.state = {
-			startbtn:false
-		}
-
-	}
-
-	componentDidMount() {
-
-	}
-
-	taskoperationId=(list)=>{
-		this.setState({
-			startbtn:true,
-		})
-		let url= list+".json";
-		axios.get(url).then((response) => {
-
-			if(response.status===200){
-				if(response.data.status===-2){
-
-					this.setState({
-						startbtn:false,
-						shixunsreplace:true,
-						hidestartshixunsreplacevalue:response.data.message+".json"
-					})
-				}else if(response.data.status===-1){
-					console.log(response)
-				}else if(response.data.status===-3){
-					this.setState({
-						shixunsmessage:response.data.message,
-						startshixunCombattype:true,
-						startbtn:false
-					})
-				}else{
-
-					if(response.data.status!=401&&response.data.status!=403){
-						window.location.href = "/tasks/"+response.data.game_identifier;
-					}
-
-				}
-			}
-		}).catch((error) => {
-			this.setState({
-				startbtn:false
-			})
-		});
-
-	}
-
-	hidestartshixunsreplace=(url)=>{
-		axios.get(url).then((response) => {
-			if(response.status===200){
-
-				this.setState({
-					shixunsreplace:false
-				})
-				message.success('重置成功，正在进入实训！');
-				let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
-				this.props.history.push(path);
-
-			}}
-		).catch((error) => {
-			this.setState({
-				startbtn:false,
-				shixunsreplace:false
-			})
-		});
-
-	}
-
-	hidestartshixunCombattype=()=>{
-		this.setState({
-			startshixunCombattype:false
-		})
-	}
-
-	render(){
-		let {
-			Modalstype,
-			Modalstopval,
-			Modalsbottomval,
-			cardsModalcancel,
-			cardsModalsavetype,
-			loadtype,
-			shixunsreplace,
-			hidestartshixunsreplacevalue,
-			startshixunCombattype,
-			shixunsmessage,
-			startbtn
-		} = this.state;
-
-		return(
-			  <a className="fr color-blue font-16" >
-				<Modals
-					modalsType={Modalstype}
-					modalsTopval={Modalstopval}
-					modalsBottomval={Modalsbottomval}
-					modalCancel={cardsModalcancel}
-					modalSave={cardsModalsavetype}
-					loadtype={loadtype}
-				/>
-
-
-				<Modal
-					title="提示"
-					visible={shixunsreplace}
-					closable={false}
-					footer={null}
-					keyboard={false}
-				>
-					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
-					</div>
-					<div className="task-popup-submit clearfix">
-						<a className="task-btn task-btn-orange fr mr51"
-						   onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了！</a>
-					</div>
-				</Modal>
-				<Modal
-					title="提示"
-					visible={startshixunCombattype}
-					closable={false}
-					footer={null}
-					keyboard={false}
-				>
-					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
-						</p>
-					</div>
-					<div className="task-popup-submit clearfix">
-						{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
-						<a className="task-btn task-btn-orange fr mr51" onClick={this.hidestartshixunCombattype}>知道啦</a>
-					</div>
-					{/*<p className="inviteTipbtn with100 fl">*/}
-					{/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
-					{/*</p>*/}
-				</Modal>
-
-					{this.props.isStudent?
-						<span>
-							{this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?<span onClick={()=>this.taskoperationId(	this.props.data.task_operation[1])}>
-								{this.props.data.task_operation[0]}
-							</span>:"开启中":""}
-						</span>:""
-					}
-
-			</a>
-		)
-	}
-}
+import React,{ Component } from "react";
+import { WordsBtn } from 'educoder';
+import {Tooltip,message,Modal} from 'antd';
+import {Link} from 'react-router-dom';
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+
+
+
+class Startshixuntask extends Component{
+	constructor(props){
+		super(props);
+		this.state = {
+			startbtn:false
+		}
+
+	}
+
+	componentDidMount() {
+
+	}
+
+	taskoperationId=(list)=>{
+		this.setState({
+			startbtn:true,
+		})
+		let url= list+".json";
+		axios.get(url).then((response) => {
+
+			if(response.status===200){
+				if(response.data.status===-2){
+
+					this.setState({
+						startbtn:false,
+						shixunsreplace:true,
+						hidestartshixunsreplacevalue:response.data.message+".json"
+					})
+				}else if(response.data.status===-1){
+					console.log(response)
+				}else if(response.data.status===-3){
+					this.setState({
+						shixunsmessage:response.data.message,
+						startshixunCombattype:true,
+						startbtn:false
+					})
+				}else{
+
+					if(response.data.status!=401&&response.data.status!=403){
+						window.location.href = "/tasks/"+response.data.game_identifier;
+					}
+
+				}
+			}
+		}).catch((error) => {
+			this.setState({
+				startbtn:false
+			})
+		});
+
+	}
+
+	hidestartshixunsreplace=(url)=>{
+		axios.get(url).then((response) => {
+			if(response.status===200){
+
+				this.setState({
+					shixunsreplace:false
+				})
+				message.success('重置成功，正在进入实训！');
+				let path="/shixuns/"+response.data.shixun_identifier+"/challenges";
+				this.props.history.push(path);
+
+			}}
+		).catch((error) => {
+			this.setState({
+				startbtn:false,
+				shixunsreplace:false
+			})
+		});
+
+	}
+
+	hidestartshixunCombattype=()=>{
+		this.setState({
+			startshixunCombattype:false
+		})
+	}
+
+	render(){
+		let {
+			Modalstype,
+			Modalstopval,
+			Modalsbottomval,
+			cardsModalcancel,
+			cardsModalsavetype,
+			loadtype,
+			shixunsreplace,
+			hidestartshixunsreplacevalue,
+			startshixunCombattype,
+			shixunsmessage,
+			startbtn
+		} = this.state;
+
+		return(
+			  <a className="fr color-blue font-16" >
+				<Modals
+					modalsType={Modalstype}
+					modalsTopval={Modalstopval}
+					modalsBottomval={Modalsbottomval}
+					modalCancel={cardsModalcancel}
+					modalSave={cardsModalsavetype}
+					loadtype={loadtype}
+				/>
+
+
+				<Modal
+					title="提示"
+					visible={shixunsreplace}
+					closable={false}
+					footer={null}
+					keyboard={false}
+				>
+					<div className="task-popup-content">
+						<p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
+					</div>
+					<div className="task-popup-submit clearfix">
+						<a className="task-btn task-btn-orange fr mr51"
+						   onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
+					</div>
+				</Modal>
+				<Modal
+					title="提示"
+					visible={startshixunCombattype}
+					closable={false}
+					footer={null}
+					keyboard={false}
+				>
+					<div className="task-popup-content">
+						<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
+						</p>
+					</div>
+					<div className="task-popup-submit clearfix">
+						{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
+						<a className="task-btn task-btn-orange fr mr51" onClick={this.hidestartshixunCombattype}>知道啦</a>
+					</div>
+					{/*<p className="inviteTipbtn with100 fl">*/}
+					{/*<a onClick={this.hidestartshixunCombattype}>知道了</a>*/}
+					{/*</p>*/}
+				</Modal>
+
+					{this.props.isStudent?
+						<span>
+							{this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?<span onClick={()=>this.taskoperationId(	this.props.data.task_operation[1])}>
+								{this.props.data.task_operation[0]}
+							</span>:"开启中":""}
+						</span>:""
+					}
+
+			</a>
+		)
+	}
+}
 export default Startshixuntask;

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

@@ -210,7 +210,7 @@ class ShixunhomeWorkItem extends Component{
             </div>
             <div className="task-popup-submit clearfix">
               <a className="task-btn task-btn-orange fr mr51"
-                 onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了！</a>
+                 onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
             </div>
           </Modal>
           <Modal

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -529,7 +529,7 @@ class Challenges extends Component {
                 <p className="task-popup-text-center font-16 pb20">实训已经更新了，正在为您重置!</p>
               </div>
               <div className="task-popup-submit clearfix">
-                <a className="task-btn task-btn-orange fr mr51" onClick={()=>this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了！</a>
+                <a className="task-btn task-btn-orange fr mr51" onClick={()=>this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
               </div>
             </Modal>
           </div>