Merge branch 'feature/maolipeng/20210629/piliang' into dev

# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx

src/modules/teach-tool/paper-manage/OperatePaper.jsx

@@ -718,10 +718,8 @@ class OperatePaper extends Component {
           return prev + Number(cur.score) || 0;
           return prev + Number(cur.score) || 0;
         }, 0);
         }, 0);
 
 
-        const passScore = Math.round(totalScore * formData.passRate * 0.01);
-
       this.setState({
       this.setState({
-          selectQuestionList: questionList,
+        selectQuestionList:questionList,
         formData: {
         formData: {
           ...formData,
           ...formData,
           singleChoiceScore,
           singleChoiceScore,
@@ -731,11 +729,11 @@ class OperatePaper extends Component {
           indefiniteChoiceScore,
           indefiniteChoiceScore,
           totalScore,
           totalScore,
           passScore,
           passScore,
-          },
-        });
         }
         }
-    );
-  };
+      })
+      message.success("设置成功")
+    })
+  }
   // 上下移题型
   // 上下移题型
   handleMoveTypeSorter = (index, moveLength) => {
   handleMoveTypeSorter = (index, moveLength) => {
     const sorterTypeList = [...this.state.sorterTypeList];
     const sorterTypeList = [...this.state.sorterTypeList];