diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 28e54fff3..ca550a965 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -430,7 +430,7 @@ class CommonWorkList extends Component{ } _getRequestParams() { - const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page } = this.state + const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work } = this.state return { page, search, @@ -441,6 +441,7 @@ class CommonWorkList extends Component{ limit: PAGE_SIZE, b_order: orderMap[order], group_id:arg_course_group, + member_work: arg_member_work } } fetchData = () => { @@ -488,6 +489,11 @@ class CommonWorkList extends Component{ this.fetchList() }) } + memberWorkChange = (values, isAllChecked) => { + this.setState({arg_member_work: isAllChecked ? '' : values[0], page: 1}, () => { + this.fetchList() + }) + } funorder = (order) => { this.setState({ order }, () => { this.fetchList() @@ -581,10 +587,21 @@ class CommonWorkList extends Component{ return { label: `${item.name}(${item.count})`, value: item.id } }) + // 1:组长, 0:组员,“” 不限 + const member_works = [{ + name: '组长', id: 1 + }, { + name: '组员', id: 0 + }] + const options_member_work = member_works.map((item) => { + return { label: `${item.name}`, value: item.id } + }) + const isAdmin = this.props.isAdmin() const isStudent = this.props.isStudent() const isAdminOrStudent = this.props.isAdminOrStudent() + const isGroup = this.props.isGroup(); // work_group let StudentData; @@ -679,6 +696,7 @@ class CommonWorkList extends Component{ {options_course_group.length > 1 && } + {isGroup && } {/* value={search} */} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 5ac53a065..709e4a450 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -1,12 +1,14 @@ import React,{Component} from "React"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip} from "antd"; import {Link} from 'react-router-dom'; -import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; -import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'; import axios from 'axios'; -import Modals from '../../modals/Modals'; import _ from 'lodash' +import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'; +import Modals from '../../modals/Modals'; +import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; +import LeaderIcon from './common/LeaderIcon' + const Search = Input.Search; const CheckboxGroup = Checkbox.Group; @@ -753,6 +755,8 @@ render(){ text-overflow:ellipsis; white-space:nowrap } + .members .leaderIcon { + } `}
@@ -764,11 +768,14 @@ render(){ display:item.user_name===undefined?"none":"" }}> -
{item.user_name}
+
{item.user_name}{item.is_leader && }
{item.group_name}
{item.student_id}
- {item.user_id != this.props.current_user.user_id ?
this.delecttask_status(item.user_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 526e165c5..20ecce43f 100644 --- a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js +++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js @@ -2,8 +2,10 @@ import React,{Component} from "React"; export default function LeaderIcon(props = {}) { let icon = null; + const { className, style } = props; + const _className = `font-8 blueFull Actionbtn ${className}` if (props.small) { - icon =
组长
} else { - icon =
组长
+ icon =
组长
} return icon