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

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

@@ -457,6 +457,7 @@ class Listofworksstudentone extends Component {
 					),
 				},
 			],
+			orders: "",
 			columnsstu2: [
 				{
 					title: '序号',
@@ -583,11 +584,11 @@ class Listofworksstudentone extends Component {
 						<span className="font-14 maxnamewidth145" style={{width:'145px'}}>
 							{record.classroom === undefined ?
 								<a  className=" font-14 maxnamewidth145"
-								style={{
-								color: '#9A9A9A',
-								textAlign: "center",
-								width:'145px',
-								}}>--</a> : record.classroom === "" ?
+										style={{
+											color: '#9A9A9A',
+											textAlign: "center",
+											width:'145px',
+										}}>--</a> : record.classroom === "" ?
 									<a  className=" font-14 maxnamewidth145"
 											style={{
 												color: '#9A9A9A',
@@ -601,13 +602,13 @@ class Listofworksstudentone extends Component {
 													width:'145px',
 												}}>--</a>
 										:
-								<a  className=" font-14 maxnamewidth145"
-										title={record.classroom}
-										style={{
-											color: '#9A9A9A',
-											textAlign: "center",
-											width:'145px',
-										}}>{record.classroom}</a>
+										<a  className=" font-14 maxnamewidth145"
+												title={record.classroom}
+												style={{
+													color: '#9A9A9A',
+													textAlign: "center",
+													width:'145px',
+												}}>{record.classroom}</a>
 							}
         </span>
 					),
@@ -650,14 +651,14 @@ class Listofworksstudentone extends Component {
 							}
 						}>
 							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
-									<span style={
-										{
-											color: '#747A7F',
-											textAlign: "center",
-											width:'145px',
-										}
+								<span style={
+									{
+										color: '#747A7F',
+										textAlign: "center",
+										width:'145px',
 									}
-									>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+								}
+								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 									</span>
 							}
 						</span>
@@ -804,7 +805,6 @@ class Listofworksstudentone extends Component {
 					),
 				},
 			],
-			orders: "",
 			b_order:"desc",
 			allow_late:false,
 			checkedValuesine: undefined,
@@ -1816,7 +1816,10 @@ class Listofworksstudentone extends Component {
 
 		}
 		// console.log("554");
+		// console.log("Listofworksstudentone.js45666");
 		// console.log(columns2);
+		// console.log(columns3);
+
 		// console.log(arr);
 		this.setState({
 			data: datalist,
@@ -1889,7 +1892,7 @@ class Listofworksstudentone extends Component {
 					if(item.title==="学号") {
 						continue
 					}else{
-						arr.push(item);
+						arr2.push(item);
 					}
 				}else{
 					if (this.state.work_efficiency === false) {
@@ -1898,11 +1901,11 @@ class Listofworksstudentone extends Component {
 						} else if (item.title === "效率分") {
 							continue
 						}else{
-							arr.push(item);
+							arr2.push(item);
 
 						}
 					}else{
-						arr.push(item);
+						arr2.push(item);
 					}
 
 				}
@@ -1970,7 +1973,9 @@ class Listofworksstudentone extends Component {
 		// console.log("datalistdatalist文件");
 		// console.log(datalist);
 		// console.log("645");
+		// console.log("Listofworksstudentone12314.js");
 		// console.log(columns2);
+		// console.log(columns3);
 		this.setState({
 			data: datalist,
 			teacherlist: teacherlist,

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

@@ -121,7 +121,7 @@ class TPMRightSection extends Component {
 							<div className="padding20 edu-back-white mb10 mt10" style={{
 								display: TPMRightSectionData === undefined?"none":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "none" : "block"
 							}}>
-								<p className="mb20 font-16 clearfix">相关实践课程</p>
+								<p className="mb20 font-16 clearfix">所属课程</p>
 								<div className="recommend-list" >
 									{
 										TPMRightSectionData===undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.map((i,k)=>{
@@ -161,6 +161,7 @@ class TPMRightSection extends Component {
 								</div>
 							</div>
 
+		       {TPMRightSectionData === undefined?"":TPMRightSectionData.paths===undefined?"":TPMRightSectionData.paths.length === 0 ? "" :
 							<div className="padding20 edu-back-white"
 									 style={{
 										 display:
@@ -190,7 +191,7 @@ class TPMRightSection extends Component {
 										})
 									}
 								</div>
-							</div>
+							</div> }
 
 						</div>
 				}