m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整滚动条影响

Browse Source
dev_new_shixunsrepository
杨树明 5 years ago
parent db833e83a5
commit 564a18ed4b
11 changed files with 103 additions and 86 deletions
Show Stats Download Patch File Download Diff File

3
public/react/public/index.html
Unescape View File

@ -96,6 +96,9 @@
<link rel="stylesheet" type="text/css" href="/css/iconfont.css">
<link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.css">
<style>
::-webkit-scrollbar {
width: 0px !important;
}
/*<!--去除浏览器点击操作后有蓝色的底块-->*/
-moz-user-select: none;
-webkit-user-select: none;

13
public/react/src/modules/courses/ListPageIndex.js
Unescape View File

@ -175,6 +175,9 @@ class ListPageIndex extends Component{
isexcellent:excellent
})
}
updatabanners=()=>{
this.refs.CoursesBanner.updatabanner()
}
render() {
let {yslGuideone} =this.state;
// console.log("98");
@ -187,7 +190,7 @@ class ListPageIndex extends Component{
<div>
<div className="newMain clearfix">
{/*头部banner*/}
<CoursesBanner {...this.props} ispostexcellenttype={(excellent)=>this.ispostexcellenttype(excellent)}></CoursesBanner>
<CoursesBanner ref={"CoursesBanner"} {...this.props} ispostexcellenttype={(excellent)=>this.ispostexcellenttype(excellent)}></CoursesBanner>
{/*下面是指引哦*/}
{/*{yslGuideone!==undefined?*/}
{/*(*/}
@ -249,7 +252,7 @@ class ListPageIndex extends Component{
></Route>
<Route path="/courses/:coursesId/teachers"
render={
(props) => (<TeacherList {...this.props} {...props} {...this.state} />)
(props) => (<TeacherList updatabanners={()=>this.updatabanners()} {...this.props} {...props} {...this.state} />)
}
></Route>
{/* 学生列表*/}
@ -300,7 +303,7 @@ class ListPageIndex extends Component{
(props) => (<Statistics {...this.props} {...props} {...this.state} />)
}
></Route>
{/*公告栏列表*/}
@ -324,7 +327,7 @@ class ListPageIndex extends Component{
}
></Route>
<Route path="/courses/:coursesId/files/:main_id"
render={
(props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
@ -335,7 +338,7 @@ class ListPageIndex extends Component{
(props) => (<Resourcelist {...this.props} {...props} {...this.state} />)
}
></Route>
<Route path="/courses/:coursesId/graduation_topics/:Id"
render={
(props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)

2
public/react/src/modules/courses/common/ModalWrapper.js
Unescape View File

@ -42,7 +42,7 @@ class ModalWrapper extends Component{
{
`
body {
overflow: hidden !important;
width: calc(100%) !important;
}
`
}

2
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -954,7 +954,7 @@ class Coursesleftnav extends Component{
{
`
body {
overflow: hidden !important;
width: calc(100%) !important;
}
`
}

10
public/react/src/modules/courses/coursesPublic/HomeworkModal.js
Unescape View File

@ -153,7 +153,7 @@ class HomeworkModal extends Component{
{
`
body {
overflow: hidden !important;
width: calc(100%) !important;
}
`
}
@ -170,7 +170,7 @@ class HomeworkModal extends Component{
destroyOnClose={true}
>
<div className="task-popup-content">
{ this.props.usingCheckBeforePost ?
<React.Fragment>
@ -183,7 +183,7 @@ class HomeworkModal extends Component{
<p className="task-popup-text-center font-16 mt10">
此设置将对所有分班生效
</p>
</React.Fragment> :
</React.Fragment> :
<React.Fragment>
<p className="task-popup-text-center font-16">
{this.props.Topval}
@ -222,8 +222,8 @@ class HomeworkModal extends Component{
</span>
</p>}
{/* usingCheckBeforePost 为true的时候 全选所有分班 */}
{this.props.modaltype===undefined||this.props.modaltype===2||this.props.modaltype===4
|| !course_groups || course_groups.length == 0
{this.props.modaltype===undefined||this.props.modaltype===2||this.props.modaltype===4
|| !course_groups || course_groups.length == 0
|| this.props.usingCheckBeforePost ?"":<ul className="upload_select_box fl clearfix mt20 mb30"
style={{"overflow-y":"auto",padding:"10px 0px"}}
id="search_not_members_list"

10
public/react/src/modules/courses/coursesPublic/ModalsRename.js
Unescape View File

@ -43,6 +43,16 @@ class ModalsRename extends Component{
centered={true}
className={"Navmodal"}
>
{this.props.Navmodalnametype===undefined?false:this.props.Navmodalnametype===true?<style>
{
`
body{
width: calc(100%) !important;
}
`
}
</style>:""}
<div className={"fl mt5"}>{this.props.Navname}名称：</div>
<Input placeholder={"请输入名称，最大限制60个字符"}
className={"inputNav greyInput fl"}

2
public/react/src/modules/courses/coursesPublic/NewShixunModel.js
Unescape View File

@ -443,7 +443,7 @@ class NewShixunModel extends Component{
<div>
<style>
{
`body{ overflow: hidden !important; }
`body{ width: calc(100%) !important; }
.ant-drawer-content{ overflow:auto !important; background: #f5f5f5; }
.yslbottomsj{position: absolute;bottom: -8px;}
.ant-drawer-close{

97
public/react/src/modules/courses/members/teacherList.js
Unescape View File

@ -38,8 +38,8 @@ function buildColumns(that) {
const isAdminOrCreator = that.props.isAdminOrCreator();
const isAdminOrTeacher = that.props.isAdminOrTeacher()
const { course_groups, filterKey } = that.state
const showSorter = filterKey == '1'
const courseId = that.props.match.params.coursesId
const showSorter = filterKey == '1'
const courseId = that.props.match.params.coursesId
const columns = [{
title: '序号',
@ -48,7 +48,7 @@ function buildColumns(that) {
width: 78,
render: (content, item, index) => {
return index + 1
// return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1
// return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1
// - (that.state.application_list ? that.state.application_list.length : 0)}　</a>
}
}
@ -70,7 +70,7 @@ function buildColumns(that) {
sortDirections: sortDirections,
sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order,
render: (name, record) => {
return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}}
return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}}
title={`${name.length > 4 ? name : ''}`}>{name}</a>
}
}, {
@ -84,7 +84,7 @@ function buildColumns(that) {
sortDirections: sortDirections,
sortOrder: sortedInfo.columnKey === 'role' && sortedInfo.order,
}]
}]
that.state.course_groups && that.state.course_groups.length && showSorter && columns.push({
title: <Tooltip title="仅能批阅指定分班的作品">管理权限</Tooltip>,
width: 260,
@ -152,13 +152,13 @@ function buildColumns(that) {
<span>
<WordsBtn onClick={() => that.onRefuse(record)} style={'grey'}>拒绝</WordsBtn>
<Divider type="vertical" />
<a onClick={() => that.onAgree(record)} style={{color: '#4CACFF'}}>同意</a>
<a onClick={() => that.onAgree(record)} style={{color: '#4CACFF'}}>同意</a>
</span> )
} else {
return (
<React.Fragment>
<WordsBtn style2={{ marginRight: '12px' }} onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>
<WordsBtn style2={{ marginRight: '12px' }} onClick={() => that.onDelete(record)} style={'grey'}>删除</WordsBtn>
<ChangeRolePop
courseId={courseId}
record={record}
@ -169,7 +169,7 @@ function buildColumns(that) {
fetchUser={that.props.fetchUser}
></ChangeRolePop>
{/* <Popconfirm
{/* <Popconfirm
placement="bottom"
icon={null}
title={
@ -192,11 +192,11 @@ function buildColumns(that) {
// { record.role == ROLE_TEACHER ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToAssistant(record)}>变更为助教</a> : '' }
// { record.role == ROLE_TEACHER_ASSISTANT ? <a style={{color: '#4CACFF'}} onClick={() => that.changeToTeacher(record)}>变更为教师</a> : '' }
// { record.role == ROLE_ADMIN && isAdminOrCreator ? <a style={{color: '#4CACFF', marginLeft: '44px'}} onClick={() => that.showChangeAdminModal(record)}>更换管理员</a> : '' }
// </span>
// </span>
)
}
},
})
}
@ -209,7 +209,7 @@ function buildColumns(that) {
render: (content, item, index) => {
return content ? <Checkbox value={content}></Checkbox> : ''
}
})
})
}
return columns
}
@ -265,10 +265,10 @@ class studentsList extends Component{
})
return;
}
const courseId = this.props.match.params.coursesId
const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/teacher_application_review.json`
this.props.confirm({
content: `是否确认${ approval == 1 ? '同意' : '拒绝'}TA的加入？`,
onOk: () => {
@ -285,11 +285,11 @@ class studentsList extends Component{
})
.catch(function (error) {
console.log(error);
});
});
}
})
}
onRefuse = (record) => {
this.onAgree(record, 2)
@ -343,10 +343,10 @@ class studentsList extends Component{
// console.log('addTeacherSuccessListener', data)
}
getCourseGroups = () => {
const courseId = this.props.match.params.coursesId
const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/all_course_groups.json`
axios.get(url, {
params: { all: true }
})
@ -369,11 +369,11 @@ class studentsList extends Component{
}
joinCourseGroup = (ids, item, index) => {
// console.log('join ', ids, item)
const courseId = this.props.match.params.coursesId
const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/set_course_group.json`
axios.post(url, {
course_group_ids: ids,
user_id: item.user_id,
@ -382,6 +382,7 @@ class studentsList extends Component{
.then((response) => {
if (response.data.status == 0) {
this.props.showNotification('修改成功')
this.props.updatabanners()
const newArray = ids.map((item) => {return {id: item, name: this.state.course_groups_map[item]}});
this.setState(
(prevState) => ({
@ -397,18 +398,18 @@ class studentsList extends Component{
}
onChangeRoleSuccess = () => {
this.fetchAll(undefined,this.state.filterKey)
}
}
fetchAll = async (argPage,filterKey) => {
let { searchValue }=this.state
this.setState({
isSpin:true
})
let id = this.props.match.params.coursesId
let id = this.props.match.params.coursesId
if (argPage) {
this.setState({ page: argPage })
}
const sortedInfo = this.state.sortedInfo;
let page = argPage || this.state.page
@ -436,7 +437,7 @@ class studentsList extends Component{
const result = await axios.get(encodeURI(url))
// axios.get((url)).then((result)=>{
if (result.data.teacher_list) {
this.setState({
this.setState({
teachers: result.data.teacher_list,
total_count: result.data.teacher_list_size,
application_list: result.data.application_list || [],
@ -445,7 +446,7 @@ class studentsList extends Component{
isSpin:false
})
} else if (result.data.application_list) {
this.setState({
this.setState({
total_count: result.data.teacher_list_size,
application_list: result.data.application_list || [],
is_admin: result.data.is_admin,
@ -461,7 +462,7 @@ class studentsList extends Component{
// })
}
getGroupList(){
let id = this.props.match.params.coursesId
let id = this.props.match.params.coursesId
let url='/courses/'+id+'/graduation_group_list.json';
axios.get((url)).then((result)=>{
if(result.status==200){
@ -543,16 +544,16 @@ class studentsList extends Component{
this.setState({ order: order }, () => {
this.fetchAll()
})
}
}
changeRole = (member, role) => {
const courseId = this.props.match.params.coursesId
const courseId = this.props.match.params.coursesId
let {filterKey}=this.state;
let url= `/courses/${courseId}/change_course_teacher.json`;
axios.post(url, {
course_member_id: member.course_member_id
// "user_list": [
// { "user_id": member.user_id }
// { "user_id": member.user_id }
// ],
// "graduation_group_id": member.graduation_group_id,
// "course_group_id": "820",
@ -588,7 +589,7 @@ class studentsList extends Component{
const courseId = this.props.match.params.coursesId
const url = `/courses/${courseId}/delete_course_teacher.json`
axios.post(url, {
axios.post(url, {
course_member_id: member.course_member_id
})
.then((response) => {
@ -601,15 +602,15 @@ class studentsList extends Component{
})
.catch(function (error) {
console.log(error);
});
});
}
})
}
addTeacher = () => {
this.refs.addTeacherModal.setVisible(true)
this.refs.addTeacherModal.setVisible(true)
}
addStudent = () => {
this.refs.addStudentModal.setVisible(true)
this.refs.addStudentModal.setVisible(true)
}
hasGraduationModule = () => {
@ -619,7 +620,7 @@ class studentsList extends Component{
})
return result && result.length > 0
}
onTableChange = (pagination, filters, sorter) => {
let {filterKey}=this.state;
console.log('Various parameters', pagination, filters, sorter);
@ -679,11 +680,11 @@ class studentsList extends Component{
return(
<React.Fragment>
{/* <AddTeacherModal ref="addTeacherModal"
{/* <AddTeacherModal ref="addTeacherModal"
{...this.props}
moduleName="教师"
></AddTeacherModal>
<AddStudentModal ref="addStudentModal"
<AddStudentModal ref="addStudentModal"
{...this.props}
moduleName="学生"
></AddStudentModal> */}
@ -694,7 +695,7 @@ class studentsList extends Component{
{...this.props} onOk={this.showChangeAdminModal}
changeAdminSuccess={this.changeAdminSuccess}
></AddAdminModal>
<Titlesearchsection
title={<React.Fragment>
<span>教师列表</span>
@ -708,9 +709,9 @@ class studentsList extends Component{
<React.Fragment>
{/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> }
{ isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */}
{ isAdminOrCreator && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
</React.Fragment>
}
secondRowLeft={
@ -777,7 +778,7 @@ class studentsList extends Component{
{ hasGraduationModule && isAdminOrTeacher && <li className="li_line drop_down">
加入答辩组<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right":"0px","left":"unset", minWidth: '222px'}}>
{
groupList && groupList.graduation_groups_count>10?
(<p className="drop_down_search">
@ -814,10 +815,10 @@ class studentsList extends Component{
</div>}
<Spin size="large" spinning={this.state.isSpin}>
<div className="clearfix stu_table teacher_table">
{combineArray.length ?
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
{combineArray.length ?
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
{/* pagination={{ current: page, total: total_count, pageSize:20, onChange: this.onPageChange }} */}
<Table columns={columns} dataSource={combineArray}
<Table columns={columns} dataSource={combineArray}
onChange={this.onTableChange}
pagination={total_count > 20 && filterKey == '1' ? { //分页
total: page == 1 && this.state.application_list.length ? total_count + total_count / Math.floor(this.state.application_list.length + 20) : total_count , //数据总数量

4
public/react/src/modules/courses/shixunHomework/shixunHomework.js
Unescape View File

@ -870,7 +870,7 @@ class ShixunHomework extends Component{
Modalstype:false,
})
let category_id=this.props.match.params.category_id;
const cid = this.props.match.params.coursesId;
let url="/courses/"+cid+"/homework_commons/set_public.json";
axios.post(url, {
@ -1126,7 +1126,7 @@ class ShixunHomework extends Component{
{
`
body {
overflow: hidden !important;
width: calc(100%) !important;
}
`
}

2
public/react/src/modules/modals/Modals.js
Unescape View File

@ -27,7 +27,7 @@ render() {
{
`
body{
overflow: hidden !important;
width: calc(100%) !important;
}
.ant-modal-body {
padding: 20px 40px;

44
public/react/src/modules/page/main/ChooseRepositoryView.js
Unescape View File

@ -80,7 +80,7 @@ positon:0
return ""
}
// 初始化 initialValue + defaultSelected defaultSelected={``}
// {this.renderChoiceItems(item, index)}
// {this.renderChoiceItems(item, index)}
// String.valueOf(index)
var choiceQuestionComponent = choose.map( (item, index) => {
var choose_test = choose_test_cases.test_sets[index];
@ -90,7 +90,7 @@ positon:0
// <p style={{paddingLeft:'27px'}}>{item.subject}</p>
/*
<ReactMarkdown
<ReactMarkdown
source={item.subject} style={{paddingLeft:'27px'}}
renderers={{code: CodeBlock}}
/>
@ -102,31 +102,31 @@ positon:0
const i = optionValueArray.indexOf(item);
initialValueArray[i] = item
})
return (
<div id={`choice${index}`} key={index} className="mb15">
{/* <div style={groupStyle}>
{( item.category === 1 ? "单选题" : "多选题" )}
</div> */}
<div className="clearfix">
<span className="fl" style={{"color":"#8B9399"}}>{index+1}.</span>
<div id={`choose_subject_${index+1}`} className="fl choiceMD">
<textarea style={{display:'none'}}>{item.subject}</textarea>
<span className="fl" style={{"color":"#8B9399"}}>{index+1}.</span><textarea style={{display:'none'}}>{item.subject}</textarea>
</div>
</div>
<div>
{getFieldDecorator("" + (index), {
initialValue: item.category === 1 ? actual_output : (actual_output && actual_output.split(''))
})(
item.category === 1 ?
item.category === 1 ?
<RadioGroup name={`${index}`} defaultSelected={actual_output} className="radiogroup">
{this.renderChoiceItems(item, index)}
</RadioGroup>
: this.renderMultiChoiceItems(item, index, initialValueArray)
)
}
}
</div>
</div>
)
@ -151,7 +151,7 @@ positon:0
/*
<div style={ { display: 'inline-block'} }
dangerouslySetInnerHTML={{__html: optionItem.option_name}}>
</div>
</div>
<textarea value={optionItem.option_name}></textarea>
*/
ar.push(
@ -161,9 +161,9 @@ positon:0
classes={{root: this.props.classes.radio,
checked: this.props.classes.checked}}
checked={isSelected}
value={`${optionValueArray[optionIndex]}`}
style={styles.radioButton}
/>
} label={<div className="break-word" style={{lineHeight:"24px"}}>
@ -172,20 +172,20 @@ positon:0
</div>
<div style={ { display: 'inline-block',"color":"#8B9399"} }
dangerouslySetInnerHTML={{__html: showText}}>
</div>
</div>
</div>} ></FormControlLabel>
)
})
//
//
// <span style={ isSelected ? { fontSize: 16} : {}}> {optionItem.option_name}</span>
return ar
}
renderMultiChoiceItems(item, index, initialValueArray) {
return <CheckBoxGroup
return <CheckBoxGroup
{...this.props}
options={item.challenge_question} initialValueArray={initialValueArray}
itemLabelFunction={(option, index)=> {
@ -198,10 +198,10 @@ positon:0
</div>
<div style={ { display: 'inline-block',"color":"#8B9399"} }
dangerouslySetInnerHTML={{__html: showText}}>
</div>
</div>
</div>
)
}}
itemValueFunction={(option, index)=> {return optionValueArray[index]}}></CheckBoxGroup>
}
@ -235,14 +235,14 @@ positon:0
return (
<React.Fragment>
{ loading === true ?
{ loading === true ?
''
:
:
<div id="choiceRepositoryView" style={{"color":"#8B9399!important"}}>
{this.renderChooseQuestions()}
</div>
}
</React.Fragment>
);
}

Write Preview
Loading…
Cancel
Save