diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 55f42e608..3b96cbf7f 100644 --- a/public/react/public/css/edu-all.css +++ b/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{ - position: absolute; - left: 10px; - bottom: 90px;} -.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; -} +.tag-green{position: absolute;left: 0px;top:20px;} +.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;} +.tag-orange{position: absolute;right: 0px;top:20px;} +.tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;} /*发送至弹框里的下拉框*/ .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;} diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 921834b80..3e0d5b0e3 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/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", }}> {/*老师*/} -
+