调整

public/react/config/webpack.config.dev.js

@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-  // devtool: "source-map",  // 开启调试
+   devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js

@@ -57,20 +57,22 @@ class Groupjobbandetails extends Component {
 
 
 	render() {
-
+  let{datas}=this.props;
 		return (
 			<div className=" clearfix  edu-back-white"  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
 
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML("C++是C语言的面向对象扩展，是C语言的一个超集，同时也是历史最悠久、最受欢迎的程序设计语言之一。根据C++创始人Stroustrup的自述：C++是一个“更好的C语言”。\n" +
+					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>
-							"\n" +
+
-							"输入输出是计算机程序的基本功能。程序本质上是对数据进行处理的一系列操作，一般程序都可以分解为：“数据输入”、“数据处理”和“数据输出”三个步骤。标准输入输出（键盘输入和显示器输出）是程序的重要组成部分。\n" +
+					{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {
-							"\n" +
+						return (
-							"本实训项目的主要目标是学习和掌握C++程序的基本结构和基本输入输出，主要内容包括标准C语言自有的单个字符的输入输出、格式化的输入输出，以及C++扩展的使用流对象的输入输出").replace(/▁/g, "▁▁▁")}}/>
+							<GroupPackage key={key} attachments={item}></GroupPackage>
+						)
+					})}
+
+					<GroupPackage2 datas={datas} bool={false}></GroupPackage2>
 
-					<GroupPackage></GroupPackage>
 
