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

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source
dev_forum
hjm 6 years ago
parent b31d77ef09 f2605ef12d
commit e1f190a775
22 changed files with 637 additions and 615 deletions
Show Stats Download Patch File Download Diff File

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

@ -358,6 +358,7 @@ class Coursesleftnav extends Component{
navid:undefined,
sandiantype:undefined,
twosandiantype:undefined,
ModalsType:false
})
let url="/course_modules/"+id+"/hidden_module.json"
@ -379,12 +380,25 @@ class Coursesleftnav extends Component{
edithidden=(e,id)=>{
e.stopPropagation();//阻止冒泡
let {course_modules}=this.props;
if(course_modules.length>1){
this.setState({
ModalsType:true,
Modalstopval:"隐藏后将不再显示此模块，",
ModalsBottomval:"后续可通过添加模块恢复显示",
ModalSave:()=>this.edithiddens(id),
})
}else{
this.setState({
ModalsType:true,
Modalstopval:"您不能隐藏所有课堂模块，请至少保留",
ModalsBottomval:"其中一个模块。",
loadtype:true,
ModalSave:()=>this.cannerNavmoda(),
})
}
}
Navmodalnames=(e,id,type,setnavid,name)=>{

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

@ -135,7 +135,7 @@ class AccessoryModal2 extends Component{
description:description,
attachment_ids:newfileList
}).then((result)=>{
console.log(result)
// console.log(result)
if(result.data.status===0){
this.props.setupdate()
this.setState({

6
public/react/src/modules/courses/exercise/Exercisesetting.js
Unescape View File

@ -134,9 +134,9 @@ class Exercisesetting extends Component{
// end_timetype:false
// })
// }else{
// this.setState({
// end_timetype:true
// })
this.setState({
end_timetype:true
})
// }
}

15
public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
Unescape View File

@ -11,6 +11,7 @@ import '../css/busyWork.css';
import '../poll/pollStyle.css';
const CheckboxGroup = Checkbox.Group;
const $ = window.$
function createMarkup(value) { return {__html:value} };
class Exercisestatisticalresult extends Component {
@ -42,7 +43,7 @@ class Exercisestatisticalresult extends Component {
limit:limit
}
}).then((result) => {
console.log(result)
// console.log(result)
this.setState({
data:result.data
@ -85,6 +86,10 @@ class Exercisestatisticalresult extends Component {
page:pageNumber
})
debugger
$('html').animate({
scrollTop: 10
}, 1000);
this.updatefun(sort,exercise_group_id,pageNumber,limit)
}
@ -109,10 +114,10 @@ class Exercisestatisticalresult extends Component {
<ul className="clearfix" style={{padding:'20px'}}>
<li className="clearfix mt10">
<span className="fl mr10 color-grey-8">分班情况：</span>
<span className="fl "><a id="graduation_comment_no_limit"
className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }
>不限</a></span>
<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{paddingTop: '4px'}}>
<span className="fl ">
<a id="graduation_comment_no_limit" className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }>不限</a>
</span>
<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{width:'87%',paddingTop: '4px'}}>
{ data&&data.course_groups.map((item, key) => {
return (
<span key={key}>

1
public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
Unescape View File

@ -19,6 +19,7 @@ import Ecerciseallbackagain from './Ecerciseallbackagain';
const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
const start_Value={0:"继续答题",1:"查看答题",2:"开始答题"}
//试卷主要设置页面
class Testpapersettinghomepage extends Component{
constructor(props) {

2
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -83,7 +83,7 @@ class GraduateTaskItem extends Component{
axios.post(url,{
project_id:taskid
}).then((result)=>{
console.log(result)
// console.log(result)
if(result.data.status===0){
this.setState({
Modalstype:true,

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -651,7 +651,7 @@ debugger
</Link>
</WordsBtn> : ""}
{this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={()=>this.useBankSuccess()}></UseBank>:""}
{this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess=(checkBoxValues,object_ids)}></UseBank>:""}
</React.Fragment>
}

2
public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
Unescape View File

@ -77,7 +77,7 @@ class GraduateTopicDetail extends Component{
url+="student_select_topic.json"
}
axios.post((url)).then((result)=>{
console.log(result);
// console.log(result);
if(result.data.status == 0){
this.getDetailList();
this.props.showNotification(`${result.data.message}`);

16
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -118,6 +118,8 @@ class CoursesNew extends Component {
window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2);
}
}
handleSubmit = (e) => {
e.preventDefault();
@ -146,8 +148,22 @@ class CoursesNew extends Component {
}
if(values.checkboxgroup.length===0){
this.setState({
Modalstype:true,
Modalstopval:"请您至少添加一个课堂模块，",
ModalsBottomval:"否则您将无法新建课堂。",
Loadtype:true,
ModalSave:()=>this.cancelmodel(),
})
return
}
if (!err) {
// console.log('Received values of form: ', values);
let {datatime} = this.state;
let url = "/courses/" + coursesId + ".json";

2
public/react/src/modules/courses/poll/PollDetailIndex.js
Unescape View File

@ -20,7 +20,7 @@ import '../css/busyWork.css'
import axios from 'axios'
const map={1:"未发布",2:"提交中",3:"已截止"}
const map={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
class PollDetailIndex extends Component{
constructor(props){
super(props);

12
public/react/src/modules/courses/poll/PollListItem.js
Unescape View File

@ -1,13 +1,13 @@
import React,{ Component } from "react";
import Tooltip from 'material-ui/Tooltip';
import {Link} from 'react-router-dom'
import moment from 'moment'
import {Link} from 'react-router-dom';
import moment from 'moment';
import CoursesListType from '../coursesPublic/CoursesListType';
import { WordsBtn,formatDuring } from 'educoder'
import '../css/members.css'
import '../css/busyWork.css'
import { WordsBtn,formatDuring } from 'educoder';
import '../css/members.css';
import '../css/busyWork.css';
const polls_status={1:"未发布",2:"提交中",3:"已截止"}
const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
const dataformat="YYYY-MM-DD HH:mm";

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

@ -47,7 +47,7 @@ class CommitSummary extends Component{
// console.log(worksid);
var url = `/student_works/${worksid}/commit_des.json`;
axios.get(url).then((result) => {
console.log(result);
// console.log(result);
if (result.status === 200) {
// console.log(url)
// console.log("提交总结接口")

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

@ -911,6 +911,8 @@ class Listofworksstudentone extends Component {
}
}
student=()=>{
console.log("914");
debugger
this.props.triggerRef(this);
var homeworkid = this.props.match.params.homeworkid;
this.Getalistofworks(homeworkid);
@ -930,7 +932,8 @@ class Listofworksstudentone extends Component {
// 获取作品列表
Getalistofworks = (homeworkid) => {
// console.log("获取作品列表");
console.log("935");
debugger
let urll = `/homework_commons/${homeworkid}/works_list.json`;
var data = {
search: "",
@ -945,9 +948,10 @@ class Listofworksstudentone extends Component {
if(result === undefined){
return
}
console.log("951");
console.log(result);
debugger
if (result.status === 200) {
if(this.props.isNotMember()===false) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
@ -970,7 +974,6 @@ class Listofworksstudentone extends Component {
}
}
}
}).catch((error) => {
console.log(error);
})
@ -1373,7 +1376,6 @@ class Listofworksstudentone extends Component {
if (result !== undefined) {
// console.log("学生公开的作品列表")
// console.log(JSON.stringify(result))
if(this.props.isNotMember()===false) {
this.setState({
teacherdata: result.data,
task_status: result.data.task_status,
@ -1391,7 +1393,6 @@ class Listofworksstudentone extends Component {
this.props.Getdataback(result,result.data);
this.seacthdata(result.data);
}
}
}).catch((error) => {
console.log(error)
this.setState({
@ -1467,6 +1468,7 @@ class Listofworksstudentone extends Component {
// 获取作品列表
Getalistofworkst = (homeworkid) => {
// console.log("获取作品列表");7009
debugger
let urll = `/homework_commons/${homeworkid}/works_list.json`;
// console.log(homeworkid);
@ -1486,8 +1488,7 @@ class Listofworksstudentone extends Component {
limit:20,
}
axios.post(urll, data).then((result) => {
if(this.props.isNotMember()===false){
debugger
if (result !== undefined) {
// console.log(url)
// console.log("作品列表6789077")
@ -1507,7 +1508,7 @@ class Listofworksstudentone extends Component {
})
this.props.Getdataback(result,result.data);
this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
} }
}
}).catch((error) => {
console.log(error)
this.setState({
@ -1550,7 +1551,6 @@ class Listofworksstudentone extends Component {
// console.log(url)
// console.log("作品列表______________________")
// console.log(JSON.stringify(result))
if(this.props.isNotMember()===false){
if (result !== undefined) {
this.setState({
teacherdata: result.data,
@ -1567,9 +1567,8 @@ class Listofworksstudentone extends Component {
})
this.props.Getdataback(result,result.data);
this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
}
}
// }
}
}).catch((error) => {
console.log(error)
this.setState({
@ -1584,6 +1583,7 @@ class Listofworksstudentone extends Component {
// 设置数据
seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
debugger
let {page, limit} = this.state;
let datalist = [];
let columns = this.state.columns;
@ -2161,7 +2161,7 @@ class Listofworksstudentone extends Component {
this.setState({
loadingstate: true
})
this.Startsortingt(this.state.order, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}).catch((error) => {
console.log(error)
});
@ -2330,13 +2330,14 @@ class Listofworksstudentone extends Component {
<li className="clearfix ">
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
<span>
{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
计算成绩
</div>:
</div>:""):
teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
<div className={"computeTimes font-13"}>
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩
</div>
</div>:"")
}
</span>
@ -2487,7 +2488,7 @@ class Listofworksstudentone extends Component {
</div>
{
teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
<div className="edu-txt-center mt30 mb20">
<div className="edu-txt-center edu-back-white mt30 mb20">
<Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit}
total={teacherdata.work_count}></Pagination>
@ -2616,14 +2617,19 @@ class Listofworksstudentone extends Component {
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
{computeTimetype===true?
(this.props.isNotMember()===false?
<div className={"computeTime font-13"} onClick={this.setComputeTime}>
计算成绩
</div>:
teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
</div>
:"")
:
(teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
this.props.isNotMember()===false?
<div className={"computeTimes font-13"}>
计算成绩
</div>
:"")
}
</span>}
@ -2779,13 +2785,14 @@ class Listofworksstudentone extends Component {
<span className="fl mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
{computeTimetype===true?
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
计算成绩
</div>:
</div>:""):
teacherdata&&teacherdata.homework_status[0]=== "未发布"? "":
<div className={"computeTimes font-13"}>
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩
</div>
</div>:"")
}
</span>}
@ -2830,7 +2837,7 @@ class Listofworksstudentone extends Component {
</div>
{
teacherdata && teacherdata.work_count && teacherdata.work_count > limit ?
<div className="edu-txt-center mt30 mb20">
<div className="edu-txt-center edu-back-white mt30 mb20">
<Pagination showQuickJumper current={page}
onChange={this.paginationonChanges} pageSize={limit}
total={teacherdata.work_count}></Pagination>

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

@ -149,8 +149,8 @@ class Trainingjobsetting extends Component {
// console.log(homeworkid)
let url = `/homework_commons/${homeworkid}/settings.json`;
axios.get(url).then((result) => {
console.log(url);
console.log(result);
// console.log(url);
// console.log(result);
if (result!=undefined) {
this.props.Getdataback(result,result.data);
// console.log(result.data.code_review)

4
public/react/src/modules/login/Trialapplication.js
Unescape View File

@ -200,7 +200,7 @@ class Trialapplication extends Component {
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}
console.log(result);
// console.log(result);
}).catch((error) => {
@ -357,7 +357,7 @@ class Trialapplication extends Component {
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}
console.log(result);
// console.log(result);
}).catch((error) => {

2
public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
Unescape View File

@ -47,7 +47,7 @@ class DetailCards extends Component{
this.getPathCardsList();
}
onDragEnd = (result, shixunIndex) => {
console.log(result)
// console.log(result)
// dropped outside the list
if (!result.destination) {

3
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -674,7 +674,8 @@ submittojoinclass=(value)=>{
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a></li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包社区</a></li>
<li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li>
<li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}

4
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -926,8 +926,8 @@ class TPMBanner extends Component {
className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证？</p>
</div>
<div className="task-popup-submit clearfix">
<a onClick={this.hideForkvisible} className="task-btn fl">否</a>
<a className="task-btn task-btn-orange fr" onClick={this.tocertification}>是</a>
<a onClick={this.hideForkvisible} className="task-btn fl">取消</a>
<a className="task-btn task-btn-orange fr" onClick={this.tocertification}>确定</a>
</div>
</Modal>
{!!shixunsDetails.fork_num &&

7
public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
Unescape View File

@ -518,13 +518,6 @@ debugger
>
<span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:1796px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
onChange={this.props.status===2?"":this.onshixunsmark}

15
public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
Unescape View File

@ -24,10 +24,7 @@ export default class TpmQuestionEdit extends Component {
render() {
console.log( this.props.neweditanswerRef)
console.log( this.props.neweditanswerRefval)
console.log( this.props.editanswersRef)
console.log( this.props.editanswersRefval)
return (
<div>
@ -133,17 +130,11 @@ export default class TpmQuestionEdit extends Component {
<p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix"
// onMouseLeave={this.onshixunsmarkss}
id="challenge_score"
>
<span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:2295px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
disabled={this.props.status===2?true:false}
onChange={this.props.status===2?"":(e)=>this.props.onshixunsansweSelect(e)}
// onMouseEnter={this.onshixunsmarks}

8
public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
Unescape View File

@ -138,13 +138,7 @@ export default class TpmQuestionNew extends Component {
// onMouseLeave={this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:2295px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
onChange={(e)=>this.props.onshixunsansweSelect(e)}

2
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -321,7 +321,7 @@ class LoginRegisterComponent extends Component {
type: 2,
}
}).then((result) => {
console.log(result);
// console.log(result);
if(result){
if(result.data.status===-2){
console.log(value.length);

Write Preview
Loading…
Cancel
Save