调整

public/react/src/modules/tpm/component/TPMRightSection.js

@@ -64,7 +64,7 @@ class TPMRightSection extends Component {
       Progresssum=(parseInt(TPMRightSectionData&&TPMRightSectionData.complete_count) / parseInt(TPMRightSectionData&&TPMRightSectionData.challenge_count))*100;
     }
 
-
+    // console.log(this.props&&this.props.is_jupyter===true)
     return (
       <div>
         <style>
@@ -111,7 +111,7 @@ class TPMRightSection extends Component {
                 </div>
               </div>
 
-              {this.props&&this.props.status>1?<div className="edu-back-white padd252020px relative borderbottomf4">
+              {this.props&&this.props.is_jupyter===true?"":this.props&&this.props.status>1?<div className="edu-back-white padd252020px relative borderbottomf4">
                 <div className="font-16 mb5">
                   <span><i className={"iconfont icon-jilu1 audit_situationactive font-14"}></i>  学习统计</span>
                   <span className={"sortinxdirection space-between fr"}>

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

@@ -77,11 +77,20 @@ class Challengesjupyter extends Component {
 
 				}else{
 					if(boxoffsetHeigh>=300){
-						this.setState({
+						if(this.props&&this.props.is_jupyter===true&&this.props&&this.props.user.user_identity==="学生"){
-							opentitletype:true,
+							this.setState({
-							isopentitletype:"greater",
+								opentitletype:false,
-							boxoffsetHeigh:boxoffsetHeigh
+								isopentitletype:"greater",
-						})
+								boxoffsetHeigh:boxoffsetHeigh
+							})
+						}else{
+							this.setState({
+								opentitletype:true,
+								isopentitletype:"greater",
+								boxoffsetHeigh:boxoffsetHeigh
+							})
+						}
+
 					}else{
 						this.setState({
 							isopentitletype:"Less",
@@ -147,10 +156,7 @@ class Challengesjupyter extends Component {
 		let datas={
 			identifier:id,
 		}
-
-
 		let ChallengesURL = `/jupyters/get_info_with_tpm.json`;
-
 		axios.get(ChallengesURL, {params: datas}).then((response) => {
 			if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 				setTimeout(() => {
@@ -303,19 +309,23 @@ class Challengesjupyter extends Component {
 
 
 	opentitle=()=>{
+
 		this.setState({
 			opentitletype:!this.state.opentitletype
 		})
 	}
+
 	onclki=(bool)=>{
 		this.setState({
 			enlarge:bool
 		})
 	}
+
 	Importingfiles=()=>{
 		// 导入文件
 
 	}
+
 	handleChange = (info) => {
 		if(info.file.status == "done" || info.file.status == "uploading" || info.file.status === 'removed'){
 			let fileList = info.fileList;
@@ -635,7 +645,8 @@ class Challengesjupyter extends Component {
                     `
 								}
 							</style>
-							{this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+
+							{this.props&&this.props.is_jupyter===true&&this.props&&this.props.user.user_identity==="学生"?"":this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
 								<a className={"font-14  color-grey-9"}>阅读全文 <i className={"iconfont icon-jiantou9 font-14"}></i></a>
 							</Divider>:<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
 								<a className={"font-14  color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a>

public/react/src/modules/tpm/shixuns/ShixunCard.js

@@ -193,11 +193,11 @@ class ShixunCard extends Component {
                       </p>
 
                       <p className="clearfix mt8 font-12 color-grey-B4">
-                        <Tooltip placement="bottom" title={"关卡"}>
+                        {item.is_jupyter===false?<Tooltip placement="bottom" title={"关卡"}>
                             <span className="mr10 fl squareIconSpan">
                               <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
                             </span>
-                        </Tooltip>
+                        </Tooltip>:""}
 
                         {/*<Tooltip placement="bottom" title={"经验值"}>*/}
                             {/*<span className="mr10 fl squareIconSpan">*/}