-					<GroupPackage2></GroupPackage2>
 				</div>
 
 

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -18,17 +18,20 @@ class Completetaskpage extends Component {
 	constructor(props) {
 		super(props);
 		// this.answerMdRef = React.createRef();
-		this.setState({
+		this.state={
 			workid:1,
 			isSpin:false,
 			datas:[],
-		})
+		}
 	}
 
 
 
 	componentDidMount() {
 		// console.log("父组件加载框");
+		this.getonedata();
+	}
+	getonedata(){
 		if(	this.props.match.params.workid){
 			this.setState({
 				workid:	this.props.match.params.workid,
@@ -47,13 +50,13 @@ class Completetaskpage extends Component {
 		this.setState({
 			isSpin:true,
 		})
-		let url = `/homework_banks/${workids}.json`;
+		let url = `/task_banks/${workids}.json`;
 		//
 		axios.get(url).then((response) => {
 			if(response){
 				if(response.data){
 					this.setState({
-						datas:response.data.informs,
+						datas:response.data,
 					})
 				}else {
 					this.setState({
@@ -86,6 +89,7 @@ class Completetaskpage extends Component {
 ///////////////教师截止
 
 	render() {
+		let{datas}=this.state;
 
 		const isAdmin = this.props.isAdmin();
 		// console.log(119)
@@ -108,10 +112,10 @@ class Completetaskpage extends Component {
 					</div>
 					<div className="educontent mb20">
 						<p className=" fl color-black  summaryname" style={{heigth: "33px"}}>
-							MySQL数据库编程开发实训（基础篇）
+							{datas&&datas.name}
 						</p>
 						<CoursesListType
-							typelist={["公开"]}
+							typelist={datas&&datas.is_public?["公开"]:["私有"]}
 						/>
 					</div>
 
@@ -126,7 +130,7 @@ class Completetaskpage extends Component {
 						</div>
 					</div>
 
-			 <Completetaskdetails/>
+			 <Completetaskdetails {...this.state} {...this.props} datas={datas}/>
 
 				</div>
 			</div>

public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js

@@ -19,11 +19,11 @@ class CompletetopicdePage extends Component {
 	constructor(props) {
 		super(props);
 		// this.answerMdRef = React.createRef();
-     this.setState({
+     this.state={
 			 workid:1,
 			 isSpin:false,
 			 datas:[],
-		 })
+		 }
 	}
 
 
@@ -48,13 +48,13 @@ class CompletetopicdePage extends Component {
 		this.setState({
 			isSpin:true,
 		})
-		let url = `/homework_banks/${workids}.json`;
+		let url = `/gtopic_banks/${workids}.json`;
 		//
 		axios.get(url).then((response) => {
 			if(response){
 				if(response.data){
 					this.setState({
-						datas:response.data.informs,
+						datas:response.data,
 					})
 				}else {
 					this.setState({
@@ -88,7 +88,7 @@ class CompletetopicdePage extends Component {
 ///////////////教师截止
 
 	render() {
-
+    let{datas}=this.state;
 		const isAdmin = this.props.isAdmin();
 		// console.log(119)
 
@@ -110,10 +110,10 @@ class CompletetopicdePage extends Component {
 					</div>
 					<div className="educontent mb20">
 						<p className=" fl color-black  summaryname" style={{heigth: "33px"}}>
-							MySQL数据库编程开发实训（基础篇）
+							{datas&&datas.name}
 						</p>
 						<CoursesListType
-							typelist={["公开"]}
+							typelist={datas&&datas.is_public?["公开"]:["私有"]}
 						/>
 					</div>
 
@@ -128,7 +128,7 @@ class CompletetopicdePage extends Component {
 						</div>
 					</div>
 
-					 <Completetopicdetails/>
+					 <Completetopicdetails {...this.state} {...this.props} datas={datas}/>
 					{/*{parseInt(tab) === 1 ? <Completetopicdeswer/>:""}*/}
 
 				</div>

public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js

@@ -56,52 +56,52 @@ class Completetopicdetails extends Component {
 
 
 	render() {
-
+    let{datas}=this.props;
 		return (
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="bor-bottom-greyE">
 				<div className="yslquestionbank1">
 
-					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML("C++是C语言的面向对象扩展，是C语言的一个超集，同时也是历史最悠久、最受欢迎的程序设计语言之一。根据C++创始人Stroustrup的自述：C++是一个“更好的C语言”。\n" +
+					<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>
-							"\n" +
-							"输入输出是计算机程序的基本功能。程序本质上是对数据进行处理的一系列操作，一般程序都可以分解为：“数据输入”、“数据处理”和“数据输出”三个步骤。标准输入输出（键盘输入和显示器输出）是程序的重要组成部分。\n" +
-							"\n" +
-							"本实训项目的主要目标是学习和掌握C++程序的基本结构和基本输入输出，主要内容包括标准C语言自有的单个字符的输入输出、格式化的输入输出，以及C++扩展的使用流对象的输入输出").replace(/▁/g, "▁▁▁")}}/>
 
-					<GroupPackage></GroupPackage>
+					{datas.attachment_list === undefined ? "" : datas.attachment_list.map((item, key) => {
+						return (
+							<GroupPackage key={key} attachments={item}></GroupPackage>
+						)
+					})}
 				</div>
 				</div>
 				<div style={{width:"100%", padding: "36px"}}>
 				  <div className="yslboomdivs">
          <p>
 					<span className="yslboomdivsy">课题类型：</span>
-					 <span className="yslboomdivsys">设计</span>
+					 <span className="yslboomdivsys">{datas&&datas.topic_type===1?"设计":datas&&datas.topic_type===2?"论文":datas&&datas.topic_type===3?"创作":"设计"}</span>
 				 </p>
          <p>
 					 <span className="yslboomdivsy">课题来源：</span>
-					 <span className="yslboomdivsys">生产/社会实践</span>
+					 <span className="yslboomdivsys">{datas&&datas.topic_source===1?"生产/社会实际":datas&&datas.topic_source===2?"结合科研":datas&&datas.topic_source===3?"其它":"生产/社会实际"}</span>
 				 </p>
 					<p>
 						<span className="yslboomdivsy">课题性质1：</span>
-						<span className="yslboomdivsys">设计</span>
+						<span className="yslboomdivsys">{datas&&datas.topic_property_first===1?"真题":datas&&datas.topic_property_first===2?"模拟题":"真题"}</span>
 					</p>
 					<p>
 						<span className="yslboomdivsy">课题性质2：</span>
-						<span className="yslboomdivsys">设计</span>
+						<span className="yslboomdivsys">{datas&&datas.topic_property_second===1?"纵向课题":datas&&datas.topic_property_second===2?"横向课题":datas&&datas.topic_property_second===3?"自选":"纵向课题"}</span>
 					</p>
 				</div>
 					<div className="yslboomdivs">
 						<p>
 							<span className="yslboomdivsy">课题重复情况： </span>
-							<span className="yslboomdivsys">新需求</span>
+							<span className="yslboomdivsys">{datas&&datas.topic_repeat===1?"新题":datas&&datas.topic_repeat===2?"往届题，有新要求":datas&&datas.topic_repeat===3?"往届题，无新要求":"新题"}</span>
 						</p>
 						<p>
 							<span className="yslboomdivsy">调研或实习地点：</span>
-							<span className="yslboomdivsys">长沙</span>
+							<span className="yslboomdivsys">{datas&&datas.province}{datas&&datas.city}</span>
 						</p>
 						<p style={{width:"564px"}}>
 							<span className="yslboomdivsy">课题单位来源：</span>
-							<span className="yslboomdivsys">湖南省据C++创始人Stroustrup有限公司</span>
+							<span className="yslboomdivsys">{datas&&datas.source_unit}</span>
 						</p>
 					</div>
 				</div>

public/react/src/modules/courses/groupjobbank/GroupPackage2.js

@@ -54,19 +54,42 @@ class GroupPackage extends Component {
 
 
 	render() {
-		let{datas}=this.props;
+		let{datas,bool}=this.props;
 
 		return (
+			bool===true?
+
 			<div className="ml47text">
-				<p>
+				{
-					<span className="ysltextcolor66">分组要求：</span>
+					datas===undefined?"":datas.min_num===undefined||datas.max_num===undefined?"":datas.min_num===null||datas.max_num===null?"":
-					<span className="ysltextcolor05">{datas&&datas.min_num}~ {datas&&datas.max_num}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
+						<p>
-				</p>
+							<span className="ysltextcolor66">分组要求：</span>
+							<span className="ysltextcolor05">{datas&&datas.min_num}~ {datas&&datas.max_num}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
+						</p>
+				}
 				<p>
 					<span className="ysltextcolor66">基于项目实施</span>
 					<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
 				</p>
 			</div>
+			:<div className="ml47text">
+					{
+						datas===undefined?"":datas.group_info===undefined?"":datas.group_info.min_number===undefined||datas.group_info.max_number===undefined?"":
+							datas.group_info.min_number===null||datas.group_info.max_number===null?"":
+							<p>
+								<span className="ysltextcolor66">分组要求：</span>
+								<span className="ysltextcolor05">{datas&&datas.group_info&&datas.group_info.min_number}~ {datas&&datas.group_info&&datas.group_info.max_number}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
+							</p>
+					}
+					{
+						datas&&datas.group_info&&datas.group_info.base_on_project?
+							<p>
+								<span className="ysltextcolor66">基于项目实施</span>
+								<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
+							</p>
+							:""
+					}
+				</div>
 		)
 	}
 }

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -71,7 +71,7 @@ class Groupjobbandetails extends Component {
 						)
 					})}
 
-					<GroupPackage2 datas={datas}></GroupPackage2>
+					<GroupPackage2 datas={datas} bool={true}></GroupPackage2>
 				</div>
 
 

public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js

@@ -44,7 +44,7 @@ class GroupjobbankPage extends Component {
 			console.log(e);
 			console.log("44");
 		}
-
+		this.getonedata();
 	}
 
 
@@ -65,6 +65,9 @@ class GroupjobbankPage extends Component {
 		this.setState({
 			shixuntypes: types[3]
 		})
+    this.getonedata();
+	}
+	getonedata=()=>{
 		if(	this.props.match.params.workid){
 			this.setState({
 				workid:	this.props.match.params.workid,

public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js

@@ -69,7 +69,7 @@ class Groupjobquesanswer extends Component {
 						)
 					})}
 
-					<GroupPackage2 datas={datas}></GroupPackage2>
+					<GroupPackage2 datas={datas} bool={true}></GroupPackage2>
 				</div>
 
 

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -43,7 +43,7 @@ class Generaljobbankdetails extends Component {
 			console.log(e);
 			console.log("44");
 		}
-
+		this.getonedata();
 	}
 
 
@@ -58,17 +58,19 @@ class Generaljobbankdetails extends Component {
 		this.setState({
 			tab: type[1],
 		});
-
-
 		console.log("Generaljobbankdetails");
 		console.log(this.props);
+    this.getonedata();
+	}
+
+	getonedata=()=>{
 		if(	this.props.match.params.workid){
 			this.setState({
 				workid:	this.props.match.params.workid,
 			})
 		}
 		this.getdata(this.props.match.params.workid);
-	}
+	};
 	//获取数据的地方
 	getdata=(workid)=>{
 		var workids= workid;