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

public/react/public/css/edu-all.css

@@ -112,25 +112,10 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .smallSquare:nth-child(3n+0){margin-right: 0px;}
 .partimg{height: 180px;width: 100%;border-radius: 6px 6px 0px 0px;}
 /*块状列表上面的绿色标签*/
-.tag-green{
+.tag-green{position: absolute;left: 0px;top:20px;}
-    position: absolute;
+.tag-green .tag-name{display: block;width: auto;background-image: url("/images/educoder/tag1.png");background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;}
-    left: 10px;
+.tag-orange{position: absolute;right: 0px;top:20px;}
-    bottom: 90px;}
+.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;}
-.tag-green .tag-name{display: block;width: auto;
-    /*background-image: url("/images/educoder/tag1.png");*/
-    background: #000000;
-    border: 1px solid #fff;
-    border-radius: 3px;
-    font-size: 14px;
-    background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;}
-.tag-orange{position: absolute;right: 0px;top:12px;}
-.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;
-    background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;
-    height: 28px;
-    line-height: 28px;
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-}
 /*发送至弹框里的下拉框*/
 .downSelectOption{position: relative;height: 35px;}
 .downSelectOption .showOption{background-color: #F4F4F4;border: 1px solid #EAEAEA;width: 100%;padding: 5px 40px 5px 5px;outline: none;height: 100%;box-sizing: border-box;}

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

@@ -1182,7 +1182,7 @@ class Studentshavecompletedthelist extends Component {
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20);
 
 	}
 	paginationonChanges = (pageNumber) => {
@@ -2423,7 +2423,7 @@ class Studentshavecompletedthelist extends Component {
 						" min-width": " 1200px",
 					}}>
 						{/*老师*/}
-						<div className="edu-back-white">
+						<div className="edu-back-white" >
 							<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
 								{/*你的评阅：*/}
@@ -2588,6 +2588,7 @@ class Studentshavecompletedthelist extends Component {
 										{data === undefined ? "" : <Table
 											dataSource={data}
 											columns={columnsys}
+											className="mysjysltable1"
 											pagination={false}
 											loading={loadingstate}
 											// onChange={this.TablePaginationsy}
@@ -2683,6 +2684,7 @@ class Studentshavecompletedthelist extends Component {
 												{datas === undefined ? "" : <Table
 													dataSource={datas}
 													columns={columnss}
+													className="mysjysltable2"
 													pagination={false}
 													loading={false}
 												/>}
@@ -2716,6 +2718,7 @@ class Studentshavecompletedthelist extends Component {
 											dataSource={data}
 											columns={columnstwo}
 											// showHeader={false}
+											className="mysjysltable3"
 											pagination={false}
 											loading={false}
 
@@ -2789,6 +2792,7 @@ class Studentshavecompletedthelist extends Component {
 														dataSource={datas}
 														columns={columns}
 														pagination={false}
+														className="mysjysltable4"
 														loading={loadingstate}
 													/>}</div>
 											</div>