调整

public/react/public/index.html

@@ -5,6 +5,9 @@
     <!-- width=device-width, initial-scale=1 , shrink-to-fit=no -->
     <!-- <meta name="viewport" content=""> -->
     <meta name="theme-color" content="#000000">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+
+
       <!--
         manifest.json provides metadata used when your web app is added to the
         homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/

public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js

@@ -33,7 +33,7 @@ function CommonWorkAppraiseReviseAttachments(props) {
                     {item.title}
                 </a>
                 <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.props.onAttachmentRemove(item.id)}></i>:""}
+                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>props.onAttachmentRemove(item.id)}></i>:""}
                 </div>
             )
             })}

public/react/src/modules/courses/exercise/Exercise.js

@@ -498,7 +498,7 @@ class Exercise extends Component{
                             {/*}*/}
                         </p>
                         <div className="clearfix pl30 pr30">
-                            <p className="fl font-16" style={{"marginTop":"27px"}}>
+                            <p className="fl font-14" style={{"marginTop":"27px"}}>
                                 <span className="mr20">共{exercises_counts && exercises_counts.exercises_total_counts}个试卷</span>
                                 <span className="mr20">已发布：{exercises_counts && exercises_counts.exercises_published_counts}个</span>
                                 <span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span> 

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

@@ -50,7 +50,8 @@ class GraduationTasksnew extends Component {
 	}
 
 	Commoninterface =(fileList)=>{
-
+    let coursesId=this.props.match.params.coursesId;
+		let category_id=this.props.match.params.category_id;
 		let listid = []
 
 		for (var list of fileList) {
@@ -90,7 +91,8 @@ class GraduationTasksnew extends Component {
 							// GraduationTasksnewtype = false;
 							// this.goback();
 						if(response!==undefined){
-							this.goback()
+							// this.goback()
+							this.props.history.replace(`/courses/${coursesId}/graduation_tasks/${category_id}/detail/${response.data.task_id}/questions`);
 						}
 						// }
 					}).catch((error) => {

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

@@ -958,6 +958,7 @@ class GraduationTaskssettinglist extends Component{
 
 		}
 
+		console.log(this.props.questionslist.status)
 		return(
 			<React.Fragment>
 
@@ -1100,7 +1101,7 @@ class GraduationTaskssettinglist extends Component{
 						this.props.isAdmin() ?
 									<div className="stud-class-set">
 										<div className="clearfix edu-back-white" >
-											<ul className="clearfix" style={{padding:'20px 30px 10px 30px'}}>
+											{this.props.questionslist&&this.props.questionslist.status===0?"":<ul className="clearfix" style={{padding:'20px 30px 10px 30px'}}>
 
 												<li className="clearfix">
 													<span className="fl mr10 color-grey-8">教师评阅：</span>
@@ -1200,9 +1201,9 @@ class GraduationTaskssettinglist extends Component{
 
 												</li>}
 
-											</ul>
+											</ul>}
 
-											<div id="graduation_work_list" style={{padding:'0px 30px 10px 30px'}}>
+											{this.props.questionslist&&this.props.questionslist.status===0?"":<div id="graduation_work_list" style={{padding:'0px 30px 10px 30px'}}>
 												<style>
 													{`
 														.edu-menu-lists li:hover {
@@ -1251,7 +1252,7 @@ class GraduationTaskssettinglist extends Component{
 													</div>
 													:""}
 
-											</div>
+											</div>}
 
 											{
 												JSON.stringify(data)==="[]" ?

public/react/src/modules/courses/poll/Poll.js

@@ -517,7 +517,7 @@ class Poll extends Component{
             }
           </p>
           <div className="clearfix pl30 pr30">
-            <p className="fl font-16" style={{"marginTop":"27px"}}>
+            <p className="fl font-14" style={{"marginTop":"27px"}}>
               <span className="mr20">共{polls_counts && polls_counts.polls_total_counts}个问卷</span>
               <span className="mr20">已发布：{polls_counts && polls_counts.polls_published_counts}个</span>
               <span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span>

public/react/src/modules/courses/poll/PollDetailTabFirst.js

@@ -253,11 +253,13 @@ class PollDetailTabFirst extends Component{
        }
       )
     }
+
+    console.log(this.props.pollDetail&&this.props.pollDetail.polls_status)
     return(
           <div>
           {
             isAdmin ?
-            <div className="pt30 pl30 clearfix edu-back-white">
+							this.props.pollDetail&&this.props.pollDetail.polls_status===undefined||this.props.pollDetail&&this.props.pollDetail.polls_status===1?"":<div className="pt30 pl30 clearfix edu-back-white">
               <div className="pr30 clearfix">
                 <p className="fl mt5">
                   <CheckAllGroup options={options_status} label={'答题状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
@@ -282,7 +284,7 @@ class PollDetailTabFirst extends Component{
             </div>:""
           }
 
-          <div className="clearfix padding20-30 edu-back-white">
+						{this.props.pollDetail&&this.props.pollDetail.polls_status===undefined||this.props.pollDetail&&this.props.pollDetail.polls_status===1?"":<div className="clearfix padding20-30 edu-back-white">
             {
               isAdmin ? <span className="fl color-grey-3 font-12"><span className="color-orange-tip">{poll_types && poll_types.total_users}</span>个检索结果（{poll_types && poll_types.poll_users_count} 学生）</span> :""
             }
@@ -311,7 +313,7 @@ class PollDetailTabFirst extends Component{
                 </li>
               </div>
             }
-          </div>
+          </div>}
 						<div className="edu-table edu-back-white minH-560">
             {
               data && data.length>0 ?<Table columns={columns} dataSource={data} pagination={false}></Table> :<NoneData></NoneData>

public/react/src/modules/ecs/EcSetting/CourseSupports/index.js

@@ -108,7 +108,7 @@ class CourseSupports extends Component {
         id=parseInt(id);
 
         let subindex =e.target.getAttribute("subindex");
-
+       debugger
         // const url = `/ec_course_supports/edit_require_vs_course?subitem_id=`+id
         // axios.get(url)
         //     .then((response) => {
@@ -169,6 +169,27 @@ class CourseSupports extends Component {
 				}
 			})
 
+			let newnum=0;
+
+			data.graduation_subitems.map((item,key)=>{
+				if(keys===key){
+					item.course_supports.map((items,keys)=>{
+						if(items.weights===undefined){
+							newnum=0
+						}else{
+							newnum=newnum+items.weights;
+						}
+					})
+				}
+			})
+
+			newnum= Math.round(newnum*100)/100;
+
+			this.setState({
+				editnum:newnum
+			})
+      console.log(newnum)
+
         // $("#school_ListTableLine").show();
         // let offsettop=$("#school_ListTableLine").position().top||$("#school_ListTableLine").scrollTop || $("#school_ListTableLine").pageYOffset;
         // window.scrollTo(0, offsettop)
@@ -231,6 +252,10 @@ class CourseSupports extends Component {
                 Supportssum:true
             })
             return
+        }else{
+					this.setState({
+						Supportssum:false
+					})
 				}
 
 
@@ -266,6 +291,10 @@ class CourseSupports extends Component {
                 Supportslist:'权重之和不能大于1',
                 Supportssum:true
             })
+        }else{
+					this.setState({
+						Supportssum:false
+					})
 				}
 
     }
@@ -541,7 +570,7 @@ class CourseSupports extends Component {
                                                       </div>
                                                       <div className="left operationalter">
                                                          {data.is_manager===false?"":<a className="editSubentry" data-tip-down="编辑">
-                                                            <i className="iconfont icon-bianjidaibeijing color-green" id={item.ec_graduation_subitem_id} subindex={item.sequence_num} onClick={this.EditSupportCourse.bind(this,key)}></i>
+                                                            <i className="iconfont icon-bianjidaibeijing color-green" id={item.ec_graduation_subitem_id} subindex={item.graduation_requirement_position+"-"+item.position} onClick={this.EditSupportCourse.bind(this,key)}></i>
                                                           </a>} 
                                                     </div>
                                                   </div>

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

@@ -766,9 +766,9 @@ submittojoinclass=(value)=>{
 								/>
               </li>
 							<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
-							<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>
+							{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
-								<Link to={'/crowdsourcing'}>众包创新</Link>
+								{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
-							</li>
+							{/*</li>*/}
               <li className={`${activeForums === true ? 'active' : ''}`}>	<Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
               <li
                 style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.auth===null? 'none' : 'block'}}