From e28ccb3f039a15d44f0b11b8f9f57b53be36c2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 12 Jul 2019 14:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworks.js | 121 +++++------ .../shixunHomework/Listofworksstudentone.js | 96 ++++----- .../shixunHomework/ShixunHomeworkPage.js | 197 ++++++++++++++---- .../shixunHomework/ShixunStudentWork.js | 113 +++++----- .../shixunHomework/Trainingjobsetting.js | 152 +++++++------- .../shixunHomework/Workquestionandanswer.js | 153 +++++++------- 6 files changed, 479 insertions(+), 353 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index c8c77dfbd..fa7ffe693 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1451,70 +1451,11 @@ class Listofworks extends Component { starttimes={this.state.starttimes} typs={this.state.typs} /> -
+
-
-
- this.ChangeTab(0)}>作品列表 - this.ChangeTab(1)}>作业问答 - {this.props.isAdmin() ? - this.state.code_review === true ||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"? "" : this.ChangeTab(2)}> - 代码查重 : ""} - this.ChangeTab(3)} - >设置 - {/*{this.props.isAdmin() ? 导出 : ""}*/} - - {this.props.isAdmin()?
  • - 导出 - -
    • :""} - {this.props.isAdmin() ? - teacherdata && teacherdata.end_immediately === true ? - 立即截止 - : "" - : ""} - {this.props.isAdmin() ? - teacherdata && teacherdata.publish_immediately === true ? - 立即发布 - : "" - : ""} - {this.props.isAdmin() ? - teacherdata && teacherdata.code_review === true ? - 代码查重 - : "": ""} -
    -
    +// {this.props.isAdmin()?
  • +// 导出 +// +//
    • :""} +// {this.props.isAdmin() ? +// teacherdata && teacherdata.end_immediately === true ? +// 立即截止 +// : "" +// : ""} +// {this.props.isAdmin() ? +// teacherdata && teacherdata.publish_immediately === true ? +// 立即发布 +// : "" +// : ""} +// {this.props.isAdmin() ? +// teacherdata && teacherdata.code_review === true ? +// 代码查重 +// : "": ""} +{/*
    */} +{/*
    */} diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index daa36f86f..d93029025 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -922,32 +922,9 @@ class Listofworksstudentone extends Component { : "" } -
    +
    -
    -
    - this.ChangeTab(0)}>作品列表 - this.ChangeTab(1)}>作业问答 - this.ChangeTab(3)} - >设置 - {this.state.view_report===true? - 查看实训报告 - :""} - {/*查看实训报告*/} - { - teacherdata === undefined ? "" - : teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" : - {teacherdata.commit_des} - } - {teacherdata === undefined ? "" : } -
    -
    + {computeTimetype===false?
  • @@ -1076,27 +1053,7 @@ class Listofworksstudentone extends Component {
    • -
    -
    - this.ChangeTab(0)}>作品列表 - this.ChangeTab(1)}>作业问答 - this.ChangeTab(3)}>设置 - {this.state.view_report===true? - 查看实训报告 - :""} - { - teacherdata === undefined ? "" - : teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" : - {teacherdata.commit_des} - } - {teacherdata === undefined ? "" : } -
    -
    + {computeTimetype===false?
  • @@ -1267,4 +1224,49 @@ class Listofworksstudentone extends Component { } } -export default Listofworksstudentone; \ No newline at end of file +export default Listofworksstudentone; +{/*
    */} +{/*
    */} +{/* this.ChangeTab(0)}>作品列表*/} +{/* this.ChangeTab(1)}>作业问答*/} +{/* this.ChangeTab(3)}*/} +{/* >设置*/} +{/* {this.state.view_report===true?*/} +{/* 查看实训报告*/} +{/* :""}*/} +{/* /!*查看实训报告*!/*/} +{/* {*/} +{/* teacherdata === undefined ? ""*/} +{/* : teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :*/} +{/* {teacherdata.commit_des}*/} +{/* }*/} +{/* {teacherdata === undefined ? "" : }*/} +{/*
    */} +{/*
    */} +{/*
    */} +{/*
    */} +{/* this.ChangeTab(0)}>作品列表*/} +{/* this.ChangeTab(1)}>作业问答*/} +{/* this.ChangeTab(3)}>设置*/} +{/* {this.state.view_report===true?*/} +{/* 查看实训报告*/} +{/* :""}*/} +{/* {*/} +{/* teacherdata === undefined ? ""*/} +{/* : teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" :*/} +{/* {teacherdata.commit_des}*/} +{/* }*/} +{/* {teacherdata === undefined ? "" : }*/} +{/*
    */} +{/*
    */} \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index beba69898..621893141 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -1,6 +1,6 @@ -import React,{ Component } from "react"; -import {Link,NavLink} from 'react-router-dom'; -import { WordsBtn ,ActionBtn} from 'educoder'; +import React, {Component} from "react"; +import {Link, NavLink} from 'react-router-dom'; +import {WordsBtn, ActionBtn} from 'educoder'; import axios from 'axios'; import '../css/members.css'; import "../common/formCommon.css"; @@ -14,39 +14,55 @@ import Trainingjobsetting from './Trainingjobsetting' import Workquestionandanswer from './Workquestionandanswer' import CoursesListType from '../coursesPublic/CoursesListType'; import ShixunStudentWork from "./ShixunStudentWork"; +import Startshixuntask from "../coursesPublic/Startshixuntask"; class ShixunHomeworkPage extends Component { constructor(props) { super(props); - this.state={ - tab:["0"], - jobsettingsdata:undefined, - teacherdata:undefined, + this.state = { + tab: ["0"], + jobsettingsdata: undefined, + teacherdata: undefined, + code_review: false, + view_report: false, } } + //切换tab - ChangeTab=(e)=>{ - console.log(e); + ChangeTab = (e) => { + // console.log(e); this.setState({ - tab:e + tab: e }) + try { + var currenturl = window.location.href; + var newUrl = (currenturl.split("?"))[0]; + window.history.pushState('','',newUrl+'?tab='+e); + }catch (e) { + console.log(e); + console.log("44"); + } + } - Getdataback = (jobsettingsdata,teacherdata)=>{ - this.setState({ - jobsettingsdata:jobsettingsdata, - teacherdata:teacherdata, - }) + Getdataback = (jobsettingsdata, teacherdata) => { + this.setState({ + jobsettingsdata: jobsettingsdata, + teacherdata: teacherdata, + code_review: teacherdata.code_review, + view_report: teacherdata.view_report, + }) } + componentDidMount() { - const query =this.props.location.search; + const query = this.props.location.search; const type = query.split('?tab='); // let sum = [] // sum.push(type[1]) // console.log("componentDidMountcomponentDidMount"); console.log(type); this.setState({ - tab:type[1], + tab: type[1], }) let querys = this.props.location.pathname; const types = querys.split('/'); @@ -57,11 +73,11 @@ class ShixunHomeworkPage extends Component { } render() { - let {tab,jobsettingsdata,teacherdata}=this.state; - const isAdmin =this.props.isAdmin(); + let {tab, jobsettingsdata, teacherdata} = this.state; + const isAdmin = this.props.isAdmin(); return ( -
    -
    +
    +

    @@ -70,20 +86,20 @@ class ShixunHomeworkPage extends Component { > {jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name} + to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name} > 作业详情

    -

    +

    {teacherdata === undefined ? "" : teacherdata.homework_name}

    返回 + href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>返回 实训详情 @@ -91,21 +107,126 @@ class ShixunHomeworkPage extends Component {
    +
    +
    +
    + this.ChangeTab(0)}>作品列表 + this.ChangeTab(1)}>作业问答 + {this.props.isAdmin() ? + this.state.code_review === true || jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0] === "未发布" ? "" : + this.ChangeTab(2)}> + 代码查重 : ""} + {parseInt(tab) === 3? + + :""} + this.ChangeTab(3)} + >设置 + {/*{this.props.isAdmin() ? 导出 : ""}*/} + + {this.props.isAdmin() ? +
  • + 导出 + +
    • : ""} + {this.props.isAdmin() ? + teacherdata && teacherdata.end_immediately === true ? + 立即截止 + : "" + : ""} + {this.props.isAdmin() ? + teacherdata && teacherdata.publish_immediately === true ? + 立即发布 + : "" + : ""} + {this.props.isAdmin() ? + teacherdata && teacherdata.code_review === true ? + 代码查重 + : "" : ""} + {this.state.view_report === true ? + 查看实训报告 + : ""} + { + teacherdata === undefined ? "" + : teacherdata.commit_des === null || teacherdata.commit_des === undefined ? "" : + {teacherdata.commit_des} + } + {teacherdata === undefined ? "" : } +
    +
    +
    + + + { + // 教师列表 + parseInt(tab) === 0 ? (isAdmin === true ? + this.ChangeTab(e)} + Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}> : - this.ChangeTab(e)} Getdataback={(jobsettingsdata,teacherdata)=>this.Getdataback(jobsettingsdata,teacherdata)} >) + this.ChangeTab(e)} + Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}>) : - parseInt(tab)===1 ?this.ChangeTab(e)} Getdataback={(jobsettingsdata,teacherdata)=>this.Getdataback(jobsettingsdata,teacherdata)} > + parseInt(tab) === 1 ? + this.ChangeTab(e)} + Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}> : - parseInt(tab)===2? this.ChangeTab(e)} Getdataback={(jobsettingsdata,teacherdata)=>this.Getdataback(jobsettingsdata,teacherdata)} > + parseInt(tab) === 2 ? + this.ChangeTab(e)} + Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}> : - this.ChangeTab(e)} Getdataback={(jobsettingsdata,teacherdata)=>this.Getdataback(jobsettingsdata,teacherdata)} > - } -
    + this.ChangeTab(e)} + Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}> + } + ) } @@ -135,9 +256,9 @@ export default ShixunHomeworkPage; // // // -{/* */} - - +{/* */ +} -{/**/} \ No newline at end of file +{/**/ +} \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index 5725df969..cbf963457 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -625,63 +625,10 @@ class ShixunStudentWork extends Component { starttimes={this.state.starttimes} typs={this.state.typs} /> -
    +
    -
    -
    - this.ChangeTab(0)}>作品列表 - this.ChangeTab(1)}>作业问答 - {this.props.isAdmin()?this.ChangeTab(2)}>代码查重:""} - this.ChangeTab(3)}>设置 - - {this.props.isAdmin() ?
  • - 导出 - -
    • : ""} - {this.props.isAdmin()? - data&&data.end_immediately===true? - 立即截止 - :"": ""} - {this.props.isAdmin()? - data&&data.publish_immediately===true? - 立即发布 : "": ""} - { - jobsettingsdata&& jobsettingsdata.data === undefined ? "" - : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : - { jobsettingsdata&& jobsettingsdata.data.commit_des} - } - { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } -
    -
    + +// {this.props.isAdmin() ?
  • +// 导出 +// +//
    • : ""} +// {this.props.isAdmin()? +// data&&data.end_immediately===true? +// 立即截止 +// :"": ""} +// {this.props.isAdmin()? +// data&&data.publish_immediately===true? +// 立即发布 : "": ""} +// { +// jobsettingsdata&& jobsettingsdata.data === undefined ? "" +// : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : +// { jobsettingsdata&& jobsettingsdata.data.commit_des} +// } +// { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } +{/*
    */} +{/*
    */} \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index a05c5373b..07135d76b 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1807,87 +1807,17 @@ class Trainingjobsetting extends Component { loadtype={loadtype} modalSave={modalSave} > -
    -
    -
    -
    - this.ChangeTab(0)}>作品列表 - this.ChangeTab(1)}>作业问答 - {this.props.isAdmin()?this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"": this.ChangeTab(2)}>代码查重 : ""} - - this.ChangeTab(3)} - >设置 - - {this.props.isAdmin() ?
  • - 导出 - -
    • : ""} - {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true? - 立即截止 - : "": ""} - {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true? - 立即发布: "" : ""} - {this.props.isAdmin()? - jobsettingsdata&&jobsettingsdata.data.code_review===true? - 代码查重: "":""} - { - jobsettingsdata&& jobsettingsdata&&jobsettingsdata.data === undefined ? "" - : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : - { jobsettingsdata&& jobsettingsdata.data.commit_des} - } - { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } -
    -
    +
    +
    {/*发布设置*/}
    -
    +

    发布设置 { !flagPageEdit && this.props.isAdmin() === true ? - 编辑 + : "" }

    @@ -2233,4 +2163,74 @@ class Trainingjobsetting extends Component { } } -export default Trainingjobsetting; \ No newline at end of file +export default Trainingjobsetting; +//
    +//
    +// this.ChangeTab(0)}>作品列表 +// this.ChangeTab(1)}>作业问答 +// {this.props.isAdmin()?this.state.code_review===true||jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0]==="未发布"?"": this.ChangeTab(2)}>代码查重 : ""} +// +// this.ChangeTab(3)} +// >设置 +// +// {this.props.isAdmin() ?
  • +// 导出 +// +//
    • : ""} +// {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true? +// 立即截止 +// : "": ""} +// {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.publish_immediately===true? +// 立即发布: "" : ""} +// {this.props.isAdmin()? +// jobsettingsdata&&jobsettingsdata.data.code_review===true? +// 代码查重: "":""} +// { +// jobsettingsdata&& jobsettingsdata&&jobsettingsdata.data === undefined ? "" +// : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : +// { jobsettingsdata&& jobsettingsdata.data.commit_des} +// } +// { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } +{/*
    */} +{/*
    */} diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index 0ac01e9dd..9602ad78c 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -405,83 +405,12 @@ class Workquestionandanswer extends Component { starttimes={this.state.starttimes} typs={this.state.typs} /> -
    -
    -
    -
    - this.ChangeTab(0)}>作品列表 - - this.ChangeTab(1)}>作业问答 - {this.props.isAdmin() ? - this.state.code_review === true || jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status[0] === "未发布" ? "" : - this.ChangeTab(2)}> - 代码查重 : ""} - - this.ChangeTab(3)} - >设置 - - {this.props.isAdmin() ? -
  • - 导出 - -
    • : ""} - - {this.props.isAdmin() ? jobsettingsdata && jobsettingsdata.data.end_immediately === true ? - 立即截止 - :"" - : ""} - {this.props.isAdmin() ? jobsettingsdata && jobsettingsdata.data.publish_immediately === true ? - 立即发布 - : "" - : ""} - - - {this.props.isAdmin() ? - jobsettingsdata && jobsettingsdata.data.code_review === true ? - 代码查重 - : "" : ""} - { - jobsettingsdata&& jobsettingsdata.data === undefined ? "" - : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" : - { jobsettingsdata&& jobsettingsdata.data.commit_des} - } - { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : } -
    -
    +
    +
    + {jobsettingsdata === undefined || jobsettingsdata.data.description === null ? "无" : -
    +
    */} +{/* {this.props.isAdmin() ?*/} +{/*
  • */} +{/* 导出*/} +{/* */} +{/*
    • : ""}*/} + +{/* {this.props.isAdmin() ? jobsettingsdata && jobsettingsdata.data.end_immediately === true ?*/} +{/* 立即截止*/} +{/* :""*/} +{/* : ""}*/} +{/* {this.props.isAdmin() ? jobsettingsdata && jobsettingsdata.data.publish_immediately === true ?*/} +{/* 立即发布*/} +{/* : ""*/} +{/* : ""}*/} + + +{/* {this.props.isAdmin() ?*/} +{/* jobsettingsdata && jobsettingsdata.data.code_review === true ?*/} +{/* 代码查重*/} +{/* : "" : ""}*/} +{/* {*/} +{/* jobsettingsdata&& jobsettingsdata.data === undefined ? ""*/} +{/* : jobsettingsdata&& jobsettingsdata.data.commit_des === null || jobsettingsdata&& jobsettingsdata.data.commit_des === undefined ? "" :*/} +{/* { jobsettingsdata&& jobsettingsdata.data.commit_des}*/} +{/* }*/} +{/* { jobsettingsdata&&jobsettingsdata.data === undefined ? "" : }*/} +{/*
    */} +{/*
    */} \ No newline at end of file