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

调整

Browse Source
dev_forum
杨树林 5 years ago
parent d1ead257bb
commit f50faea37f
6 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -159,8 +159,8 @@ class Startshixuntask extends Component{
{this.props.isStudent?
<span>
{this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?<span onClick={()=>this.taskoperationId( this.props.data.task_operation[1])}>
{this.props.data.task_operation[0]}
{this.props.data&&this.props.data.task_operation&&this.props.data.task_operation?startbtn===false?<span onClick={()=>this.taskoperationId( this.props.data&&this.props.data.task_operation[1])}>
{this.props.data&&this.props.data.task_operation[0]}
</span>:"开启中":""}
</span>:""
}

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

@ -159,7 +159,6 @@ class Listofworksstudentone extends Component {
dataIndex: 'classroom',
align: "center",
className:'font-14',
width:'260px',
render: (text, record) => (
<span>
<span style={{

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

@ -44,12 +44,13 @@ class ShixunHomeworkPage extends Component {
// let sum = []
// sum.push(type[1])
// console.log("componentDidMountcomponentDidMount");
// console.log(sum);
console.log(type);
this.setState({
tab:type,
tab:type[1],
})
let querys = this.props.location.pathname;
const types = querys.split('/');
console.log(types);
this.setState({
shixuntypes: types[3]
})

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

@ -33,6 +33,7 @@ import '../css/Courses.css'
import './style.css'
import moment from 'moment';
import 'moment/locale/zh-cn';
import Startshixuntask from "../coursesPublic/Startshixuntask";
const Search = Input.Search;
const CheckboxGroup = Checkbox.Group;
@ -629,7 +630,7 @@ class ShixunStudentWork extends Component {
<div className="edu-back-white">
<div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list">
<a onClick={(e)=>this.ChangeTab(0)}>作品列表</a>:
<a onClick={(e)=>this.ChangeTab(0)}>作品列表</a>
<a onClick={(e)=>this.ChangeTab(1)}>作业问答</a>
{this.props.isAdmin()?<a className="active" onClick={(e)=>this.ChangeTab(2)}>代码查重</a>:""}
<a onClick={(e)=>this.ChangeTab(3)}>设置</a>
@ -669,6 +670,16 @@ class ShixunStudentWork extends Component {
{this.props.isAdmin()?
data&&data.publish_immediately===true?
<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a> : "": ""}
{
jobsettingsdata&& jobsettingsdata.data === undefined ? ""
: jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" :
<a className="fr color-blue font-16"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${ jobsettingsdata&& jobsettingsdata.data === undefined ? "" : jobsettingsdata&& jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{ jobsettingsdata&& jobsettingsdata.data.commit_des}</a>
}
{ jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask
{...this.props}
data={ jobsettingsdata&& jobsettingsdata.data}
/>}
</div>
</div>
<style>

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

@ -27,6 +27,7 @@ import moment from 'moment';
import 'moment/locale/zh-cn';
import Modals from "../../modals/Modals";
import DownloadMessage from '../../modals/DownloadMessage';
import Startshixuntask from "../coursesPublic/Startshixuntask";
const RadioGroup = Radio.Group;
//GraduationTaskssetting.js
@ -1866,6 +1867,16 @@ class Trainingjobsetting extends Component {
{this.props.isAdmin()?
jobsettingsdata&&jobsettingsdata.data.code_review===true?
<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>: "":""}
{
jobsettingsdata&& jobsettingsdata&&jobsettingsdata.data === undefined ? ""
: jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" :
<a className="fr color-blue font-16"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${ jobsettingsdata&& jobsettingsdata.data === undefined ? "" : jobsettingsdata&& jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{ jobsettingsdata&& jobsettingsdata.data.commit_des}</a>
}
{ jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask
{...this.props}
data={ jobsettingsdata&& jobsettingsdata.data}
/>}
</div>
</div>
{/*发布设置*/}

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

@ -35,6 +35,7 @@ import Homeworddescription from "../shixunHomework/Homeworddescription";
import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
import HomeworkModal from "../coursesPublic/HomeworkModal";
import DownloadMessage from '../../modals/DownloadMessage';
import Startshixuntask from "../coursesPublic/Startshixuntask";
const TextArea = Input.TextArea
//作业问答页面
@ -451,6 +452,7 @@ class Workquestionandanswer extends Component {
</li>
</ul>
</li> : ""}
{this.props.isAdmin() ? jobsettingsdata && jobsettingsdata.data.end_immediately === true ?
<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>
:""
@ -465,7 +467,16 @@ class Workquestionandanswer extends Component {
jobsettingsdata && jobsettingsdata.data.code_review === true ?
<a className="fr color-blue font-16" onClick={this.workshowmodel}>代码查重</a>
: "" : ""}
{
jobsettingsdata&& jobsettingsdata.data === undefined ? ""
: jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" :
<a className="fr color-blue font-16"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${ jobsettingsdata&& jobsettingsdata.data === undefined ? "" : jobsettingsdata&& jobsettingsdata.data.id}/commitsummary/${this.state.props.match.params.homeworkid}`}>{ jobsettingsdata&& jobsettingsdata.data.commit_des}</a>
}
{ jobsettingsdata&&jobsettingsdata.data === undefined ? "" : <Startshixuntask
{...this.props}
data={ jobsettingsdata&& jobsettingsdata.data}
/>}
</div>
</div>

Write Preview
Loading…
Cancel
Save