合并阿里云

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

@@ -41,56 +41,67 @@ class ModulationModal extends Component{
 		if (this.state.Inputsvaltype === true) {
 			return;
 		}
-		this.setState({
-			Inputsvaltype: false,
-			Inputsvaltest: "",
-		})
-		console.log(Inputsval);
-     this.props.Saves(textareaval,Inputsval)
-
-  }
-
-  settextarea=(e)=>{
-   this.setState({
-     textareaval:e.target.value
-   })
-  }
 
-  setInputs=(e)=>{
-		console.log("setInputs");
-		console.log(e.target.value);
-		if (e.target.value === undefined || e.target.value === null || e.target.value === "") {
+		if (Inputsval === undefined || Inputsval === null || Inputsval === "") {
 			this.setState({
 				borredszf: "ml10  color-grey-9 bor-reds ",
 				Inputsval: "",
 				Inputsvaltype: true,
-				Inputsvaltest: "请填写分数",
+				Inputsvaltest: "成绩不能为空",
 			})
 			return
 		}
 		var re = /^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 //判断正整数 /^[1-9]+[0-9]*]*$/
-		var nubmer = e.target.value;
+		var nubmer = Inputsval;
 		if (!re.test(nubmer)) {
 			this.setState({
 				borredszf: "ml10  color-grey-9 bor-reds ",
-				Inputsval: e.target.value,
+				Inputsval: Inputsval,
 				Inputsvaltype: true,
 				Inputsvaltest: "请输入0-100的分数",
 			})
 			return;
 		}
-
-		if (parseFloat(e.target.value) > 100) {
+		if (0 > parseFloat(Inputsval)) {
 			this.setState({
 				borredszf: "ml10  color-grey-9 bor-reds ",
-				Inputsval: e.target.value,
+				Inputsval: Inputsval,
 				Inputsvaltype: true,
-				Inputsvaltest: "请输入0-100的分数",
+				Inputsvaltest: "成绩不能小于零",
+			})
+			return;
+		} else if (parseFloat(Inputsval) > 100) {
+			this.setState({
+				borredszf: "ml10  color-grey-9 bor-reds ",
+				Inputsval: Inputsval,
+				Inputsvaltype: true,
+				Inputsvaltest: "成绩不能大于100",
 			})
 			return;
 		}
+
+
+		this.setState({
+			Inputsvaltype: false,
+			Inputsvaltest: "",
+		})
+		console.log(Inputsval);
+     this.props.Saves(textareaval,Inputsval)
+
+  }
+
+  settextarea=(e)=>{
+   this.setState({
+     textareaval:e.target.value
+   })
+  }
+
+  setInputs=(e)=>{
+		console.log("setInputs");
+		console.log(e);
+
 		this.setState({
-			Inputsval: parseFloat(e.target.value),
+			Inputsval: e,
 			Inputsvaltype: false,
 		})
   }
@@ -164,7 +175,7 @@ class ModulationModal extends Component{
 								:
 								""
 
-							} <Input
+							} <InputNumber
 							className={Inputsvaltype === true ? "borerinput myinputnumbers  bor-reds" : "myinputnumbers"}
 							style={{
 														 width: "120px",

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

@@ -345,4 +345,29 @@
 }
 
 
+.mexertwo {
+    display: flex;
+    flex-direction: initial;
+}
+
+.mexeheigth {
+    line-height: 40px;
+}
+
+.mexeheigth2 {
+    line-height: 40px;
+    width: 74px;
+}
 
+.minbuttionte {
+    /* display: flex; */
+    margin-top: 27px;
+    width: 100%;
+    /* align-items: center; */
+    margin-bottom: 17px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex-direction: initial;
+}