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

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

@@ -1748,10 +1748,11 @@ class Listofworksstudentone extends Component {
 			} catch (e) {
 
 			}
-
+			// console.log("table1handleChange");
+			// console.log(sorter.columnKey);
 			try {
 				//学生成绩排序
-				if (sorter.columnKey === "finalscore") {
+				if (sorter.columnKey === "work_score") {
 					if (sorter.order === "ascend") {
 						//升序
 						this.setState({

public/react/src/modules/paths/PathDetail/Addshixuns.js

@@ -93,14 +93,14 @@ class Addshixuns extends Component {
 				</style>:""}
 
 					<div className="task-popup-content">
-						<Form {...formItemLayout}>
+						{/*<Form {...formItemLayout}>*/}
-							<Form.Item label="实训类型">
+						{/*	<Form.Item label="实训类型">*/}
-									<Radio.Group value={this.state.is_jupyter} onChange={this.GrouponChange}>
+						{/*			<Radio.Group value={this.state.is_jupyter} onChange={this.GrouponChange}>*/}
-										<Radio value="1">普通实训</Radio>
+						{/*				<Radio value="1">普通实训</Radio>*/}
-										<Radio value="2">jupyter实训</Radio>
+						{/*				<Radio value="2">jupyter实训</Radio>*/}
-									</Radio.Group>
+						{/*			</Radio.Group>*/}
-							</Form.Item>
+						{/*	</Form.Item>*/}
-						</Form>
+						{/*</Form>*/}
 						<p className="task-popup-text-center font-16">
 								<span style={{ "line-height":"30px"}}>实训名称：</span>
 									<span><Input style={{ width:"80%"}} className="yslzxueshisy " placeholder="请输入60字以内的实训名称" onChange={this.handleChange}  addonAfter={String(this.state.shixunname===undefined?0:this.state.shixunname.length)+"/60"}  maxLength={60} />