取消
确定
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index beab18fdc..7cee11cf2 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -115,7 +115,7 @@ class SiderBar extends Component {
`
}
-
![]({getImageUrl("images/edu_user/EWM.jpg")})
+
![]({getImageUrl("images/educoder/EWM.jpg")})
微信扫一扫
关注公众号
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 985a838fb..60161d829 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -475,7 +475,10 @@ export default class TPMevaluation extends Component {
}
handpathoptionvalue=(value)=>{
this.setState({
- pathoptionvalue:value
+ pathoptionvalue:value,
+ shixunfileexpectpicturepath:undefined,
+ shixunfilestandardpicturepath:undefined,
+ shixunfilepicturepath:undefined
})
}
showrepositoryurltip=(type)=>{
@@ -640,19 +643,20 @@ export default class TPMevaluation extends Component {
let id = this.props.match.params.shixunId;
let{checkpointId}=this.state;
let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
+ let newchallenge={
+ path:shixunfilepath,
+ exec_path:shixunfilepathplay,
+ show_type:pathoptionvalue,
+ original_picture_path:pathoptionvalue===-1?undefined:shixunfileexpectpicturepath===undefined?null:shixunfileexpectpicturepath,
+ expect_picture_path:pathoptionvalue===-1?undefined:shixunfilestandardpicturepath===undefined?null:shixunfilestandardpicturepath,
+ picture_path:pathoptionvalue===-1?undefined:shixunfilepicturepath===undefined?null:shixunfilepicturepath,
+ test_set_score:newscorevalue,
+ test_set_average:markvalue,
+ web_route:web_route===null?undefined:web_route
+ }
axios.put(url,{
tab:1,
- challenge:{
- path:shixunfilepath,
- exec_path:shixunfilepathplay,
- show_type:pathoptionvalue,
- original_picture_path:shixunfileexpectpicturepath,
- expect_picture_path:shixunfilestandardpicturepath,
- picture_path:shixunfilepicturepath,
- test_set_score:newscorevalue,
- test_set_average:markvalue,
- web_route:web_route===null?undefined:web_route
- },
+ challenge:newchallenge,
test_set:evaluationlist
}
).then((response) => {
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index 1662635ba..ea99b740d 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -45,7 +45,8 @@ class Collaborators extends Component {
collaboratorListsumtype:true,
user_name:undefined,
school_name:undefined,
- spinnings:false
+ spinnings:false,
+ useristrue:false
}
}
componentDidMount() {
@@ -217,10 +218,20 @@ class Collaborators extends Component {
} else {
alltype = false
}
- this.setState({
- Searchadmin: newlist,
- allChangechecked: alltype
- })
+
+ if(newlist.length===0){
+ this.setState({
+ Searchadmin: newlist,
+ allChangechecked: alltype,
+ })
+ }else{
+ this.setState({
+ Searchadmin: newlist,
+ allChangechecked: alltype,
+ useristrue:false
+ })
+ }
+
}
allChange = (e) => {
@@ -260,6 +271,13 @@ class Collaborators extends Component {
}
}
}
+
+ if(user_ids.length===0){
+ this.setState({
+ useristrue:true
+ })
+ return
+ }
let url = "/shixuns/" + id + "/shixun_members_added.json";
axios.post(url, {
user_ids: user_ids
@@ -405,7 +423,8 @@ class Collaborators extends Component {
collaboratorListsum,
collaboratorListsumtype,
user_name,
- school_name
+ school_name,
+ useristrue
} = this.state;
let {loadingContent} = this.props;
const radioStyle = {
@@ -547,7 +566,7 @@ class Collaborators extends Component {
-
+ {useristrue===true?
this.CollaboratorsshowModal("cooperation")}>取消
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index f3c4a30da..4470aaec1 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -1,45 +1,45 @@
-.ml350 {
- margin-left: 40%;
-}
-
-.ml32 {
- margin-left: 32%;
-}
-
-.square-Item{
- /*min-height: 324px;*/
-}
-.square-img{
- min-height: 210px;
-}
-.task-hide{
- margin-bottom: 0em;
-}
-.backFAFAFA{
- background:#FAFAFA;
-}
-
-.demo {
- width: 500px;
- background-color: #0dcecb;
- text-align: center;
- padding:50px;
-}
-.next-loading {
- margin-bottom: 5px;
- width:100%;
-}
-
-.next-rating-overlay .next-icon{
- color: #FFA800!important;
-}
-
-.custom-pagination {
- display: inline-block;
- margin-left: 10px;
-}
-
-.ml425{
- margin-left:42.5%;
- margin-top:20px;
+.ml350 {
+ margin-left: 40%;
+}
+
+.ml32 {
+ margin-left: 32%;
+}
+
+.square-Item{
+ /*min-height: 324px;*/
+}
+.square-img{
+ min-height: 210px;
+}
+.task-hide{
+ margin-bottom: 0em;
+}
+.backFAFAFA{
+ background:#FAFAFA;
+}
+
+.demo {
+ width: 500px;
+ background-color: #0dcecb;
+ text-align: center;
+ padding:50px;
+}
+.next-loading {
+ margin-bottom: 5px;
+ width:100%;
+}
+
+.next-rating-overlay .next-icon{
+ color: #FFA800!important;
+}
+
+.custom-pagination {
+ display: inline-block;
+ margin-left: 10px;
+}
+
+.ml425{
+ margin-left:42.5%;
+ margin-top:20px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js
index 8adc7ba50..2abc15220 100644
--- a/public/react/src/modules/user/usersInfo/InfosBank.js
+++ b/public/react/src/modules/user/usersInfo/InfosBank.js
@@ -1,249 +1,249 @@
-import React, { Component } from 'react';
-import {Pagination,Spin,Checkbox,Modal} from 'antd';
-import moment from 'moment';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Modals from '../../modals/Modals'
-
-const dateFormat ="YYYY-MM-DD HH:mm"
-class InfosBank extends Component{
- constructor(props){
- super(props);
- this.state={
- category:"common",
- type:"publicly",
- page:1,
- per_page:16,
- sort_by:"updated_at",
- CoursesId:undefined,
-
- totalCount:undefined,
- data:undefined,
- isSpin:false,
-
- dialogOpen:false,
- modalsTopval:undefined,
- modalsBottomval:undefined,
- modalSave:undefined
- }
- }
-
- componentDidMount=()=>{
- this.setState({
- isSpin:true
- })
- let{category,type,page,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- getCourses=(category,type,page,sort_by,CoursesId)=>{
- let url=`/users/${this.props.match.params.username}/question_banks.json`;
- axios.get((url),{params:{
- category,
- type,
- page,
- sort_by,
- per_page:category && page ==1?17:16,
- course_list_id:CoursesId
- }}).then((result)=>{
- if(result){
- this.setState({
- totalCount:result.data.count,
- data:result.data,
- isSpin:false
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //切换种类
- changeCategory=(cate)=>{
- this.setState({
- category:cate,
- page:1,
- isSpin:true
- })
- let{type,sort_by,CoursesId}=this.state;
- this.getCourses(cate,type,1,sort_by,CoursesId);
- }
- //切换状态
- changeType=(type)=>{
- this.setState({
- type:type,
- page:1,
- isSpin:true
- })
- let{category,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,1,sort_by,CoursesId);
- }
- //切换页数
- changePage=(page)=>{
- this.setState({
- page,
- isSpin:true
- })
- let{category,type,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- // 进入课堂
- turnToCourses=(url)=>{
- this.props.history.push(url);
- }
-
- // 切换排序方式
- changeOrder= (sort)=>{
- this.setState({
- sort_by:sort,
- isSpin:true
- })
- let{category,type,page,CoursesId}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- changeCourseListId =(CoursesId)=>{
- this.setState({
- CoursesId,
- isSpin:true
- })
- let{category,type,sort,page}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- //设为公开/删除
- setPublic=(index)=>{
- this.setState({
- dialogOpen:true,
- modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
- modalsBottomval:index==1?"公开后不能重设为私有":"",
- modalSave:()=>this.sureOperation(index)
- })
- }
- // 确定--设为公开/删除
- sureOperation=()=>{
-
- }
-
- //弹框隐藏
- handleDialogClose=()=>{
- this.setState({
- dialogOpen:false
- })
- }
-
- render(){
- let{
- category,
- type,
- page,
- data,
- totalCount,
- sort_by,
- isSpin,
- CoursesId,
- dialogOpen,
- modalsTopval,
- modalsBottomval,modalSave
- } = this.state;
- let isStudent = this.props.isStudent();
- let is_current=this.props.is_current;
- return(
-
-
-
-
-
-
-
-
- - this.changeCourseListId()}>
- 全部
-
- {
- data && data.course_list && data.course_list.map((item,key)=>{
- return(
- - this.changeCourseListId(`${item.id}`)}>
- {item.name}
-
- )
- })
- }
-
-
-
- 共参与{totalCount}个题库
-
-
- {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
-
- - this.changeOrder("updated_at")}>时间最新
- - this.changeOrder("name")}>作业名称
- - this.changeOrder("contributor")}>贡献者
-
-
-
- {
- !data || data.question_banks.length==0 &&
- }
- {
- data && data.question_banks && data.question_banks.map((item,key)=>{
- return(
-
- )
- })
- }
-
-
- )
- }
-}
+import React, { Component } from 'react';
+import {Pagination,Spin,Checkbox,Modal} from 'antd';
+import moment from 'moment';
+import axios from 'axios';
+import NoneData from '../../courses/coursesPublic/NoneData'
+import {getImageUrl} from 'educoder';
+import "./usersInfo.css"
+import Modals from '../../modals/Modals'
+
+const dateFormat ="YYYY-MM-DD HH:mm"
+class InfosBank extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ category:"common",
+ type:"publicly",
+ page:1,
+ per_page:16,
+ sort_by:"updated_at",
+ CoursesId:undefined,
+
+ totalCount:undefined,
+ data:undefined,
+ isSpin:false,
+
+ dialogOpen:false,
+ modalsTopval:undefined,
+ modalsBottomval:undefined,
+ modalSave:undefined
+ }
+ }
+
+ componentDidMount=()=>{
+ this.setState({
+ isSpin:true
+ })
+ let{category,type,page,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort_by,CoursesId);
+ }
+
+ getCourses=(category,type,page,sort_by,CoursesId)=>{
+ let url=`/users/${this.props.match.params.username}/question_banks.json`;
+ axios.get((url),{params:{
+ category,
+ type,
+ page,
+ sort_by,
+ per_page:category && page ==1?17:16,
+ course_list_id:CoursesId
+ }}).then((result)=>{
+ if(result){
+ this.setState({
+ totalCount:result.data.count,
+ data:result.data,
+ isSpin:false
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ //切换种类
+ changeCategory=(cate)=>{
+ this.setState({
+ category:cate,
+ page:1,
+ isSpin:true
+ })
+ let{type,sort_by,CoursesId}=this.state;
+ this.getCourses(cate,type,1,sort_by,CoursesId);
+ }
+ //切换状态
+ changeType=(type)=>{
+ this.setState({
+ type:type,
+ page:1,
+ isSpin:true
+ })
+ let{category,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,1,sort_by,CoursesId);
+ }
+ //切换页数
+ changePage=(page)=>{
+ this.setState({
+ page,
+ isSpin:true
+ })
+ let{category,type,sort_by,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort_by,CoursesId);
+ }
+
+ // 进入课堂
+ turnToCourses=(url)=>{
+ this.props.history.push(url);
+ }
+
+ // 切换排序方式
+ changeOrder= (sort)=>{
+ this.setState({
+ sort_by:sort,
+ isSpin:true
+ })
+ let{category,type,page,CoursesId}=this.state;
+ this.getCourses(category,type,page,sort,CoursesId);
+ }
+
+ changeCourseListId =(CoursesId)=>{
+ this.setState({
+ CoursesId,
+ isSpin:true
+ })
+ let{category,type,sort,page}=this.state;
+ this.getCourses(category,type,page,sort,CoursesId);
+ }
+
+ //设为公开/删除
+ setPublic=(index)=>{
+ this.setState({
+ dialogOpen:true,
+ modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
+ modalsBottomval:index==1?"公开后不能重设为私有":"",
+ modalSave:()=>this.sureOperation(index)
+ })
+ }
+ // 确定--设为公开/删除
+ sureOperation=()=>{
+
+ }
+
+ //弹框隐藏
+ handleDialogClose=()=>{
+ this.setState({
+ dialogOpen:false
+ })
+ }
+
+ render(){
+ let{
+ category,
+ type,
+ page,
+ data,
+ totalCount,
+ sort_by,
+ isSpin,
+ CoursesId,
+ dialogOpen,
+ modalsTopval,
+ modalsBottomval,modalSave
+ } = this.state;
+ let isStudent = this.props.isStudent();
+ let is_current=this.props.is_current;
+ return(
+
+
+
+
+
+
+
+
+ - this.changeCourseListId()}>
+ 全部
+
+ {
+ data && data.course_list && data.course_list.map((item,key)=>{
+ return(
+ - this.changeCourseListId(`${item.id}`)}>
+ {item.name}
+
+ )
+ })
+ }
+
+
+
+ 共参与{totalCount}个题库
+
+
+ {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
+
+ - this.changeOrder("updated_at")}>时间最新
+ - this.changeOrder("name")}>作业名称
+ - this.changeOrder("contributor")}>贡献者
+
+
+
+ {
+ !data || data.question_banks.length==0 &&
+ }
+ {
+ data && data.question_banks && data.question_banks.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+
+ )
+ }
+}
export default InfosBank;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 92dd4f1d2..08bea57ed 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -1,115 +1,122 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-
-import banner from '../../../images/account/infobanner.png'
-
-class InfosBanner extends Component{
- constructor(props){
- super(props);
- }
- render(){
- let {
- data ,
- id,
- login,
- moduleName,
- current_user,
- }=this.props;
- let is_current=this.props.is_current;
- let {username}= this.props.match.params;
- let {pathname}=this.props.location;
- moduleName=pathname.split("/")[3];
- return(
-
-
-
-
-
-
- {data && data.name}
- {
- data && is_current == false && data.identity =="学生" ? "" :
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- is_current ?
-
- {
- data && data.attendance_signed ?
- 已签到
- :
- 签到
- }
-
- :
-
- 私信
-
- }
-
-
-
-
- this.setState({moduleName: 'courses'})}
- to={`/users/${username}/courses`}>翻转课堂
-
-
- this.setState({moduleName: 'shixuns'})}
- to={`/users/${username}/shixuns`}>实训项目
-
-
- this.setState({moduleName: 'paths'})}
- to={`/users/${username}/paths`}>实践课程
-
-
- this.setState({moduleName: 'projects'})}
- to={`/users/${username}/projects`}>开发项目
-
-
- this.setState({moduleName: 'package'})}
- to={`/users/${username}/package`}>众包
-
- {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
- &&
- this.setState({moduleName: 'videos'})}
- to={`/users/${username}/videos`}>视频
- }
-
-
-
- )
- }
-}
+import React, { Component } from 'react';
+
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+
+import { LinkAfterLogin } from 'educoder'
+
+class InfosBanner extends Component{
+ constructor(props){
+ super(props);
+ }
+ render(){
+ let {
+ data ,
+ id,
+ login,
+ moduleName,
+ current_user,
+ }=this.props;
+ let is_current=this.props.is_current;
+ let {username}= this.props.match.params;
+ let {pathname}=this.props.location;
+ moduleName=pathname.split("/")[3];
+ return(
+
+
+
+
+
+
+ {data && data.name}
+ {
+ data && is_current == false && data.identity =="学生" ? "" :
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ is_current ?
+
+ {
+ data && data.attendance_signed ?
+ 已签到
+ :
+ 签到
+ }
+
+ :
+
+
+ 私信
+
+
+ }
+
+
+
+
+ this.setState({moduleName: 'courses'})}
+ to={`/users/${username}/courses`}>翻转课堂
+
+
+ this.setState({moduleName: 'shixuns'})}
+ to={`/users/${username}/shixuns`}>开发社区
+
+
+ this.setState({moduleName: 'paths'})}
+ to={`/users/${username}/paths`}>实践课程
+
+
+ this.setState({moduleName: 'projects'})}
+ to={`/users/${username}/projects`}>项目
+
+
+ this.setState({moduleName: 'package'})}
+ to={`/users/${username}/package`}>众包
+
+ {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+ &&
+ this.setState({moduleName: 'videos'})}
+ to={`/users/${username}/videos`}>视频
+ }
+
+
+
+ )
+ }
+}
export default InfosBanner;
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index c4c1c77e0..bc401d4d7 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -130,7 +130,7 @@ class InfosCourse extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ?
: ""
}
{
- (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.courses.length==0)) && category &&
}
{
data && data.courses && data.courses.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index cb02ed604..554d8380f 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -152,7 +152,7 @@ class InfosPath extends Component{
this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
}
{
- (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.subjects.length==0)) && category &&
}
{
data && data.subjects && data.subjects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 2018f7b73..5aea5117b 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -125,7 +125,7 @@ class InfosProject extends Component{
:""
}
{
- (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.projects.length==0)) && category &&
}
{
data && data.projects && data.projects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index 94ef3c29b..4799626a9 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -1,14 +1,11 @@
import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
+
+import { Pagination , Spin } from 'antd';
+
import NoneData from '../../courses/coursesPublic/NoneData'
import axios from 'axios';
-import {getImageUrl,setImagesUrl} from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
-import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
+import { setImagesUrl } from 'educoder';
+
import "./usersInfo.css"
import Create from './publicCreatNew'
@@ -115,7 +112,7 @@ class InfosShixun extends Component{
totalCount,
isSpin
} = this.state;
- let isStudent = this.props.isStudent();
+
let is_current=this.props.is_current;
return(
@@ -157,20 +154,18 @@ class InfosShixun extends Component{
{
- page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
+ page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
}
{
- (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.shixuns.length==0)) && category &&
}
{
data && data.shixuns && data.shixuns.map((item,key)=>{
return(
 %>){kind=avatar}
+ <% end %>
+ 
- */}
+ {/**/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 2df6270c2..0b27ea8b8 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -376,10 +376,15 @@ class BoardsNew extends Component{
dropdownRender={menu => (
*/}
+ {/**/}
+{/*
+
+
+ {author && author.name}
+ {moment(memo.created_on).fromNow()} 发布
+
+
+
+
+ {/* { current_user.admin &&
- {/* || current_user.user_id === author_info.user_id */}
- this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id})) } >
- 返回
-
-
+ {!!memo.total_praises_count &&
+
+ {/* || current_user.user_id === author_info.user_id */}
+ this.props.toListPage(Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id})) } >
+ 返回
+
+
+
-
- {isAdmin &&
+
+ {isAdmin&&
),
}]
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
index f400cd9a2..d2ce6b8e4 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
@@ -91,7 +91,7 @@ class CommonWorkQuestion extends Component{
{/* 内容区 */}
{ !!isAdmin &&
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 528aa1d9e..28e54fff3 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -15,7 +15,7 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
import PublishRightnow from './PublishRightnow'
import ModulationModal from "../coursesPublic/ModulationModal";
import AccessoryModal from "../coursesPublic/AccessoryModal";
-
+import LeaderIcon from './common/LeaderIcon'
const { Option} = Select;
const CheckboxGroup = Checkbox.Group;
const confirm = Modal.confirm;
@@ -97,7 +97,12 @@ function buildColumns(that, student_works, studentData) {
}} title={text && text.length > 5 ? text : ''}>
{/*
- 其他组员
+ 全部组员
-
- {work_members.map((item, index) => {
- return item.user_name + ' '
- })}
+
}
@@ -266,6 +290,7 @@ class CommonWorkAppraise extends Component{
{/* task_type={datalist&&datalist.task_type} */}
+
+ 当前组员：{author_name} {is_leader_work &&
+
+ 其他组员：
+ {work_members.map((item, index) => {
+ return
+
+
+ : {text}
+
-
diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js
index ca65e74be..951408014 100644
--- a/public/react/src/modules/courses/busyWork/UseBank.js
+++ b/public/react/src/modules/courses/busyWork/UseBank.js
@@ -128,7 +128,7 @@ class UseBank extends Component{
})
}
onSave = () => {
-
+ debugger
const { checkBoxValues } = this.state;
const { object_type } = this.props
if(checkBoxValues.length==0){
diff --git a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
new file mode 100644
index 000000000..526e165c5
--- /dev/null
+++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
@@ -0,0 +1,19 @@
+import React,{Component} from "React";
+
+export default function LeaderIcon(props = {}) {
+ let icon = null;
+ if (props.small) {
+ icon = 组长
+ } else {
+ icon = 组长
+
+ }
+ return icon
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index a092c5066..4177be8a4 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -85,8 +85,7 @@ class WorkDetailPageHeader extends Component{
background: #fff;
}
.workDetailPageHeader .summaryname {
- line-height: 20px;
- margin-top: 13px;
+ line-height:30px
}
`}
-
+
+
{homework_name}
{/* {homework_name} */}
this.Navmodalnames(e,2,"course_group",item.id)}>添加分班:""}
{/*分班*/}
- {item.type==="course_group"?this.Navmodalnames(e,5,"editname",item.id,item.name)}>重命名: this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名}
+ {/*{item.type==="course_group"? :""}*/}
+ this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名
this.edithidden(e,item.id)}>隐藏
this.editSetup(e,item.id)}>置顶
diff --git a/public/react/src/modules/courses/coursesPublic/NoneData.js b/public/react/src/modules/courses/coursesPublic/NoneData.js
index 73406ab5c..35d7a5271 100644
--- a/public/react/src/modules/courses/coursesPublic/NoneData.js
+++ b/public/react/src/modules/courses/coursesPublic/NoneData.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import { getImageUrl , getUrl } from 'educoder';
class NoneData extends Component{
constructor(props) {
@@ -9,7 +9,20 @@ class NoneData extends Component{
const { style } = this.props;
return(
-
)
diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js
index 07ce55024..33a2cb68d 100644
--- a/public/react/src/modules/courses/coursesPublic/PathModal.js
+++ b/public/react/src/modules/courses/coursesPublic/PathModal.js
@@ -180,11 +180,13 @@ class PathModal extends Component{
}else{
// this.homeworkstart
//调用立即发布弹窗
+ // this.props.showNotification(response.data.message)
this.props.hidecouseShixunModal();
- this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ this.props.updataleftNavfun()
+ // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
// this.props.showNotification("选用成功")
// this.props.showNotification(response.data.message)
- // this.props.homeworkupdatalists(Coursename,page,order);
+ this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
}
// if(response.status===200) {
diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
index 2a53cf104..24bb7310e 100644
--- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js
@@ -186,7 +186,8 @@ class ShixunModal extends Component{
// this.props.showNotification(response.data.message)
}else{
- this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+ this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
this.props.hidecouseShixunModal()
}
this.setState({
diff --git a/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js b/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
index af3fc1a30..c4c306a12 100644
--- a/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
+++ b/public/react/src/modules/courses/coursesPublic/modal/SendToCourseModal.js
@@ -1,209 +1,209 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin} from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-
-const Search = Input.Search
-const pageCount = 15;
-class SendToCourseModal extends Component{
- constructor(props){
- super(props);
- this.state={
- checkBoxValues: [],
- course_lists: [],
- course_lists_after_filter: [],
- searchValue: '',
- hasMore: true,
- loading: false,
- page: 1
- }
- }
- fetchCourseList = (arg_page) => {
- const page = arg_page || this.state.page;
- // search=''&
- let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
- const searchValue = this.state.searchValue.trim()
- if (searchValue) {
- url += `&search=${searchValue}`
- }
- this.setState({ loading: true })
- axios.get(url, {
- })
- .then((response) => {
- if (!response.data.data || response.data.data.length == 0) {
- this.setState({
- course_lists: page == 1 ? [] : this.state.course_lists,
- page,
- loading: false,
- hasMore: false,
- })
- } else {
- this.setState({
- course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
- course_lists_after_filter: response.data.data,
- page,
- loading: false,
- hasMore: response.data.data.length == pageCount
- })
- }
-
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- componentDidMount() {
- setTimeout(() => {
- this.fetchCourseList()
- }, 500)
-
- }
- setVisible = (visible) => {
- this.refs.modalWrapper.setVisible(visible)
- if (visible == false) {
- this.setState({
- checkBoxValues: []
- })
- }
- }
-
- onSendOk = () => {
- if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
- this.props.showNotification('请先选择要发送至的课堂')
- return;
- }
- if(this.props.url==="/files/bulk_send.json"){
- axios.post("/files/bulk_send.json", {
- course_id:this.props.match.params.coursesId,
- ids: this.props.selectedMessageIds,
- to_course_ids: this.state.checkBoxValues
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.setVisible(false)
- this.props.gobackonSend(response.data.message)
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }else{
- const bid = this.props.match.params.boardId
- const url = `/boards/${bid}/messages/bulk_send.json`
- axios.post(url, {
- ids: this.props.selectedMessageIds,
- to_course_ids: this.state.checkBoxValues
- })
- .then((response) => {
- if (response.data.status == 0) {
- this.setVisible(false)
- this.props.showNotification('发送成功')
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- }
-
- onOk = () => {
- const { course_lists, checkBoxValues } = this.state
- this.onSendOk()
- // this.props.onOk && this.props.onOk(checkBoxValues)
-
- // this.refs.modalWrapper.setVisible(false)
- }
-
- onCheckBoxChange = (checkBoxValues) => {
- this.setState({
- checkBoxValues: checkBoxValues
- })
- }
-
- onSearchChange = (e) => {
- this.setState({
- searchValue: e.target.value
- })
- }
- handleInfiniteOnLoad = () => {
- console.log('loadmore...')
- this.fetchCourseList(this.state.page + 1)
- }
-
- onSearch = () => {
- // const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
- // this.setState({ course_lists_after_filter })
- this.fetchCourseList(1)
- }
- render(){
- const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
- const { moduleName } = this.props
- return(
- ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+ ![]({getUrl("/images/educoder/nodata.png")}/)
- {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-
-
-
-
-
- )}
- {/* TODO */}
- {/* {
- !hasMore && 没有更多了。。
- } */}
-
+ {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+
+
+
+
+
+ )}
+ {/* TODO */}
+ {/* {
+ !hasMore && 没有更多了。。
+ } */}
+
+ {this.props.isAdmin()?exercises && exercises.length ===0?"":
@@ -559,9 +572,9 @@ class Exercise extends Component{
{...this.props}
{...this.state}
item={item}
- key={key}
- checkBox={
+ window.$(`.exerciseitem${index} input`).click() }>
{
- IsAdmin &&
-
+ IsAdmin &&
+
{checkBox}
}
@@ -96,20 +96,20 @@ class ExerciseListItem extends Component{
{/*{item.exercise_name}*/}
{
- this.props.isAdmin()? {item.exercise_name}:""
+ to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}:""
}
{
this.props.isStudent()?
- {item.exercise_name}:""
+ {item.exercise_name}:""
}
{
this.props.isNotMember()? item.lock_status === 0 ?
{item.exercise_name}
- : {item.exercise_name}:""
+ : {item.exercise_name}:""
}
{
@@ -165,8 +165,8 @@ class ExerciseListItem extends Component{
{ IsAdmin && }
@@ -193,7 +193,7 @@ class ExerciseListItem extends Component{
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index cdbc7218b..f38ad7435 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -541,6 +541,18 @@ class ExerciseReviewAndAnswer extends Component{
.inputNumber30 .ant-input-number-input-wrap .ant-input-number-input{
height: 28px;
}
+ .setRadioStyle{
+ width:100%;
+ cursor:pointer;
+ }
+ .setRadioStyle span:last-child{
+ flex:1;
+ display:flex;
+ }
+ .setRadioStyle .ant-radio,.setRadioStyle .ant-checkbox{
+ height:16px;
+ margin-top:2px;
+ }
`}
{/**/}
{item.current_status ===0&&item.exercise_status>1?
}
-
-
- {myname}
- {
- this.props.isAdmin() === true ?
- (this.props.yslbool===false?
- this.bianji(true)}>
- :
- ""
- )
-
- :""
- }
+
+
diff --git a/public/react/src/modules/courses/gradinforms/myysleduinforms.css b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
index 1e86607ec..ab2884ffe 100644
--- a/public/react/src/modules/courses/gradinforms/myysleduinforms.css
+++ b/public/react/src/modules/courses/gradinforms/myysleduinforms.css
@@ -68,7 +68,6 @@
}
.fudonyingxiangysl{
width: 100%;
- height: 66px;
}
.yslbianji{
padding-top: 31px;
@@ -79,3 +78,5 @@
.ysldashed{
border:1px dashed #EEE;
}
+.yslclear{ clear: both;
+}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index d30944ef0..92a4832db 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -151,16 +151,12 @@ class GraduateTaskItem extends Component{
coursesId,
categoryid,
taskid,
-
+ index,
+ isAdmin
} = this.props;
- // console.log(discussMessage)
-
-
-
-
return(
-
+
+ {myname}
+
+
+
+ {
+ this.props.isAdmin() === true ?
+ (this.props.yslbool===false?
+ this.bianji(true)}>
+ :
+ ""
+ )
+ :""
+ }
+
+
+
+ window.$(`.taskitem${index} input`).click() }>
+ {this.props.isAdmin()?all_count===undefined?'' :all_count===0?"":
@@ -726,10 +728,10 @@ class GraduationTasks extends Component{
}
`}
{
topicInfo && topicInfo.attachment_list.length>0 &&
-
+
}
-
@@ -770,18 +773,11 @@ class GraduationTasks extends Component{
/>
-
+
+ {
+ tasks===undefined?'' :tasks.length===0?
-
-