调整

public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js

@@ -1,9 +1,7 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
-import {Table, InputNumber, Tooltip} from "antd";
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import {Table, InputNumber, Tooltip,Badge} from "antd";
 import axios from 'axios';
-
+import './Shixunbage.css';
 class OfficialAcademicTranscript extends Component {
 
 	constructor(props) {
@@ -116,14 +114,15 @@ class OfficialAcademicTranscript extends Component {
 			className: "TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide linhe15"} style={{color: "#676767"}}><a className="tasknameName font-14"
-																																							onClick={() => this.myjumptopic("id" + record.customs)}
-																																							title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
-						{record.taskname.name}
-					</a>
-						{record.taskname.complete_status === 2 ?
-							<span className={"tasknamebox ml10"}>延时</span> : record.taskname.complete_status === 3 ?
-								<span className={"tasknameboxs ml10"}>延时</span> : ""}
+					<span className={"task-hide"} style={{color: "#676767"}}>
+						<a className="relative font-14"	onClick={() => this.myjumptopic("id" + record.customs)}
+								title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
+					    	<span className={"tasknameName fl mr5"}>{record.taskname.name}</span>
+
+							{record.taskname.complete_status === 2 ?
+								<Badge count={"延时"} className="site-badge-red fl pdt3" /> : record.taskname.complete_status === 3 ?
+									<Badge count={"无效"} className="site-badge-white fl pdt3" />: ""}
+					  </a>
 					</span>
         </span>
 			),
@@ -305,10 +304,11 @@ class OfficialAcademicTranscript extends Component {
 					.tasknameName:link{color:#676767}
 					.tasknameName:hover{color:#4CACFF}
 					.tasknameName{
-					     overflow: hidden;
+								display: inline-block;
+					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 225px;
+				        max-width: 210px;
 						    text-align: left !important;
 					}
 					.TaskForms{
@@ -331,6 +331,9 @@ class OfficialAcademicTranscript extends Component {
 					.mr22{
 					    margin-right: 22px;
 					}
+					.pdt3{
+					 padding-top:3px;
+					}
 			`}
 				</style>
 				{datas === undefined ? "" : <Table

public/react/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css

@@ -0,0 +1,15 @@
+.site-badge-red .ant-badge-count {
+    background-color: #FC2B6A;
+    color: #fff;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.site-badge-white .ant-badge-count {
+    background-color: #EDEDED;
+    color: #666666;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.relative{
+    position: relative;
+}

public/react/src/modules/tpm/TPMBanner.js

@@ -1372,14 +1372,14 @@ class TPMBanner extends Component {
 
 
                 {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
-                  <div className="fr kaike kkbth mr20 width155"
+                  <div className="fr kaike kkbth mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
                              onClick={this.copyForkvisible}
                              style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block"}}
                        >
-                              复制实训
+                              复制
                         </span>
                     </Tooltip>