diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 0556d94e9..921834b80 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -45,6 +45,7 @@ class Studentshavecompletedthelist extends Component { teacherlist: undefined, searchtext: "", Teacherliststudentlist: undefined, + mylistansum:0, review: null, course_groupysls: undefined, nocomment: false, @@ -109,17 +110,17 @@ class Studentshavecompletedthelist extends Component { -- : + }}>-- : record.stduynumber === "" ? -- : + }}>-- : {record.stduynumber} + }}>{record.stduynumber} } @@ -132,23 +133,23 @@ class Studentshavecompletedthelist extends Component { align: 'center', className: "edu-txt-center font-14", width:"260px", - render: (text, record) => ( + render: (text, record) => ( {record.classroom === null ? -- : + }}>-- : record.classroom === "" ? -- : + }}>-- : {record.classroom} + }}>{record.classroom} } @@ -159,16 +160,16 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'submitstate', key: 'submitstate', align: 'center', - className: "edu-txt-center font-14", + className: "edu-txt-center font-14", render: (text, record) => ( {record.submitstate} + }}>{record.submitstate} ) @@ -179,7 +180,7 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.updatetime === "--" ? {record.updatetime} @@ -195,30 +196,30 @@ class Studentshavecompletedthelist extends Component { key: 'completion', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( { record.completion === "--" ? + }}> {record.completion} : 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.completion) <= 90 ? { + } : parseInt(record.completion) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.completion) <= 60 ? { + } : parseInt(record.completion) <= 60 ? { "color": '#747A7F', "text-align": "center" - } : + } : { "color": '#747A7F', "text-align": "center" - }}>{record.completion} + }}>{record.completion} } @@ -229,27 +230,27 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'levelscore', key: 'levelscore', align: 'center', - className: "edu-txt-center font-14", + className: "edu-txt-center font-14", render: (text, record) => ( {record.levelscore === "--" ? + }}> {record.levelscore} : 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.levelscore) <= 90 ? { + } : parseInt(record.levelscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.levelscore) <= 60 ? { "color": '#747A7F', "text-align": "center" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} } ) @@ -259,34 +260,34 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', - className: "edu-txt-center font-14", + className: "edu-txt-center font-14", render: (text, record) => ( {record.efficiencyscore === "--" ?
未评分
}> - - {record.efficiencyscore} - + + {record.efficiencyscore} + : 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.efficiencyscore) <= 60 ? { + } : parseInt(record.efficiencyscore) <= 60 ? { "color": '#747A7F', "text-align": "center", } : { "color": '#747A7F', "text-align": "center" - }}>{record.efficiencyscore} + }}>{record.efficiencyscore} } ) @@ -298,7 +299,7 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'number', key: 'number', align: 'center', - className: "edu-txt-center tabletd font-14", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( { @@ -318,7 +319,7 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center tabletd font-14", - render: (text, record) => ( + render: (text, record) => ( { record.name === "--" ? @@ -336,24 +337,24 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center tabletd font-14", - render: (text, record) => ( + render: (text, record) => ( {record.stduynumber === null ? -- + }}>-- : record.stduynumber === "" ? -- + }}>-- : {record.stduynumber} + }}>{record.stduynumber} } @@ -366,22 +367,22 @@ class Studentshavecompletedthelist extends Component { align: 'center', className: "edu-txt-center tabletd font-14", width:"260px", - render: (text, record) => ( + render: (text, record) => ( {record.classroom === null ? --: record.classroom === "" ? + }}>--: record.classroom === "" ? --: + }}>--: {record.classroom} - } + }}>{record.classroom} + } ) @@ -391,16 +392,16 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'submitstate', key: 'submitstate', align: 'center', - className: "edu-txt-center tabletd font-14", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( {record.submitstate} + }}>{record.submitstate} ) @@ -411,7 +412,7 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center tabletd font-14", - render: (text, record) => ( + render: (text, record) => ( {record.updatetime === "--"? -- @@ -427,13 +428,13 @@ class Studentshavecompletedthelist extends Component { key: 'completion', align: 'center', className: "edu-txt-center tabletd font-14", - render: (text, record) => ( + render: (text, record) => ( {record.completion === "--" ? - + }}> -- @@ -441,16 +442,16 @@ class Studentshavecompletedthelist extends Component { 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.completion) <= 90 ? { + } : parseInt(record.completion) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.completion) <= 60 ? { + } : parseInt(record.completion) <= 60 ? { "color": '#747A7F', "text-align": "center" - } : { + } : { "color": '#747A7F', "text-align": "center" - }}>{record.completion} + }}>{record.completion} } ) @@ -460,27 +461,27 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'levelscore', key: 'levelscore', align: 'center', - className: "edu-txt-center tabletd font-14", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( {record.levelscore === "--"? + }}> -- : 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.levelscore) <= 90 ? { + } : parseInt(record.levelscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.levelscore) <= 60 ? { "color": '#747A7F', "text-align": "center" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} } ) @@ -490,7 +491,7 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', - className: "edu-txt-center tabletd font-14", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( { @@ -498,25 +499,25 @@ class Studentshavecompletedthelist extends Component {
未评分
}> - -- + -- : 90 ? { "color": '#DD1717', "text-align": "center" - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - } : parseInt(record.efficiencyscore) <= 60 ? { + } : parseInt(record.efficiencyscore) <= 60 ? { "color": '#747A7F', "text-align": "center", } : { "color": '#747A7F', "text-align": "center" - }}>{record.efficiencyscore} + }}>{record.efficiencyscore} } @@ -536,7 +537,7 @@ class Studentshavecompletedthelist extends Component { record.number=== "--"? -- : - {record.number} + {record.number} } @@ -569,20 +570,20 @@ class Studentshavecompletedthelist extends Component { {record.stduynumber === null ? -- + "color": '#999999', + "text-align": "center" + }}>-- : record.stduynumber === "" ? -- + "color": '#999999', + "text-align": "center" + }}>-- : {record.stduynumber} - } + } ), @@ -609,7 +610,7 @@ class Studentshavecompletedthelist extends Component { "color": '#07111B', "text-align": "center" }}>{record.classroom} - } + } ) @@ -662,10 +663,10 @@ class Studentshavecompletedthelist extends Component { { record.completion === "--"? - -- + -- : 90 ? { "color": '#DD1717', @@ -727,12 +728,12 @@ class Studentshavecompletedthelist extends Component {
未评分
}> - -- + -- - : + : 90 ? { "color": '#DD1717', "text-align": "center", @@ -763,9 +764,9 @@ class Studentshavecompletedthelist extends Component { :record.submitstate === "未提交"? -- : - {record.operating} - } + {record.operating} + } ) @@ -785,7 +786,7 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.number === "--" ? -- @@ -801,7 +802,7 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.name==="--"? {record.name} @@ -817,12 +818,12 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( - + render: (text, record) => ( + {record.stduynumber === "--" ? - {record.stduynumber} - : - {record.stduynumber} + {record.stduynumber} + : + {record.stduynumber} } ), @@ -850,7 +851,7 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( ( {record.updatetime==="--"? @@ -886,7 +887,7 @@ class Studentshavecompletedthelist extends Component { key: 'completion', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.completion=== "--"? -- @@ -902,7 +903,7 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.levelscore==="--"? -- @@ -918,30 +919,30 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.efficiencyscore === "--" ?
未评分
}> - -- - : - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} - } + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -951,7 +952,7 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center font-14", - render: (text, record) => ( + render: (text, record) => ( {record.finalscore==="--"? -- - : - {record.finalscore} + : + {record.finalscore} } @@ -1114,8 +1115,8 @@ class Studentshavecompletedthelist extends Component {
未评分
}> - -- + -- : 90 ? { @@ -1149,9 +1150,9 @@ class Studentshavecompletedthelist extends Component { :record.submitstate === "未提交"? -- - : - {record.finalscore} + : + {record.finalscore} } @@ -1252,6 +1253,7 @@ class Studentshavecompletedthelist extends Component { exercise_users: response.data.exercise_users, current_answer_user: response.data.current_answer_user, course_groups: response.data.course_groups, + mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users }) if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) { // 学生未截止 @@ -1389,7 +1391,7 @@ class Studentshavecompletedthelist extends Component { loadingstate: true, }) } - console.log(response); + console.log(response); console.log(1393); thiss.Generatenewdatasy(response.data.exercise_users, response); } @@ -1622,6 +1624,7 @@ class Studentshavecompletedthelist extends Component { commit_status: response.data.commit_status, exercise_users: response.data.exercise_users, current_answer_user: response.data.current_answer_user, + mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users, }) if (response.data.exercise_types.subjective === 0) { @@ -1756,6 +1759,7 @@ class Studentshavecompletedthelist extends Component { commit_status: response.data.commit_status, exercise_users: response.data.exercise_users, course_groups: response.data.course_groups, + mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users, loadingstate: false, columnsys: arr, }) @@ -1788,6 +1792,7 @@ class Studentshavecompletedthelist extends Component { commit_status: response.data.commit_status, exercise_users: response.data.exercise_users, course_groups: response.data.course_groups, + mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users, columnsys: arr, }) } @@ -1799,7 +1804,7 @@ class Studentshavecompletedthelist extends Component { //显示分班 //8ge - var arr =[]; + var arr =[]; for(var i=0;i { - Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ? + mylistansum && mylistansum > limit ?
+ total={mylistansum}>
: "" } diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js index 8ee260ccd..f332acc58 100644 --- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js +++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js @@ -5,70 +5,70 @@ import "../css/Courses.css"; import CoursesMarkdown from "../coursesPublic/CoursesMarkdown"; import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; import { - Form, Icon, Input, Button, Checkbox,message, + Form, Icon, Input, Button, Checkbox,message, } from "antd"; import {WordsBtn} from 'educoder'; //引入对应跳转的组件 import axios from 'axios'; //提交总结 class CommitSummary extends Component{ - constructor(props) { - super(props) - this.state = { - contents: [{val:"",id:1}], - course_id:0, - course_name:"", - category:[], - homework_id:0, - user_name:"", - work_id:0, - description:"", - data:undefined, - cancels:false, - } - - } - componentDidMount() { - - this.Getsubmissionsummaryinterface(); - let query = this.props.location.pathname; - const type = query.split('/'); - this.setState({ - shixuntypes:type[3] - }) + constructor(props) { + super(props) + this.state = { + contents: [{val:"",id:1}], + course_id:0, + course_name:"", + category:[], + homework_id:0, + user_name:"", + work_id:0, + description:"", + data:undefined, + cancels:false, } + } + componentDidMount() { + + this.Getsubmissionsummaryinterface(); + let query = this.props.location.pathname; + const type = query.split('/'); + this.setState({ + shixuntypes:type[3] + }) + } - //获取提交总结接口 - Getsubmissionsummaryinterface=()=>{ - var worksid=this.props.match.params.id; - // console.log("Getsubmissionsummaryinterface"); - // console.log(this.props.match.params); - // console.log(worksid); - var url = `/student_works/${worksid}/commit_des.json`; - axios.get(url).then((result) => { - // console.log(result); - if (result.status === 200) { - // console.log(url) - // console.log("提交总结接口") - // console.log(JSON.stringify(result)) - this.setState({ - data:result.data, - description: result.data.description, - cancels:true, - }) - }else { - this.props.showNotification(result.data.message); - - } - }).catch((error) => { - console.log(error) + + //获取提交总结接口 + Getsubmissionsummaryinterface=()=>{ + var worksid=this.props.match.params.id; + // console.log("Getsubmissionsummaryinterface"); + // console.log(this.props.match.params); + // console.log(worksid); + var url = `/student_works/${worksid}/commit_des.json`; + axios.get(url).then((result) => { + // console.log(result); + if (result.status === 200) { + // console.log(url) + // console.log("提交总结接口") + // console.log(JSON.stringify(result)) + this.setState({ + data:result.data, + description: result.data.description, + cancels:true, }) - } + }else { + this.props.showNotification(result.data.message); - submitCommitSummary=()=> { - const mdContnet = this.refs[`md${1}`].getValue().trim(); - console.log(mdContnet) + } + }).catch((error) => { + console.log(error) + }) + } + + submitCommitSummary=()=> { + const mdContnet = this.refs[`md${1}`].getValue().trim(); + console.log(mdContnet) } gotohome=()=>{ // let courseId=this.props.match.params.coursesId; @@ -77,126 +77,146 @@ class CommitSummary extends Component{ // }else{ // this.props.history.push(this.props.current_user.first_category_url); // } - this.props.history.goBack() - } + this.props.history.goBack() + } asdasdsad=()=>{ - this.setState({ - contents:"" - }) + this.setState({ + contents:"" + }) } - handleSubmit=(e) => { - e.preventDefault(); - this.props.form.validateFields((err, values) => { - if (!err) { - console.log(values.description); - if(values.description === undefined|| values.description === "" || values.description ===null){ - this.props.showNotification(`请输入提交内容`); - return - - } - var worksid=this.props.match.params.id; - - var url = `/student_works/${worksid}/update_des.json`; - axios.post(url,{ - description:values.description, - }).then((result) => { - if (result.status === 200) { - // console.log(url) - // console.log("提交总结接口") - // console.log(JSON.stringify(result)) - // message.success(result.data.message); - // 这里以前是学生 - this.props.history.push(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`); - } - }).catch((error) => { - console.log(error) - }) - } - - }); - } + handleSubmit=(e) => { + e.preventDefault(); + this.props.form.validateFields((err, values) => { + if (!err) { + console.log(values.description); + if(values.description === undefined|| values.description === "" || values.description ===null){ + this.props.showNotification(`请输入提交内容`); + return + + } + var worksid=this.props.match.params.id; + + var url = `/student_works/${worksid}/update_des.json`; + axios.post(url,{ + description:values.description, + }).then((result) => { + if (result.status === 200) { + // console.log(url) + // console.log("提交总结接口") + // console.log(JSON.stringify(result)) + // message.success(result.data.message); + // 这里以前是学生 + this.props.history.push(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/list?tab=0`); + } + }).catch((error) => { + console.log(error) + }) + } + + }); + } + + render() { + const {getFieldDecorator} = this.props.form; + let {contents,data}=this.state; + // console.log(this.props); + return ( +
+
+ {/*
*/} +
+
+ - render() { - const {getFieldDecorator} = this.props.form; - let {contents,data}=this.state; - // console.log(this.props); - return ( -
-
- {/**/} -
- -
-

{this.state.description ? '修改总结' : '提交总结'}

- this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回 -
- {/*educontentbox*/} -
- -
-
+
+
+

{this.state.description ? '修改总结' : '提交总结'}

+ this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回 +
+ {/*educontentbox*/} +
+ +
+
* 内容 -
-
- - -
- {getFieldDecorator('description', { - rules: [{ - required: true, message: '请在此输入总结内容,最多5000个字符', - }, { - max: 5000, message: '最大限制为5000个字符', - }], - })( - - )} -
- - - -
- - 取消 -
- - -
-
- +
+
+
+ +
+ {getFieldDecorator('description', { + rules: [{ + required: true, message: '请在此输入总结内容,最多5000个字符', + }, { + max: 5000, message: '最大限制为5000个字符', + }], + })( + + )} +
+ + + +
+ + 取消 +
+ +
+
+
-
-
- {/**/} -
- ) - } + +
+ {/**/} +
+
+ ) + } } const GraduationTasksnewApp = Form.create({ name: 'coursesNew' })(CommitSummary); export default GraduationTasksnewApp;