调整

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

@@ -8,7 +8,7 @@ import '../shixunchildCss/Challenges.css';
 import axios from 'axios';
 const $ = window.$;
 
-
+//12.20,14:11
 class Challengesjupyter extends Component {
 	constructor(props) {
 		super(props)
@@ -48,54 +48,33 @@ class Challengesjupyter extends Component {
 							isopentitletype:"Less",
 						})
 					}
-					this.getjianjiesize()
 				}
 			}
 		}).catch((error) => {
 			//console.log(error)
 		});
 	}
+	componentDidUpdate = (prevProps,prevState) => {
 
-
+		//防止陷入无限循环
-	getjianjiesize=()=>{
+		if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
-		let {ChallengesDataList}=this.state;
 			let boxoffsetHeigh;
 			let box=document.getElementById("shixunchallengesid");
-
 			if(box){
 				boxoffsetHeigh=box.offsetHeight
-			if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
+				if(boxoffsetHeigh<300){
-
-			}else{
-				if(this.state.isopentitletype==="greater"){
-
-				}else{
-					if(boxoffsetHeigh>=300){
 					this.setState({
-							opentitletype:true,
+						isopentitletype:"Less",
-							isopentitletype:"greater",
 						boxoffsetHeigh:boxoffsetHeigh
 					})
 				}else{
 					this.setState({
-							isopentitletype:"Less",
+						isopentitletype:"greater",
+						opentitletype:true,
 						boxoffsetHeigh:boxoffsetHeigh
 					})
 				}
-				}
-
-			}
-
-		}
-	}
-	componentDidUpdate = (prevProps,prevState) => {
-
-		//防止陷入无限循环
-		if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
-			if(this.state.isopentitletype==="greater"){
 
-			}else{
-				this.getjianjiesize()
 			}
 		}
 
@@ -145,10 +124,6 @@ class Challengesjupyter extends Component {
 			}, 600)
 
 		});
-		setTimeout(this.getjianjiesize(), 1000);
-
-
-
 
 		window.addEventListener('message', (e) => {
 			console.log("触发了jupytermessage");
@@ -163,8 +138,6 @@ class Challengesjupyter extends Component {
 			}
 
 		});
-		setTimeout(this.getjianjiesize(), 1000);
-
 	}
 
 	updatamakedowns = () => {
@@ -234,7 +207,6 @@ class Challengesjupyter extends Component {
 			.then((result) => {
 				if (result.data.status === 0) {
 					this.props.showNotification(`应用成功`);
-					console.log("触发了jupytermessage调用了应用成功");
 				}
 			}).catch((error) => {
 		})
@@ -245,15 +217,12 @@ class Challengesjupyter extends Component {
 			opentitletype:!this.state.opentitletype
 		})
 	}
-
 	onclki=(bool)=>{
 		this.setState({
 			enlarge:bool
 		})
 	}
 
-
-
 	render() {
 		let{ChallengesDataList,booljupyterurls,enlarge}=this.state;
 		let id = this.props.match.params.shixunId;
@@ -263,8 +232,6 @@ class Challengesjupyter extends Component {
 		const  business  = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
 		//管理员
 		const  admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
-    //用户
-		const  login = this.props&&this.props.current_user&&this.props.current_user.login?this.props.current_user.login:"";
 
 		let  mysidentity =false;
 		try {
@@ -286,19 +253,7 @@ class Challengesjupyter extends Component {
 								</a>
 							</Tooltip>
 						</div>
-
+						{this.state.opentitletype===true?<style>
-						<div>
-							<style>
-								{
-									`
-                    .markdown-body img{
-                      min-height: 200px;
-                    }
-                    `
-								}
-							</style>
-
-							{ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?<style>
 							{
 								`
 									#shixunchallengesid{
@@ -308,17 +263,7 @@ class Challengesjupyter extends Component {
 									`
 							}
 						</style>:""}
-							{ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+						<div>
-								<style>
-									{
-										`
-                      #shixunchallengesid{
-                          max-height:260px;
-                          overflow: hidden;
-                      }
-                      `
-									}
-								</style>:""}
 
 							<div className={"pd20"} id={"shixunchallengesid"}>
 								<p id="ReactMarkdown" style={{overflow:'hidden'}}>
@@ -385,7 +330,6 @@ class Challengesjupyter extends Component {
 									display: flex;
 									flex-direction:row-reverse;
 									}
-									
 								;						
 																}
 								`
@@ -397,7 +341,9 @@ class Challengesjupyter extends Component {
 								:
 								(
 									admin===true||business===true||mysidentity===true?
-									<div className={"shixunjianjiecballenges edu-back-white sortinxdirection mt20"}>
+										<div className={enlarge?"shixunjianjiecballenges edu-back-white intermediatecenter  fangdaone":"shixunjianjiecballenges edu-back-white  mt20"}>
+
+											<div className={"sortinxdirection"} >
 												<div className="renwuxiangssi sortinxdirection">
 													<div><p className="renwuxiangqdiv">任务详情</p></div>
 													<div><p className="renwuxiangqdivtest ml1 shixunbingbaocun">（请将实训题目写在下方并保存）</p></div>
@@ -413,11 +359,13 @@ class Challengesjupyter extends Component {
 																marginLeft: '30px',
 															}}  onClick={()=>this.onclki(true)}></i>
 													}
-												{/*<div className="challenbaocun" ><p*/}
+													{/*<div className="challenbaocun" onClick={() => this.modifyjupyter(this.state)}><p*/}
 													{/*	className="challenbaocuntest">导入</p>*/}
 													{/*</div>*/}
 												</div>
 											</div>
+										</div>
+
 										:
 										""
 								)