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

Merge remote-tracking branch 'origin/master'

Browse Source
dev_forum
杨树明 6 years ago
parent f2e7ebb376 8552141ccd
commit 0d9fa58a3e
10 changed files with 4082 additions and 4049 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
Unescape View File

@ -86,7 +86,7 @@ class CommonWorkAnswer extends Component{
{/* 内容区 */}
<div className="padding40 memoContent new_li">
{reference_answer ? <MarkdownToHtml content={reference_answer || "还未设置答案。"}></MarkdownToHtml> :
reference_answer === undefined ? '' : <NoneData></NoneData>}
reference_answer === undefined ? '' : ((!attachments || attachments.length == 0) && <NoneData></NoneData>)}
{ attachments && attachments.map((item) => {
return ( <div className="color-grey">

2
public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
Unescape View File

@ -190,7 +190,7 @@ class CommonWorkAppraise extends Component{
<div className={"color-grey-6 h20 mb20 font-16"}>
内容
</div>
<div className={"ml20"} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
<div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
</div>
{attachments.map((item,key)=>{

12
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -64,7 +64,9 @@ function buildColumns(that, student_works) {
key: 'id',
render: (text, record, index) => {
return (
<span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >{(that.state.page - 1) * PAGE_SIZE + index + 1}</span>
<span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >
{record.isMine == true ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1}
</span>
)},
}, {
title: '姓名',
@ -78,7 +80,7 @@ function buildColumns(that, student_works) {
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
maxWidth: '98px'
width: '98px'
}} title={text}>
{/* <Tooltip placement="bottom" title={text}>
</Tooltip> */}
@ -97,7 +99,7 @@ function buildColumns(that, student_works) {
<span>
<a href="javascript:;"
title={record.student_id}
style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'max-width': '100px', display: 'block', overflow: 'hidden'}}
style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'}}
>{record.student_id}</a>
</span>
),
@ -232,7 +234,7 @@ function buildColumns(that, student_works) {
<span>
<Tooltip title={
getScoreTip(student_score,
<div>
isNiPing ? `你的评阅分数：${record.student_score}分` : <div>
{record.student_comment_count && <div>{`${record.student_comment_count}名学生进行了匿评`}</div>}
<div>有效平均分：{record.student_score}分</div>
</div>
@ -547,7 +549,7 @@ class CommonWorkList extends Component{
StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
late_penalty, absence_penalty, appeal_penalty,
work_group: '' }] : []
work_group: '', isMine: true }] : []
}
let params = this._getRequestParams()
let exportUrl = `/api/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`;

1
public/react/src/modules/courses/common/courseMessage.css
Unescape View File

@ -40,6 +40,7 @@
.course-message .comment_item_cont:last-child {
/* 作品评阅需要 */
border-bottom: none;
padding-bottom: 0px;
}
.course-message .memoMore {

16
public/react/src/modules/courses/members/studentsList.js
Unescape View File

@ -46,24 +46,30 @@ const buildColumns = (that) => {
key: 'login',
align:'center',
className:"color-grey-6",
// render: (name, record) => {
// return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
// }
render: (name, record) => {
return <span className="color-dark overflowHidden1" style={{maxWidth: '110px'}}>{name}</span>
}
}, {
title: '姓名',
dataIndex: 'name',
key: 'name',
align:'center',
width:"10%",
className:"color-grey-6",
render: (name, record) => {
return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
return <a className="color-dark overflowHidden1" target="_blank"
style={{maxWidth: '120px'}} href={`/users/${record.login}`}>{name}</a>
}
}, {
title: '学号',
dataIndex: 'student_id',
key: 'student_id',
align:'center',
className:"color-grey-6"
className:"color-grey-6",
render: (student_id, record) => {
return <span className="color-dark overflowHidden1"
style={{maxWidth: '110px'}} >{student_id}</span>
}
}, {
title: '分班',
dataIndex: 'course_group_name',

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

@ -1757,7 +1757,7 @@ class PollNew extends Component {
})
}
//上移到服务器中
//上下移到服务器中
Upanddownmovementof = (bool, poll_question_id) => {
// console.log("调用了Upanddownmovementofr")
// console.log(poll_question_id)
@ -1769,7 +1769,7 @@ class PollNew extends Component {
}).then((result) => {
try {
if (result.data.status === 0) {
this.props.showNotification(`已完成`);
this.props.showNotification(`上移成功`);
thiss.thisinitializationdatanew();
}
// console.log(JSON.stringify(result))
@ -1787,7 +1787,7 @@ class PollNew extends Component {
try {
if (result.data.status === 0) {
// message.success("下移题目成功", 1)
this.props.showNotification(`已完成`);
this.props.showNotification(`下移成功`);
thiss.thisinitializationdatanew();
}
// console.log(JSON.stringify(result))
@ -2483,7 +2483,7 @@ class PollNew extends Component {
}
</p>
<p className="mt20"> <span className="font-16 flex1" style={{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
<p className="mt20"> <span className="font-16 flex1" style={item.question.question_type === 1?{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}:item.question.question_type === 2? {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}: {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
{item.question.question_type === 1 ?
(<RadioGroup defaultChecked={false} disabled>
@ -2823,9 +2823,9 @@ class PollNew extends Component {
}}
>
<li className="clearfix mt30 mb50">
<a type="primary" className="defalutSubmitbtn fl mr20"
<a className="defalutSubmitbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
<a type="primary" className="defalutCancelbtn fl"
onClick={() => this.submitQuestionnaire()}>提交</a>
<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
</li>
</div>
}

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

@ -1377,7 +1377,7 @@ class Listofworks extends Component {
classroom: game_list[i].score,
complete_status: game_list[i].complete_status,
})
experience=game_list[i].complete_status+experience;
experience=game_list[i].score+experience;
if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
boolgalist=false;

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

@ -394,7 +394,7 @@ class Listofworksstudentone extends Component {
classroom: game_list[i].score,
complete_status: game_list[i].complete_status,
})
experience=game_list[i].complete_status+experience;
experience=game_list[i].score+experience;
if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
boolgalist=false;

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

@ -51,6 +51,26 @@ class TraineetraininginformationModal extends Component {
componentDidMount() {
// this.seacthdata();
}
componentWillReceiveProps(nextProps) {
// console.log("46");
// console.log(nextProps);
// console.log(this.props);
if (nextProps.boolgalist != this.props.boolgalist) {
// console.log("50");
// console.log(nextProps.user);
if (nextProps.boolgalist !== undefined) {
// console.log("53");
// console.log(nextProps.user);
this.setState({
boolgalist: nextProps.boolgalist,
})
}
}
}
LimitNumber=(txt)=> {
var str = txt;
@ -61,7 +81,7 @@ class TraineetraininginformationModal extends Component {
}
render() {
var columns;
if(this.props.boolgalis&&this.props.boolgalist === true) {
if(this.state.boolgalist&&this.state.boolgalist === true) {
columns = [
{
title: '关卡',

6
public/react/src/modules/tpm/newshixuns/Newshixuns.js
Unescape View File

@ -546,6 +546,7 @@ class Newshixuns extends Component {
// const { id } = response.data;
// if (id) {
if(this.state.file !== undefined){
console.log("549");
this.deleteAttachment(this.state.file);
this.setState({
file:undefined,
@ -577,6 +578,7 @@ class Newshixuns extends Component {
postapplyvisible: false,
})
if(this.state.file !== undefined){
console.log("580");
this.deleteAttachment(this.state.file);
this.setState({
file:undefined,
@ -662,6 +664,7 @@ class Newshixuns extends Component {
cancelText: '取消',
// content: 'Some descriptions',
onOk: () => {
console.log("665")
this.deleteAttachment(file)
},
onCancel() {
@ -671,7 +674,7 @@ class Newshixuns extends Component {
return false;
}
deleteAttachment = (file) => {
// console.log(file);
console.log(file);
let id=file.response ==undefined ? file.id : file.response.id
const url = `/attachments/${id}.json`
axios.delete(url, {
@ -760,6 +763,7 @@ class Newshixuns extends Component {
}
if(thiss.state.file !== undefined){
console.log("763")
thiss.deleteAttachment(thiss.state.file);
thiss.setState({
file:file

Write Preview
Loading…
Cancel
Save