调整

public/react/src/modules/competition/competmodal/PersonalModalteam.js

@@ -85,7 +85,6 @@ class PersonalModalteam extends Component {
 				centered={true}
 				visible={this.props.tmodalsTypes === undefined ? false : this.props.tmodalsTypes}
 				width="600px"
-				heigth="300px"
 			>
 
 				<div className="personaldiv">

public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js

@@ -22,8 +22,24 @@ class ModulationModal_exercise extends Component {
 			Inputsvaltests: "",
 
 		}
+		this.focus = this.focus.bind(this);
+		this.focuss = this.focuss.bind(this);
+		this.focusss = this.focusss.bind(this);
+
 		//因为主观题加客观题的和是总分
 	}
+	focus() {
+		// 直接使用原生 API 使 text 输入框获得焦点
+		this.textInput.focus();
+	}
+	focuss() {
+		// 直接使用原生 API 使 text 输入框获得焦点
+		this.textInputs.focus();
+	}
+	focusss() {
+		// 直接使用原生 API 使 text 输入框获得焦点
+		this.textInputss.focus();
+	}
 
 	componentDidMount = () => {
 		console.log("ModulationModal_exercise");
@@ -144,11 +160,18 @@ class ModulationModal_exercise extends Component {
 			}
 			}
 			if(subools===true ||suboolss===true){
+				if(subools===true && suboolss===true){
+					this.focus()
+				}else if(subools===true){
+					this.focus()
+				}else if(suboolss===true){
+					this.focuss()
+				}
 			return;
 			}
 
 		} else {
-			debugger
+
 			//总分模式
 			if (subjective_score > 0) {
 				//主观题
@@ -158,6 +181,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltype: true,
 						Inputsvaltest: "总成绩不能为空",
 					})
+					this.focusss()
 					return
 				}
 
@@ -169,6 +193,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltype: true,
 						Inputsvaltest: "请输入0-100的分数",
 					})
+					this.focusss()
 					return;
 				}
 
@@ -179,6 +204,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltype: true,
 						Inputsvaltest: "总成绩不能小于零",
 					})
+					this.focusss()
 					return;
 				} else if (parseFloat(Inputsval) > this.props.subjective_score) {
 					this.setState({
@@ -186,6 +212,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltype: true,
 						Inputsvaltest: `总成绩不能大于总分值${this.props.subjective_score}`,
 					})
+					this.focusss()
 					return;
 				}
 			} else if (objective_score > 0) {
@@ -196,6 +223,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltypes: true,
 						Inputsvaltests: "总成绩不能为空",
 					})
+					this.focusss()
 					return
 				}
 				var nubmers = Inputsvals;
@@ -205,6 +233,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltypes: true,
 						Inputsvaltests: "请输入0-100的分数",
 					})
+					this.focusss()
 					return;
 				}
 
@@ -214,6 +243,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltypes: true,
 						Inputsvaltests: "总成绩不能小于零",
 					})
+					this.focusss()
 					return;
 				} else if (parseFloat(Inputsvals) > this.props.objective_score) {
 					this.setState({
@@ -221,6 +251,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltypes: true,
 						Inputsvaltests: `总成绩不能大于总分值${this.props.objective_score}`,
 					})
+					this.focusss()
 					return;
 				}
 
@@ -338,11 +369,16 @@ class ModulationModal_exercise extends Component {
 											}}
 											placeholder="请填写主观题成绩"
 											onInput={this.setInputs}
-											onFocus={true}
+											ref={(input) => { this.textInput = input; }}
 											value={Inputsval === undefined || Inputsval === null ? "" : Inputsval}/>
 										<p className="mexeheigth ml10">分 ，</p>
-										<p className="mexeheigth"><span>总分：</span><span>{subjective_score}</span><span
+										<p className="mexeheigth initialflex"><p className="mexeheigth">总分：</p><p className="mr10 mexeheigth"  ><p
-											className="ml10">分</span></p>
+											style={{
+												minWidth:'40px'
+											}}
+											className="mexeheigth"
+										>{subjective_score}</p></p><p
+											className=" mexeheigth">分</p></p>
 									</div>
 									{
 										Inputsvaltype === true ?
@@ -384,12 +420,14 @@ class ModulationModal_exercise extends Component {
 												height: "40px",
 											}}
 											placeholder="请填写客观题成绩"
-											onFocus={true}
 											onInput={this.setInputss}
+											ref={(input) => { this.textInputs = input; }}
 											value={Inputsvals === undefined || Inputsvals === null ? "" : Inputsvals}/>
 										<p className="mexeheigth ml10">分 ，</p>
-										<p className="mexeheigth"><span>总分：</span><span>{objective_score} </span><span
+										<p className="mexeheigth initialflex"><p className="mexeheigth">总分：</p><p  className="mr10 mexeheigth" ><p className="mexeheigth" style={{
-											className="ml10">分</span></p>
+											minWidth:'40px'
+										}}>{objective_score}</p> </p><p
+											className=" mexeheigth">分</p></p>
 
 									</div>
 									{
@@ -443,12 +481,12 @@ class ModulationModal_exercise extends Component {
 														}}
 														placeholder="请填写最终成绩"
 														onInput={this.setInputsss}
-														onFocus={true}
+														ref={(input) => { this.textInputss = input; }}
 														value={Inputsval === undefined || Inputsval === null ? "" : Inputsval}/>
 													<p className="mexeheigth ml10"> 分 ，</p>
 													<p className="mexeheigth">
-														<span>总分：</span><span>{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}</span><span
+														<span>总分：</span><span className="mr10">{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}</span><span
-														className="ml10">分</span></p>
+														>分</span></p>
 
 												</div>
 												{
@@ -501,8 +539,8 @@ class ModulationModal_exercise extends Component {
 													/>
 													<p className="mexeheigth ml10"> 分 ，</p>
 													<p className="mexeheigth">
-														<span>总分：</span><span>{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}</span><span
+														<span>总分：</span><span className="mr10">{subjective_score > 0 && objective_score === 0 ? subjective_score : ""} {objective_score > 0 && subjective_score === 0 ? objective_score : ""}</span><span
-														className="ml10">分</span></p>
+														>分</span></p>
 
 												</div>
 												{

public/react/src/modules/courses/coursesPublic/Newshixunmodel.css

@@ -371,3 +371,8 @@
     justify-content: center;
     flex-direction: initial;
 }
+
+.initialflex{
+    display: flex;
+    flex-direction:initial;
+}

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -388,7 +388,6 @@ class PollDetailTabForthRules extends Component{
                     {
                       `.ant-select{
                             min-width:200px,
-                            min-heigth:200px
                       }
                       `
                     }

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

@@ -225,7 +225,7 @@ class ShixunHomeworkPage extends Component {
 						}
 
 						<div className="educontent mb20">
-							<p className=" fl color-black  summaryname" style={{heigth: "33px"}}>
+							<p className=" fl color-black  summaryname" >
 								{teacherdatapage === undefined ? "" : teacherdatapage.homework_name}
 							</p>
 							<CoursesListType