Merge branch 'tree02' of https://bdgit.educoder.net/Hjqreturn/educoder into yslaliyun1015

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -2663,6 +2663,9 @@ class Studentshavecompletedthelist extends Component {
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
+						                 .ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+													 padding: 9px;
+															}
 						              `}</style>
 												<div className="edu-table  edu-back-white">
 													{data === undefined ? "" : <Table
@@ -2767,8 +2770,11 @@ class Studentshavecompletedthelist extends Component {
               	          .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
 																			top: 72%;}
 						                }
+						                 .ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+													 padding: 9px;
+															}
 						              `}</style>
-													<div className="edu-table edu-back-white minH-560">
+													<div className="edu-table edu-back-white minH-560 ysltableows2">
 														{datas === undefined ? "" : <Table
 															dataSource={datas}
 															columns={columnss}

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -61,7 +61,7 @@ class Testpapersettinghomepage extends Component{
     }
     //试卷公用头部
     Commonheadofthetestpaper=()=>{
-        // console.log("Commonheadofthetestpaper");
+         console.log("Commonheadofthetestpaper 试卷公用头部");
         var exercise_id = this.props.match.params.Id;
         var url = `/exercises/${exercise_id}/common_header.json`;
         axios.get(url).then((response) => {
@@ -249,6 +249,19 @@ class Testpapersettinghomepage extends Component{
 	// 		DownloadMessageval:undefined
 	// 	})
 	// }
+	getsetdata =()=>{
+    	 // console.log("Testpapersettinghomepage");
+    	 // console.log("getsetdatassssss");
+		  let{tab}=this.state;
+    	try {
+				if(tab[0]==="0"){
+        this.child.Teacherliststudentlist();
+				}
+			}catch (e) {
+
+			}
+
+	}
   bindRef = ref => { this.child = ref };
 	goback=()=>{
 		// let {datalist}=this.state;
@@ -410,6 +423,7 @@ class Testpapersettinghomepage extends Component{
                                     Exercisetype={"exercise"}
 									               action={this.Commonheadofthetestpaper}
                                     single={true}
+																		getsetdata={this.getsetdata}
                                 ></ImmediatelyPublish>
                                :"":""}
                                 {isAdmin  === true? <Link className="fr color-blue font-16 mt20 mr20" to={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/edit`}>编辑试卷</Link>:""}

public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js

@@ -89,6 +89,7 @@ class Immediatelypublish extends Component{
               Cancel:this.homeworkhide,
               Saves:this.homeworkstartend,
             })
+
           }
         }).catch((error) => {
           console.log(error)
@@ -135,7 +136,8 @@ class Immediatelypublish extends Component{
 
       }
 
-    }    
+    }
+
   }
 
   //取消提示弹框
@@ -189,7 +191,18 @@ class Immediatelypublish extends Component{
           this.homeworkhide();
 
           // 调用父级公共头部的接口刷新
-          this.props.action()
+          try {
+            this.props.action();
+          }catch (e) {
+
+          }
+          // 调用父级刷新数据的接口刷新
+          try {
+            this.props.getsetdata()
+          }catch (e) {
+
+          }
+
         }
       }).catch((error)=>{
         console.log(error);
@@ -274,7 +287,7 @@ class Immediatelypublish extends Component{
           modalSave={this.modalCancel}
         ></Modals>
 
-        <WordsBtn style={this.props.style} className={this.props.className} onClick={this.homeworkstart}>立即发布</WordsBtn>
+        <WordsBtn style={this.props.style} className={this.props.className} onClick={()=>this.homeworkstart()}>立即发布</WordsBtn>
       </React.Fragment>
     )
   }