diff --git a/public/images/educoder/path.png b/public/images/educoder/path.png
index d8b6f1715..d3d816012 100644
Binary files a/public/images/educoder/path.png and b/public/images/educoder/path.png differ
diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index fad3568b4..600520410 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -332,8 +332,12 @@ label.infolabel{display: block;float: left;width: 56px;text-align: right;margin-
}
.shixunDes{font-family: 'panmen-webfont';display: block;position: absolute;height: 100%;width: 100%;text-align: center;line-height: 220px;color: #fff;top: 0px;font-size: 24px;background-color: rgba(5,16,26,0.4);border-radius: 6px 6px 0px 0px;}
/*TPM*/
-.shixunDetail_top{width: 100%;background-image: url("/images/educoder/shixun-detail.jpg");background-size: 100% 100%;height: 240px;
- justify-content: center;align-items: center;display: -webkit-flex;}
+.shixunDetail_top{width: 100%;background-image: url("/images/educoder/shixun-detail.jpg"); height: 240px;
+ justify-content: center;align-items: center;display: -webkit-flex;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
.task-item{margin-top: 30px;padding-bottom: 30px;border-bottom: 1px solid #eee}
.task-item:last-child{border-bottom: none;}
.challengeNav a.active{color: #4CACFF;}
@@ -420,14 +424,23 @@ table.text-file{}
/*-------------------------------实训路径-------------------------------*/
-.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");background-color: #081C4B;background-size: 100% 100%;}
+.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
+ background-color: #081C4B;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
.pathNavLine{position: absolute;bottom: -8px;width: 100%;}
.path-nav li{float: left;padding: 0px 30px;height: 42px;}
.path-nav li a{color:#fff;font-size: 16px;display: block; height: 40px;}
.path-nav li.active a{border-bottom: 3px solid #4CACFF;color:#4CACFF;}
/*---实训路径详情----*/
.subhead{width: 100%;margin-bottom:40px;background-size: 100% 100%;background-image: url("/images/educoder/path-detail.jpg");height: 240px;
- justify-content: center;align-items: center;display: -webkit-flex;}
+ justify-content: center;align-items: center;display: -webkit-flex;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
.subhead_content{width: 1200px;margin: 0px auto;}
.pathInfo li{text-align: center;float: left;margin-right: 38px;}
.pathInfo li span{display: block;}
@@ -467,7 +480,11 @@ li.li-width7{width: 7%;text-align: left}
/*-----------------------------在线课堂动态----------------------------------*/
.courseHead{width: 100%;margin-bottom:40px;background-size: 100% 100%;background-image: url("/images/educoder/course-detail.jpg");height: 240px;
- justify-content: center;align-items: center;display: -webkit-flex;}
+ justify-content: center;align-items: center;display: -webkit-flex;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
.invite-tip{position: absolute;top: -5px;right: 140px;color: #fff; box-sizing: border-box;width: 170px;text-align: center;border-radius: 2px;background-color: rgba(5,16,26,0.6)}
.inviteTipbtn a{font-size:14px;width: 100%;height: 30px;line-height: 30px;display: block;color: #747A7F;background-color: rgba(5,16,26,0.4)}
.inviteTipbtn a:hover{color: #4cacff!important;}
diff --git a/public/react/src/modules/courses/coursesHome/css/CoursesHome.css b/public/react/src/modules/courses/coursesHome/css/CoursesHome.css
index 696d35ecc..af431da99 100644
--- a/public/react/src/modules/courses/coursesHome/css/CoursesHome.css
+++ b/public/react/src/modules/courses/coursesHome/css/CoursesHome.css
@@ -1,33 +1,35 @@
-.courses-head{
- width: 100%;
- height: 300px;
- background-image: url(./courses.jpg);
- background-color: #081C4B;
- background-size: 100% 100%;
-}
-a{
- text-decoration: none;
- color: #05101a;
-}
-.ant-input-affix-wrapper .ant-input:not(:last-child) {
- padding-right: 24px;
-}
-
-.memberscount{
- font-size: 55px !important;
- background: #fff;
- color: #dfdfdf;
- display: inline-block;
- padding-right: 15px;
-}
-.biaoqiancours{
- overflow: hidden;
- position: relative;
-}
-.coursesover{
- position: absolute;
- color: #fff;
- left: 17px;
- background: #dfdfdf;
- width: 200px;
+.courses-head{
+ width: 100%;
+ height: 300px;
+ background-image: url(./courses.jpg);
+ background-color: #081C4B;
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+}
+a{
+ text-decoration: none;
+ color: #05101a;
+}
+.ant-input-affix-wrapper .ant-input:not(:last-child) {
+ padding-right: 24px;
+}
+
+.memberscount{
+ font-size: 55px !important;
+ background: #fff;
+ color: #dfdfdf;
+ display: inline-block;
+ padding-right: 15px;
+}
+.biaoqiancours{
+ overflow: hidden;
+ position: relative;
+}
+.coursesover{
+ position: absolute;
+ color: #fff;
+ left: 17px;
+ background: #dfdfdf;
+ width: 200px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js
index 84c7d8e23..2f9059a18 100644
--- a/public/react/src/modules/paths/PathDetail/sendPanel.js
+++ b/public/react/src/modules/paths/PathDetail/sendPanel.js
@@ -15,7 +15,6 @@ class sendPanel extends Component{
openSearch:false,
sendToCourseId:undefined,
sendToShixunArray:[],
- shixunNum:0,
Modalstype:false,
cardsModalcancel:this.cardsModalcancel,
cardsModalsave:this.cardsModalsave,
@@ -35,7 +34,9 @@ class sendPanel extends Component{
//隐藏发送至弹框
hideSenttothevalue =()=>{
this.setState({
- sentShixunPath:false
+ sentShixunPath:false,
+ sendToShixunArray:[],
+ sendToCourseId:undefined,
})
}
//打开课堂列表下拉框
@@ -63,7 +64,7 @@ class sendPanel extends Component{
changeCheckBoxs=(list)=>{
this.setState({
sendToShixunArray:list,
- shixunNum:list.length
+ // shixunNum:list.length
})
}
@@ -86,7 +87,9 @@ class sendPanel extends Component{
Modalstype:true,
sentShixunPath:false,
Modalstopval:result.data.message,
- courseurl:result.data.url
+ courseurl:result.data.url,
+ sendToShixunArray:[],
+ sendToCourseId:undefined,
})
}
}).catch((error)=>{
@@ -118,8 +121,33 @@ class sendPanel extends Component{
let {courseurl}=this.state;
window.location.href =courseurl;
}
+
+
+ allChange = (e) => {
+
+ if(e.target.checked===false){
+ this.setState({
+ sendToShixunArray: [],
+ })
+ }else{
+ let { sendToCourseList} = this.state;
+ let newlist = [];
+
+ sendToCourseList.stages.map((item,key)=>{
+ item.shixuns.map((items,keys)=>{
+ newlist.push(items.shixun_id)
+ })
+ })
+
+ this.setState({
+ sendToShixunArray: newlist,
+ })
+ }
+
+ }
+
render(){
- let{sentShixunPath,sendToCourseList,openSearch,shixunNum,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state;
+ let{sentShixunPath,sendToCourseList,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state;
return(
@@ -178,7 +206,7 @@ class sendPanel extends Component{
-
+
{
sendToCourseList && sendToCourseList.stages.map((item,key)=>{
@@ -197,7 +225,16 @@ class sendPanel extends Component{
- 已选择 {shixunNum} 个实训
+
+
+
+ this.allChange(e)}
+ >全选
+
+
+
+ 已选择 {this.state.sendToShixunArray.length} 个实训
取消
确定
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index 7811d12fd..95ce4b8aa 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -532,13 +532,14 @@ class Collaborators extends Component {
-
- 全选
-
- 请至少选择一个用户
-
-
+
+
+ 全选
+
+ 请至少选择一个用户
+
+