{item.user_name}
{item.group_name}
- {item.student_id}
+ 9 ? item.group_name : ''}
+ >{item.group_name}
+ 12 ? item.student_id : ''}
+ >{item.student_id}
{item.commit_status===true?已提交 :""}
+
{selectmemberslist&&selectmemberslist.map((item,key)=>{
+ const _is_leader = (item.is_leader || !this.isEdit && key==0)
return(
-
-
- {item.user_name}{ (item.is_leader || !this.isEdit && key==0) && 5}>
+
+
+
分班情况：
+
+ this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
-
- this.groupgroup([])}>不限
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
- return(
-
- {item.group_group_name}
- ({item.count})
-
-
- )
- })}
-
:""}
diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
index d5e77da9d..9b3d72e00 100644
--- a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
+++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
@@ -45,6 +45,7 @@ class CreateGroupByImportModal extends Component{
.then((response) => {
if (response.data.status == 0) {
this.props.showNotification(response.data.message)
+ this.props.createGroupImportSuccess && this.props.createGroupImportSuccess()
this.setVisible(false)
} else {
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index cc7485101..3462438f8 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -234,6 +234,9 @@ class studentsList extends Component{
off('updateNavSuccess', this.updateNavSuccess)
}
}
+ createGroupImportSuccess = () => {
+ this.props.updataleftNavfun()
+ }
updateNavSuccess = () => {
this.fetchCourseGroups()
}
@@ -556,7 +559,9 @@ class studentsList extends Component{
firstRowRight={
{ isSuperAdmin &&
- this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班
}
{ isAdmin && isParent && this.addDir()}>添加分班 }
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 06dbe74a8..e3fd4a98d 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -42,6 +42,7 @@ function buildColumns(that) {
title: '序号',
dataIndex: 'name',
key: 'index',
+ width: 78,
render: (content, item, index) => {
return index + 1
// return item.isApply == true ? '' : {(that.state.page - 1) * 20 + index + 1
@@ -74,6 +75,7 @@ function buildColumns(that) {
dataIndex: 'role',
key: 'role',
sorter: showSorter,
+ width: 86,
// 'ascend' | 'descend'
defaultSortOrder: 'ascend',
sortDirections: sortDirections,
@@ -160,16 +162,16 @@ function buildColumns(that) {
},
})
}
- if(isAdminOrTeacher && hasGraduationModule) {
- columns.unshift({
- title: '',
- dataIndex: 'course_member_id',
- key: 'course_member_id',
- render: (content, item, index) => {
- return content ?
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
index 855f6ce53..861c4f879 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
@@ -35,7 +35,7 @@ export default class TpmQuestionNew extends Component {
*
5 && _is_leader ? '#4CACFF' : 'inherit'}`}}>
+ {item.user_name}{ item.user_name.length <= 5 && _is_leader &&
-
- {item.group_name}
- {item.student_id}
+ 9 ? item.group_name : ''}
+ >{item.group_name}
+ 12 ? item.student_id : ''}
+ >{item.student_id}
{item.user_id != this.props.current_user.user_id ?
this.delecttask_status(item.user_id)}>
:""}
diff --git a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
index 20ecce43f..7d56d1b24 100644
--- a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
+++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
@@ -8,13 +8,14 @@ export default function LeaderIcon(props = {}) {
icon = 组长
} else {
- icon = 组长
+ icon = 组长
}
return icon
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 9718de28a..1b25a5717 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -711,8 +711,12 @@ class GraduationTaskssettinglist extends Component{
title: '姓名',
dataIndex: 'name',
key: 'name',
-
- className:'edu-txt-center'
+ className:'edu-txt-center',
+ render: (text, record) => (
+
+ {record.name}
+
+ ),
}, {
title: '学号',
dataIndex: 'stduynumber',
@@ -720,7 +724,7 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center',
render: (text, record) => (
- {record.stduynumber}
+ {record.stduynumber}
),
}, {
@@ -935,6 +939,7 @@ class GraduationTaskssettinglist extends Component{
if(taskslistdata&&taskslistdata.have_grouping===false){
+
columns.some((item,key)=> {
if (item.title === "分组") {
columns.splice(key, 1)
@@ -961,10 +966,38 @@ class GraduationTaskssettinglist extends Component{
.linbox{
height: 26px;
}
+ .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
+ padding: 16px 10px
+ }
+
`
}
+ {taskslistdata&&taskslistdata.have_grouping===true||
+ taskslistdata&&taskslistdata.have_project===true||
+ taskslistdata&&taskslistdata.cross_comment===true?:""}
{/*提示*/}
+ this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
+
+
+ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
+ return(
+
+ {item.group_group_name}
+ ({item.count})
+
+
+ )
+ })}
+
+
-
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
index 32b56aae1..d0e6f98bd 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
@@ -4,6 +4,8 @@ import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+import axios from 'axios';
+
import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
const Option = Select.Option;
@@ -21,7 +23,17 @@ export default class TpmQuestionEdit extends Component {
componentDidMount() {
}
-
+ delecbtns=()=>{
+ let url=`/shixuns/${this.props.match.params.shixunId}/challenges/${this.props.match.params.checkpointId}/destroy_challenge_choose.json`;
+ axios.delete((url), { data: {
+ choose_id:this.props.match.params.choose_id
+ }})
+ .then((result)=>{
+ if(result.data.status===1){
+ window.location.href=`/shixuns/${this.props.match.params.shixunId}/challenges/${this.props.match.params.checkpointId}/editquestion`;
+ }
+ })
+ }
render() {
@@ -202,6 +214,9 @@ export default class TpmQuestionEdit extends Component {
onClick={()=>this.props.answer_subit()}>提交
取消
+
+ this.delecbtns()}
+ className="delectshixuncdbtn fr">删除
必填项
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index 08bea57ed..3aa329ec9 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -1,122 +1,124 @@
-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(
-
-
- )
- }
-}
+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 ? "我":"TA"}的经验值
- {data && data.experience}
-
-
- {is_current ? "我":"TA"}的金币
- {data && data.grade}
-
- {
- 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/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index f59827f45..c66453b4c 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -538,6 +538,27 @@ a.edu-greyline-btn:hover,a.edu-greyshallowline-btn:hover{border:1px solid #B2B2B
font-weight: 400;
color: rgba(255,255,255,1);
}
+
+/*删除按钮*/
+.delectshixuncdbtn{
+ display: block;
+ border: 1px solid #CDCDCD;
+ background-color: #fafafa;
+ color: #999!important;
+ width: 120px;
+ text-align: center;
+ height: 30px;
+ line-height: 30px;
+ border-radius: 2px;
+ width: 130px;
+ height: 40px;
+ background: rgba(77,124,254,0);
+ border-radius: 4px;
+ line-height: 40px;
+ font-size: 16px;
+ font-family: MicrosoftYaHei;
+ font-weight: 400;
+}
.defalutSubmitbtn:hover{background-color: #459BE6;border: 1px solid #459BE6;}
/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，end-----------------------------------------*/
+
+
+
+
+
+ + {data && data.name} + { + data && is_current == false && data.identity =="学生" ? "" : + + } +
+
+
+
+ 私信
+
+
+ }
+
+
+ {is_current ? "我":"TA"}的经验值
+ {data && data.experience}
+
+
+ {is_current ? "我":"TA"}的金币
+ {data && data.grade}
+
+ {
+ 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`}>视频
+ }
+
+
+