Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -1030,10 +1030,10 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<span className="color-blue" style={{textAlign: "center", cursor: "pointer"}}
+								<span style={{color: "#9A9A9A"}}>
-											onClick={() => this.Adjustment(record)}
+								--
-								>调分</span>
+								</span>
-									:
+								:
 									<a style={{textAlign: "center"}} className="color-blue"
 										 target="_blank"
 										 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
@@ -1227,9 +1227,9 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{record.finalscore==="--"?
-								<span className="color-blue" style={{textAlign: "center", cursor: "pointer"}}
+								<span style={{color: "#9A9A9A"}}>
-											onClick={() => this.Adjustment(record)}
+								--
-								>调分</span>
+								</span>
 									:
 									<a style={{textAlign: "center"}} className="color-blue"
 										 target="_blank"
@@ -1244,6 +1244,14 @@ class Studentshavecompletedthelist extends Component {
 			order_type: "desc",
 			exeuserid: 0,
 		}
+
+
+		{/*<span className="color-blue" style={{textAlign: "center", cursor: "pointer"}}*/
+		}
+		{/*			onClick={() => this.Adjustment(record)}*/
+		}
+		{/*>调分</span>*/
+		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
 		// columnsys 老师列表

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

@@ -1175,9 +1175,9 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						record.submitstate === "未提交" ?
-							<a style={{textAlign: "center"}} className="color-blue"
+							<span style={{color: "#9A9A9A"}}>
-								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+												--
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>查看</a> :
+											</span> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
@@ -1509,9 +1509,9 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						record.submitstate === "未提交" ?
-							<a style={{textAlign: "center"}} className="color-blue"
+							<span style={{color: "#9A9A9A"}}>
-								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+												--
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a> :
+											</span> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}