Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

@@ -5,6 +5,7 @@ import locale from 'antd/lib/date-picker/locale/zh_CN';
 import { WordsBtn,getUrl ,handleDateString} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
+import DownloadMessage from '../../../modals/DownloadMessage';
 import CoursesListType from '../../coursesPublic/CoursesListType';
 import PublishModals from "../../coursesPublic/PublishModals";
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
@@ -894,7 +895,40 @@ class GraduationTaskssettingapp extends Component{
 
 
   }
-
+	/// 确认是否下载
+	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
   render(){
     const { getFieldDecorator } = this.props.form;
     const dateFormat = 'YYYY-MM-DD HH:mm';
@@ -969,7 +1003,12 @@ class GraduationTaskssettingapp extends Component{
             {/*course_groups={course_groups}*/}
             {/*skipTop={this.skipTop}*/}
           {/*/>*/}
-
+					<DownloadMessage
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+					/>
           <HomeworkModal
 						starttimes={this.state.starttimes}
 						typs={this.state.typs}
@@ -1070,8 +1109,8 @@ class GraduationTaskssettingapp extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
+                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
+                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
 

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

@@ -6,7 +6,7 @@ import axios from 'axios';
 import moment from 'moment';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import Modals from '../../../modals/Modals';
-
+import DownloadMessage from '../../../modals/DownloadMessage';
 import CoursesListType from '../../coursesPublic/CoursesListType';
 
 import ModulationModal from "../../coursesPublic/ModulationModal";
@@ -612,7 +612,51 @@ class GraduationTaskssettinglist extends Component{
 		this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber);
 
 	}
+	/// 确认是否下载
+	confirmysl(url){
+
+	 let  {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
 
+		axios.get(url,{
+			teacher_comment:teacher_comment,
+			task_status:task_status,
+			course_group:course_group,
+			cross_comment:cross_comment,
+			order:order,
+			b_order:b_order,
+			search:search,
+		}).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
 	render(){
 
 		let {coursename,coursesearch,taskname,taskid,taskslistdata,data,page,limit,teacher_comment,task_status,cross_comment,search,loadingstate,
@@ -959,7 +1003,17 @@ class GraduationTaskssettinglist extends Component{
 						Cancel={this.Cancelvisible}
 						categoryid={taskslistdata.work_id}
 						setupdate={this.setupdate}
-					/>:""}					{taskslistdata&&taskslistdata?
+					/>:""}
+
+					<DownloadMessage
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+					/>
+
+
+					{taskslistdata&&taskslistdata?
 						// 教师列表
 						this.props.isAdmin()?<div className="newMain clearfix">
 								<div className={"educontent mb20"}>
@@ -1025,8 +1079,8 @@ class GraduationTaskssettinglist extends Component{
 											{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
 												导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 												<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">学生成绩</a></li>
+													<li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">学生成绩</a></li>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">作品附件</a></li>
+													<li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">作品附件</a></li>
 												</ul>
 											</li>:""}
 

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

@@ -4,6 +4,7 @@ import {Link} from 'react-router-dom';
 import { WordsBtn,markdownToHTML} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
+import DownloadMessage from '../../../modals/DownloadMessage';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import CoursesListType from '../../coursesPublic/CoursesListType';
 import moment from 'moment';
@@ -187,6 +188,41 @@ class GraduationTasksquestions extends Component{
       course_groupslist:id
     })
   }
+
+	/// 确认是否下载
+	confirmysl(url){
+		axios.get(url).then((response) => {
+			if(response.data.status&&response.data.status===-1){
+
+			}else if(response.data.status&&response.data.status===-2){
+				if(response.data.messages === "100"){
+					// 已超出文件导出的上限数量（100 ），建议：
+
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:100
+					})
+				}else {
+					//因附件资料超过500M
+					this.setState({
+						DownloadType:true,
+						DownloadMessageval:500
+					})
+				}
+			}else {
+				this.props.showNotification(`正在下载中`);
+				window.open("/api"+url, '_blank');
+			}
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+	Downloadcal=()=>{
+		this.setState({
+			DownloadType:false,
+			DownloadMessageval:undefined
+		})
+	}
   render(){
 
     let { Modalstype,Modalstopval,ModalCancel,ModalSave,questionslist} =this.state;
@@ -218,7 +254,12 @@ class GraduationTasksquestions extends Component{
             {/*modalSave={ModalSave}*/}
             {/*loadtype={Loadtype}*/}
           {/*/>*/}
-
+					<DownloadMessage
+						{...this.props}
+						value={this.state.DownloadMessageval}
+						modalCancel={this.Downloadcal}
+						modalsType={this.state.DownloadType}
+					/>
           <HomeworkModal
 						starttimes={this.state.starttimes}
 						typs={this.state.typs}
@@ -311,8 +352,8 @@ class GraduationTasksquestions extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
+                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx")} className="color-dark">导出成绩</a></li>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
+                      <li><a onClick={()=>this.confirmysl("/api/graduation_tasks/"+task_Id+"/tasks_list.zip")} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
 

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

@@ -557,7 +557,7 @@ class Workquestionandanswer extends Component {
 																										 description={jobsettingsdata === undefined ? "" : jobsettingsdata === null ? "" : jobsettingsdata === "null" ? "" : jobsettingsdata.data.explanation === undefined ? "" : jobsettingsdata.data.explanation === null ? "" : jobsettingsdata.data.explanation}></Homeworddescription>
 															</div>
 															:
-															<div className="pl20 " style={{"padding": "10px 10px 10px 20px"}}>
+															<div className="pl20 markdown-body" style={{"padding": "10px 10px 10px 20px"}}>
 																{jobsettingsdata === undefined ? "无" : jobsettingsdata === null ? "无" : jobsettingsdata === "null" ? "无" :
 																	jobsettingsdata.data.explanation === undefined ? "无" : jobsettingsdata.data.explanation === null ? "无" :
 																		<div

public/react/src/modules/tpm/challengesnew/TPManswer2.js

@@ -195,10 +195,10 @@ export default class TPManswer extends Component {
         this.setState({ answers: newAnswers})
     }
     answerOnChange = (val, index) => {
-        // if (!this.state.answers[index]) {
+        if (!this.state.answers[index]) {
-        //     // 1、2、3删除2会走到这里
+            // 1、2、3删除2会走到这里
-        //     return;
+            return;
-        // }
+        }
         const newAnswer = Object.assign({}, this.state.answers[index])
         newAnswer.contents = val
         const newAnswers = this.state.answers.slice(0)
@@ -314,7 +314,7 @@ export default class TPManswer extends Component {
 
                             {
                                 answers.map((answer, index) => {
-                                    return <div className="levelSection" id={`levelSection${index}`}>
+                                    return <div className="levelSection" id={`levelSection${index}`} style={{ clear: 'both' }}>
                                         <span className="mr4 color-orange pt10">*</span>
                                         <p className="color-grey-6 font-16 mb30 mt10" style={{ display: "inline" }}>级别{index + 1}</p>
                                         <a className="fr sample_icon_remove mr30 mt8" onClick={()=>this.delanswers(index)}>