调整

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

@@ -3171,7 +3171,7 @@ class Listofworksstudentone extends Component {
 	}
 
 	daochuzuoye = () => {
-		let url = `/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?course_group=${this.state.checkedValuesineinfo === undefined || this.state.checkedValuesineinfo === null ? "" : this.state.checkedValuesineinfo}&search=${this.state.searchtext === undefined || this.state.searchtext === null ? "" : this.state.searchtext}`
+		let url = `/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx?course_group=${this.state.checkedValuesineinfo === undefined || this.state.checkedValuesineinfo === null ? "" : this.state.checkedValuesineinfo}&work_status=${this.state.course_groupyslstwo === undefined || this.state.course_groupyslstwo === null ? "" : this.state.course_groupyslstwo}&search=${this.state.searchtext === undefined || this.state.searchtext === null ? "" : this.state.searchtext}`
 		this.confirmysl(url);
 	}
 

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

@@ -666,7 +666,7 @@ class Trainingjobsetting extends Component {
 			if (this.state.proportion === "自定义分值") {
 				try {
 					if(parseFloat(this.state.CalculateMax)!==parseFloat(max)){
-						this.props.showNotification(`总分值不等于效率分和关卡分之和!`);
+						this.props.showNotification(`分值之和必须等于总分值：${this.state.CalculateMax}分`);
 						this.scrollToAnchor("zongfentimeid");
 						return;
 					}
@@ -1275,7 +1275,7 @@ class Trainingjobsetting extends Component {
 			this.Empiricalvalueratio(value, this.state.CalculateMax, true);
 
 		} else if (this.state.proportion === "自定义分值") {
-			this.Calculatethetotalscore(value, this.state.challenge_settings);
+			// this.Calculatethetotalscore(value, this.state.challenge_settings);
 		}
 
 	}
@@ -1321,7 +1321,16 @@ class Trainingjobsetting extends Component {
 		if (this.state.completionefficiencyscore === true) {
 			latedeductiontwos = this.state.latedeductiontwo;
 		}
-		this.Calculatethetotalscore(latedeductiontwos, challenge_settings);
+
+		if (this.state.proportion === "均分比例") {
+			this.Calculatethetotalscore(latedeductiontwos, challenge_settings);
+
+		} else if (this.state.proportion === "经验值比例") {
+			this.Calculatethetotalscore(latedeductiontwos, challenge_settings);
+
+		}
+
+
 		// if (nubmer > 100) {
 		//     message.error("请输入小于100的数");
 		//     this.setState({
@@ -2738,12 +2747,12 @@ class Trainingjobsetting extends Component {
 										{this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => {
 											return (
 												<li className="yslflexhomes" key={index}>
-													<Checkbox className="ml110  font-16 maxnamewidth200"
+													<Checkbox className="ml110  font-16 maxnamewidth340"
 																		disabled={!flagPageEditsbox}
-																		style={{"width": "200px", color: "#05101A", lineHeight: "48px"}}
+																		style={{"width": "340px", color: "#05101A", lineHeight: "48px"}}
 																		checked={object.checked}
 																		onChange={(value) => this.onChangedatasheet(value, index)}
-													><span className="maxnamewidth190">{object.challenge_name}</span></Checkbox>
+													><a title={object.challenge_name} >{object.challenge_name}</a></Checkbox>
 													{
 														object.checked === false ?
 															<div style={{lineHeight: "48px", width: "60px"}}>
@@ -2756,6 +2765,7 @@ class Trainingjobsetting extends Component {
 																	width: "60px",
 																	textAlign: "center",
 																	marginTop: "14px",
+																	marginLeft: "5px "
 																}}>可不做
 																</div>
 															</div>
@@ -2763,7 +2773,7 @@ class Trainingjobsetting extends Component {
 															<div style={{lineHeight: "48px", width: "60px"}}></div>
 													}
 													<InputNumber disabled={!flagPageEdits} className=" c_grey" min={0}
-																			 style={{"width": "100px", "margin-left": "100px", color: "#666666"}}
+																			 style={{"width": "100px", "margin-left": "20px ", color: "#666666"}}
 																			 onChange={(value) => this.hangeTopicNametwodatasheet(value, index)}
 																			 step={0.1}
 																			 value={object.challenge_score}

public/react/src/modules/courses/shixunHomework/style.css

@@ -110,12 +110,12 @@
   min-height: 20px;
 }
 
-.maxnamewidth200 {
-  max-width: 200px;
+.maxnamewidth340 {
+  max-width: 340px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   cursor: default;
-  width: 200px;
-  max-width: 200px;
+  width: 340px;
+  max-width: 340px;
 }