实训权限调整

public/react/src/AppConfig.js

@@ -31,7 +31,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         proxy = "https://testeduplus2.educoder.net"
-        proxy="http://47.96.87.25:48080"
+        //proxy="http://47.96.87.25:48080"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js

@@ -259,11 +259,11 @@ class GraduationTasksappraise extends Component{
                     </div>
 
 
-
+										<div className="color-grey" key={key}>
                     {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{
 
 											return(
-                      <div className="color-grey" key={key}>
+												<span>
 													<a className="color-grey ml20">
 														<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
 													</a>
@@ -273,12 +273,11 @@ class GraduationTasksappraise extends Component{
 													</a>
 													<span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
 													{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
-
+												</span>
-                      </div>
 													)
 												 })}
 
-
+								  	</div>
 
                     <div className={"color-grey-6 h20 ml20"}>
 

public/react/src/modules/login/Trialapplication.js

@@ -34,8 +34,8 @@ class Trialapplication extends Component {
 			showTrial: false,
 		}
 		//user_phone_binded  判断是否手机号验证
-		console.log("Trialapplication");
+		// console.log("Trialapplication");
-		console.log(props);
+		// console.log(props);
 	}
 
 	Cancel = () => {

public/react/src/modules/tpm/TPMBanner.js

@@ -640,7 +640,7 @@ class TPMBanner extends Component {
                                className="fr user_default_btn task-btn-orange font-18"
                                id="shixun_operation" data-remote="true"
                             >
-                                {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"}
+                                {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0]}
                             </a>
                         </Tooltip>
                         : ""

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

@@ -359,7 +359,7 @@ class Challenges extends Component {
                               {item.delete_url != undefined &&
                               <Tooltip placement="bottom" title={"删除"}>
                                 <a onClick={() => this.delOperations(item.challenge_id)}
-                                   style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+                                   style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
                                    className="fl ring-op-green mr25">
                                   <img src={getImageUrl("images/educoder/icon/close.svg")}
                                        className="fl mt5 ml5" />
@@ -371,7 +371,7 @@ class Challenges extends Component {
                             {item.up_url != undefined &&
                             <Tooltip placement="bottom" title={"向上移动"}>
                               <a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "up")}
-                                 style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+                                 style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
                                  className="fl ring-op-green mr25">
                                 <img src={getImageUrl("images/educoder/icon/moveup.svg")}
                                      className="fl mt2 ml4" />
@@ -381,7 +381,7 @@ class Challenges extends Component {
                             {item.down_url != undefined &&
                             <Tooltip placement="bottom" title={"向下移动"}>
                               <a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "down")}
-                                 style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+                                 style={{ display: this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
                                  className="fl ring-op-green mr25">
                                 <img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4" />
                               </a>
@@ -393,7 +393,7 @@ class Challenges extends Component {
                               item.st === 1 ?
                                 <Tooltip placement="bottom" title={"编辑"}>
                                   <a
-                                    style={{ display: this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
+                                    style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
                                     href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
                                     className="fl ring-green">
                                     <img src={getImageUrl("images/educoder/icon/edit.svg")}
@@ -403,7 +403,7 @@ class Challenges extends Component {
                                 :
                                 <Tooltip placement="bottom" title={"编辑"}>
                                   <a
-                                    style={{ display: this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
+                                    style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
                                     href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
                                     className="fl ring-green">
                                     <img src={getImageUrl("images/educoder/icon/edit.svg")}